diff --git a/res/cardsfolder/alexi_zephyr_mage.txt b/res/cardsfolder/alexi_zephyr_mage.txt
index 8ec4e233b54..84454e74de0 100644
--- a/res/cardsfolder/alexi_zephyr_mage.txt
+++ b/res/cardsfolder/alexi_zephyr_mage.txt
@@ -3,7 +3,7 @@ ManaCost:3 U U
 Types:Legendary Creature Human Spellshaper
 Text:no text
 PT:3/3
-A:AB$ChangeZone | Cost$ X U T Discard<2/Any> | Origin$ Battlefield | Destination$ Hand | TargetMin$ 0 | TargetMax$ MaxTgts | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Return X target creatures to their owners' hands.
+A:AB$ChangeZone | Cost$ X U T Discard<2/Card> | Origin$ Battlefield | Destination$ Hand | TargetMin$ 0 | TargetMax$ MaxTgts | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Return X target creatures to their owners' hands.
 # It may seem wrong to not use X in the target, but since the Targets are what defines X, it's redundant (and not supported by the code)
 SVar:X:Targeted$Amount
 SVar:MaxTgts:Count$Valid Creature
diff --git a/res/cardsfolder/amugaba.txt b/res/cardsfolder/amugaba.txt
index 55c592ec19a..79ae9c68ddd 100644
--- a/res/cardsfolder/amugaba.txt
+++ b/res/cardsfolder/amugaba.txt
@@ -4,7 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:6/6
 K:Flying
-A:AB$ChangeZone | Cost$ 2 U Discard<1/Any> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ChangeZone | Cost$ 2 U Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/amugaba.jpg
 SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/61.jpg
diff --git a/res/cardsfolder/aquamoeba.txt b/res/cardsfolder/aquamoeba.txt
index c2f1ef0c8c7..db11c69cba7 100644
--- a/res/cardsfolder/aquamoeba.txt
+++ b/res/cardsfolder/aquamoeba.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Elemental Beast
 Text:no text
 PT:1/3
-A:AB$Pump | Cost$ Discard<1/Any> | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch CARDNAME's power and toughness until end of turn.
+A:AB$Pump | Cost$ Discard<1/Card> | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch CARDNAME's power and toughness until end of turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aquamoeba.jpg
diff --git a/res/cardsfolder/aven_trooper.txt b/res/cardsfolder/aven_trooper.txt
index 92d7c317bbc..1c4c0029849 100644
--- a/res/cardsfolder/aven_trooper.txt
+++ b/res/cardsfolder/aven_trooper.txt
@@ -4,7 +4,7 @@ Types:Creature Bird Soldier
 Text:no text
 PT:1/1
 K:Flying
-A:AB$Pump | Cost$ 2 W Discard<1/Any> | NumAtt$ +1 | NumDef$ +2 | SpellDescription$ CARDNAME gets +1/+2 until end of turn.
+A:AB$Pump | Cost$ 2 W Discard<1/Card> | NumAtt$ +1 | NumDef$ +2 | SpellDescription$ CARDNAME gets +1/+2 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_trooper.jpg
 SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/2.jpg
diff --git a/res/cardsfolder/avenger_en_dal.txt b/res/cardsfolder/avenger_en_dal.txt
index e962d768869..6ba8463f07c 100644
--- a/res/cardsfolder/avenger_en_dal.txt
+++ b/res/cardsfolder/avenger_en_dal.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ 2 W T Discard<1/Any> | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target attacking creature. Its controller gains life equal to its toughness. | SubAbility$ TgtCtrlrGainLife/dX
+A:AB$ChangeZone | Cost$ 2 W T Discard<1/Card> | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target attacking creature. Its controller gains life equal to its toughness. | SubAbility$ TgtCtrlrGainLife/dX
 SVar:dX:Count$TgtCardToughness
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/balloon_peddler.txt b/res/cardsfolder/balloon_peddler.txt
index b622d31662a..4312e713b4e 100644
--- a/res/cardsfolder/balloon_peddler.txt
+++ b/res/cardsfolder/balloon_peddler.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Spellshaper
 Text:no text
 PT:2/2
-A:AB$Pump | Cost$ U T Discard<1/Any> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
+A:AB$Pump | Cost$ U T Discard<1/Card> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balloon_peddler.jpg
 SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/59.jpg
diff --git a/res/cardsfolder/balshan_griffin.txt b/res/cardsfolder/balshan_griffin.txt
index 18618df8558..ff805528b38 100644
--- a/res/cardsfolder/balshan_griffin.txt
+++ b/res/cardsfolder/balshan_griffin.txt
@@ -4,7 +4,7 @@ Types:Creature Griffin
 Text:no text
 PT:3/2
 K:Flying
-A:AB$ChangeZone | Cost$ 2 U Discard<1/Any> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return Amugaba to its owner's hand.
+A:AB$ChangeZone | Cost$ 2 U Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return Amugaba to its owner's hand.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balshan_griffin.jpg
 SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/67.jpg
diff --git a/res/cardsfolder/blaster_mage.txt b/res/cardsfolder/blaster_mage.txt
index 268761c951f..566e25694dd 100644
--- a/res/cardsfolder/blaster_mage.txt
+++ b/res/cardsfolder/blaster_mage.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Creature Human Spellshaper
 Text:no text
 PT:2/2
-A:AB$Destroy | Cost$ R T Discard<1/Any> | ValidTgts$ Wall | TgtPrompt$ Select target Wall | SpellDescription$ Destroy target Wall.
+A:AB$Destroy | Cost$ R T Discard<1/Card> | ValidTgts$ Wall | TgtPrompt$ Select target Wall | SpellDescription$ Destroy target Wall.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blaster_mage.jpg
 SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/175.jpg
diff --git a/res/cardsfolder/bog_witch.txt b/res/cardsfolder/bog_witch.txt
index 7e75162dffa..7c5420caaa2 100644
--- a/res/cardsfolder/bog_witch.txt
+++ b/res/cardsfolder/bog_witch.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$ Mana | Cost$ B T Discard<1/Any> | Produced$ B | Amount$ 3 | SpellDescription$ Add B B B to your mana pool.
+A:AB$ Mana | Cost$ B T Discard<1/Card> | Produced$ B | Amount$ 3 | SpellDescription$ Add B B B to your mana pool.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bog_witch.jpg
diff --git a/res/cardsfolder/bola_warrior.txt b/res/cardsfolder/bola_warrior.txt
index 93fd8d47fcd..0dc0cf22861 100644
--- a/res/cardsfolder/bola_warrior.txt
+++ b/res/cardsfolder/bola_warrior.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Human Spellshaper Warrior
 Text:no text
 PT:1/1
-A:AB$Pump | Cost$ R T Discard<1/Any> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn.
+A:AB$Pump | Cost$ R T Discard<1/Card> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bola_warrior.jpg
diff --git a/res/cardsfolder/centaur_veteran.txt b/res/cardsfolder/centaur_veteran.txt
index db849301455..a24ae41860f 100644
--- a/res/cardsfolder/centaur_veteran.txt
+++ b/res/cardsfolder/centaur_veteran.txt
@@ -4,7 +4,7 @@ Types:Creature Centaur
 Text:no text
 PT:3/3
 K:Trample
-A:AB$Regenerate | Cost$ G Discard<1/Any> | SpellDescription$ Regenerate CARDNAME.
+A:AB$Regenerate | Cost$ G Discard<1/Card> | SpellDescription$ Regenerate CARDNAME.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/centaur_veteran.jpg
 SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/123.jpg
diff --git a/res/cardsfolder/cephalid_inkshrouder.txt b/res/cardsfolder/cephalid_inkshrouder.txt
index 3ee4dd208bb..0ab7bb7e0e4 100644
--- a/res/cardsfolder/cephalid_inkshrouder.txt
+++ b/res/cardsfolder/cephalid_inkshrouder.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Cephalid
 Text:no text
 PT:2/1
-A:AB$Pump | Cost$ Discard<1/Any> | KW$ Shroud & HIDDEN Unblockable | SpellDescription$ CARDNAME gains shroud until end of turn and is unblockable this turn. (A permanent with shroud can't be the target of spells or abilities.)
+A:AB$Pump | Cost$ Discard<1/Card> | KW$ Shroud & HIDDEN Unblockable | SpellDescription$ CARDNAME gains shroud until end of turn and is unblockable this turn. (A permanent with shroud can't be the target of spells or abilities.)
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cephalid_inkshrouder.jpg
diff --git a/res/cardsfolder/cloudseeder.txt b/res/cardsfolder/cloudseeder.txt
index 2e268ae3c56..b175ca2c3ef 100644
--- a/res/cardsfolder/cloudseeder.txt
+++ b/res/cardsfolder/cloudseeder.txt
@@ -4,7 +4,7 @@ Types:Creature Faerie Spellshaper
 Text:no text
 PT:1/1
 K:Flying
-A:AB$Token | Cost$ U T Discard<1/Any> | TokenOwner$ Controller | TokenAmount$ 1 | TokenName$ Cloud Sprite | TokenTypes$ Creature,Faerie | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying<>CARDNAME can block only creatures with flying. | SpellDescription$ Put a 1/1 blue Faerie creature token named Cloud Sprite onto the battlefield. It has flying and "Cloud Sprite can block only creatures with flying."
+A:AB$Token | Cost$ U T Discard<1/Card> | TokenOwner$ Controller | TokenAmount$ 1 | TokenName$ Cloud Sprite | TokenTypes$ Creature,Faerie | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying<>CARDNAME can block only creatures with flying. | SpellDescription$ Put a 1/1 blue Faerie creature token named Cloud Sprite onto the battlefield. It has flying and "Cloud Sprite can block only creatures with flying."
 SVar:Rarity:Uncommon
 SVar:Picture:http://resources.wizards.com/magic/cards/fut/en-us/card130309.jpg
 SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/33.jpg
diff --git a/res/cardsfolder/compulsion.txt b/res/cardsfolder/compulsion.txt
index de54c21730f..3ed8c3558e5 100644
--- a/res/cardsfolder/compulsion.txt
+++ b/res/cardsfolder/compulsion.txt
@@ -2,7 +2,7 @@ Name:Compulsion
 ManaCost:1 U
 Types:Enchantment
 Text:no text
-A:AB$Draw | Cost$ 1 U Discard<1/Any> | NumCards$ 1 | SpellDescription$ Draw a card.
+A:AB$Draw | Cost$ 1 U Discard<1/Card> | NumCards$ 1 | SpellDescription$ Draw a card.
 A:AB$Draw | Cost$ 1 U Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/crashing_centaur.txt b/res/cardsfolder/crashing_centaur.txt
index 20a62e2f07c..6608111892c 100644
--- a/res/cardsfolder/crashing_centaur.txt
+++ b/res/cardsfolder/crashing_centaur.txt
@@ -3,7 +3,7 @@ ManaCost:4 G G
 Types:Creature Centaur
 Text:no text
 PT:3/4
-A:AB$Pump | Cost$ G Discard<1/Any> | KW$ Trample | SpellDescription$ Crashing Centaur gains trample until end of turn.
+A:AB$Pump | Cost$ G Discard<1/Card> | KW$ Trample | SpellDescription$ Crashing Centaur gains trample until end of turn.
 K:stPumpSelf:Creature:2/2/Shroud:Threshold:Threshold - As long as seven or more cards are in your graveyard, Crashing Centaur gets +2/+2 and has shroud. (It can't be the target of spells or abilities.)
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crashing_centaur.jpg
diff --git a/res/cardsfolder/dawnstrider.txt b/res/cardsfolder/dawnstrider.txt
index 835fcd9d745..fb237a9362b 100644
--- a/res/cardsfolder/dawnstrider.txt
+++ b/res/cardsfolder/dawnstrider.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Dryad Spellshaper
 Text:no text
 PT:1/1
-A:AB$Fog | Cost$ G T Discard<1/Any> | SpellDescription$ Prevent all combat damage that would be dealt this turn.
+A:AB$Fog | Cost$ G T Discard<1/Card> | SpellDescription$ Prevent all combat damage that would be dealt this turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dawnstrider.jpg
diff --git a/res/cardsfolder/deepwood_drummer.txt b/res/cardsfolder/deepwood_drummer.txt
index 42b71da322c..9f7201e46c6 100644
--- a/res/cardsfolder/deepwood_drummer.txt
+++ b/res/cardsfolder/deepwood_drummer.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$Pump | Cost$ G T Discard<1/Any> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
+A:AB$Pump | Cost$ G T Discard<1/Card> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deepwood_drummer.jpg
 SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/239.jpg
diff --git a/res/cardsfolder/devout_witness.txt b/res/cardsfolder/devout_witness.txt
index a2238ed7b37..5453ea87a3c 100644
--- a/res/cardsfolder/devout_witness.txt
+++ b/res/cardsfolder/devout_witness.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Human Spellshaper
 Text:no text
 PT:2/2
-A:AB$Destroy | Cost$ 1 W T Discard<1/Any> | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
+A:AB$Destroy | Cost$ 1 W T Discard<1/Card> | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | SpellDescription$ Destroy target artifact or enchantment.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/devout_witness.jpg
 SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/17.jpg
diff --git a/res/cardsfolder/diplomatic_escort.txt b/res/cardsfolder/diplomatic_escort.txt
index b701c8112c5..77425b9a6f3 100644
--- a/res/cardsfolder/diplomatic_escort.txt
+++ b/res/cardsfolder/diplomatic_escort.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$Counter | Cost$ U T Discard<1/Any> | Type$ SpellOrAbility | SpellTarget$ Creature | SpellDescription$ Counter target spell or ability that targets a creature.
+A:AB$Counter | Cost$ U T Discard<1/Card> | Type$ SpellOrAbility | SpellTarget$ Creature | SpellDescription$ Counter target spell or ability that targets a creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/diplomatic_escort.jpg
 SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/74.jpg
diff --git a/res/cardsfolder/dreamscape_artist.txt b/res/cardsfolder/dreamscape_artist.txt
index aed6899cedc..902f846d4cb 100644
--- a/res/cardsfolder/dreamscape_artist.txt
+++ b/res/cardsfolder/dreamscape_artist.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ 2 U T Discard<1/Any> Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards and put them onto the battlefield. Then shuffle your library.
+A:AB$ChangeZone | Cost$ 2 U T Discard<1/Card> Sac<1/Land> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards and put them onto the battlefield. Then shuffle your library.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dreamscape_artist.jpg
 SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/40.jpg
diff --git a/res/cardsfolder/dwarven_armorer.txt b/res/cardsfolder/dwarven_armorer.txt
index 5cd322ec755..78b9cb76652 100644
--- a/res/cardsfolder/dwarven_armorer.txt
+++ b/res/cardsfolder/dwarven_armorer.txt
@@ -3,8 +3,8 @@ ManaCost:R
 Types:Creature Dwarf
 Text:no text
 PT:0/2
-A:AB$PutCounter | Cost$ R T Discard<1/Any> | Tgt$ TgtC | CounterType$ P1P0 | CounterNum$ 1 | SpellDescription$ Put a +1/+0 counter on target creature.
-A:AB$PutCounter | Cost$ R T Discard<1/Any> | Tgt$ TgtC | CounterType$ P0P1 | CounterNum$ 1 | SpellDescription$ Put a +0/+1 counter on target creature.
+A:AB$PutCounter | Cost$ R T Discard<1/Card> | Tgt$ TgtC | CounterType$ P1P0 | CounterNum$ 1 | SpellDescription$ Put a +1/+0 counter on target creature.
+A:AB$PutCounter | Cost$ R T Discard<1/Card> | Tgt$ TgtC | CounterType$ P0P1 | CounterNum$ 1 | SpellDescription$ Put a +0/+1 counter on target creature.
 SVar:Rarity:Rare
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dwarven_armorer.jpg
diff --git a/res/cardsfolder/ephemeron.txt b/res/cardsfolder/ephemeron.txt
index 236a8a76e83..8f576658b41 100644
--- a/res/cardsfolder/ephemeron.txt
+++ b/res/cardsfolder/ephemeron.txt
@@ -4,7 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:4/4
 K:Flying
-A:AB$ChangeZone | Cost$ Discard<1/Any> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.  
+A:AB$ChangeZone | Cost$ Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.  
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ephemeron.jpg
 SetInfo:EXO|Rare|http://magiccards.info/scans/en/ex/31.jpg
diff --git a/res/cardsfolder/escape_artist.txt b/res/cardsfolder/escape_artist.txt
index 9432e415da2..b48a294003e 100644
--- a/res/cardsfolder/escape_artist.txt
+++ b/res/cardsfolder/escape_artist.txt
@@ -4,7 +4,7 @@ Types:Creature Human Wizard
 Text:no text
 PT:1/1
 K:Unblockable
-A:AB$ChangeZone | Cost$ U Discard<1/Any> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ChangeZone | Cost$ U Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/escape_artist.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/84.jpg
diff --git a/res/cardsfolder/face_of_fear.txt b/res/cardsfolder/face_of_fear.txt
index 9c6a6860e0b..a4931538e26 100644
--- a/res/cardsfolder/face_of_fear.txt
+++ b/res/cardsfolder/face_of_fear.txt
@@ -3,7 +3,7 @@ ManaCost:5 B
 Types:Creature Horror
 Text:no text
 PT:3/4
-A:AB$Pump | Cost$ 2 B Discard<1/Any> | KW$ Fear | SpellDescription$ CARDNAME gains fear until end of turn.
+A:AB$Pump | Cost$ 2 B Discard<1/Card> | KW$ Fear | SpellDescription$ CARDNAME gains fear until end of turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/face_of_fear.jpg
diff --git a/res/cardsfolder/fledgling_imp.txt b/res/cardsfolder/fledgling_imp.txt
index 423f596cd81..b12872a8c0e 100644
--- a/res/cardsfolder/fledgling_imp.txt
+++ b/res/cardsfolder/fledgling_imp.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Imp
 Text:no text
 PT:2/2
-A:AB$Pump | Cost$ B Discard<1/Any> | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
+A:AB$Pump | Cost$ B Discard<1/Card> | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fledgling_imp.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/137.jpg
diff --git a/res/cardsfolder/ghost_tactician.txt b/res/cardsfolder/ghost_tactician.txt
index 9c7d2551f44..283b15eedd1 100644
--- a/res/cardsfolder/ghost_tactician.txt
+++ b/res/cardsfolder/ghost_tactician.txt
@@ -3,7 +3,7 @@ ManaCost:4 W
 Types:Creature Spirit Spellshaper
 Text:no text
 PT:2/5
-A:AB$ PumpAll | Cost$ W T Discard<1/Any> | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | SpellDescription$ Creatures you control get +1/+0 until end of turn.
+A:AB$ PumpAll | Cost$ W T Discard<1/Card> | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | SpellDescription$ Creatures you control get +1/+0 until end of turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghost_tactician.jpg
diff --git a/res/cardsfolder/gigapede.txt b/res/cardsfolder/gigapede.txt
index bdfb7f7263a..942461ae124 100644
--- a/res/cardsfolder/gigapede.txt
+++ b/res/cardsfolder/gigapede.txt
@@ -3,7 +3,7 @@ ManaCost:3 G G
 Types:Creature Insect
 Text:no text
 PT:6/1
-A:AB$ChangeZone | Cost$Discard<1/Any> | Origin$ Graveyard | Destination$ Hand | ActivatingZone$ Graveyard | ActivatingPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Return Gigapede from your graveyard to your hand. Play this ability only during your upkeep.
+A:AB$ChangeZone | Cost$Discard<1/Card> | Origin$ Graveyard | Destination$ Hand | ActivatingZone$ Graveyard | ActivatingPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Return Gigapede from your graveyard to your hand. Play this ability only during your upkeep.
 K:Shroud
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/glint_eye_nephilim.txt b/res/cardsfolder/glint_eye_nephilim.txt
index fce6ea8ba8d..69de5635eff 100644
--- a/res/cardsfolder/glint_eye_nephilim.txt
+++ b/res/cardsfolder/glint_eye_nephilim.txt
@@ -3,7 +3,7 @@ ManaCost:U B R G
 Types:Creature Nephilim
 Text:Whenever Glint-Eye Nephilim deals combat damage to a player, draw that many cards.
 PT:2/2
-A:AB$Pump | Cost$ 1 Discard<1/Any> | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
+A:AB$Pump | Cost$ 1 Discard<1/Card> | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glint_eye_nephilim.jpg
 SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/115.jpg
diff --git a/res/cardsfolder/greel_mind_raker.txt b/res/cardsfolder/greel_mind_raker.txt
index 715fc453ad2..c2e86f09629 100644
--- a/res/cardsfolder/greel_mind_raker.txt
+++ b/res/cardsfolder/greel_mind_raker.txt
@@ -3,7 +3,7 @@ ManaCost:3 B B
 Types:Legendary Creature Horror Spellshaper
 Text:no text
 PT:3/3
-A:AB$ Discard | Cost$ X B T Discard<2/Any> | ValidTgts$ Player | NumCards$ X | Mode$ Random | SpellDescription$ Target player discards X cards at random.
+A:AB$ Discard | Cost$ X B T Discard<2/Card> | ValidTgts$ Player | NumCards$ X | Mode$ Random | SpellDescription$ Target player discards X cards at random.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/greenseeker.txt b/res/cardsfolder/greenseeker.txt
index 0cfab037c1b..b23afd52758 100644
--- a/res/cardsfolder/greenseeker.txt
+++ b/res/cardsfolder/greenseeker.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Creature Elf Spellshaper
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ G T Discard<1/Any> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.
+A:AB$ChangeZone | Cost$ G T Discard<1/Card> | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/greenseeker.jpg
diff --git a/res/cardsfolder/grotesque_hybrid.txt b/res/cardsfolder/grotesque_hybrid.txt
index 0c77da55ce4..73ec392b916 100644
--- a/res/cardsfolder/grotesque_hybrid.txt
+++ b/res/cardsfolder/grotesque_hybrid.txt
@@ -4,7 +4,7 @@ Types:Creature Zombie
 Text:no text
 PT:3/3
 K:Whenever CARDNAME deals combat damage to a creature, destroy that creature. It can't be regenerated.
-A:AB$Pump | Cost$ Discard<1/Any> | KW$ Flying & Protection from green & Protection from white | SpellDescription$ CARDNAME gains flying and protection from green and from white until end of turn.
+A:AB$Pump | Cost$ Discard<1/Card> | KW$ Flying & Protection from green & Protection from white | SpellDescription$ CARDNAME gains flying and protection from green and from white until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grotesque_hybrid.jpg
 SetInfo:TOR|Uncommon|http://magiccards.info/scans/en/tr/63.jpg
diff --git a/res/cardsfolder/hammer_mage.txt b/res/cardsfolder/hammer_mage.txt
index 9132bed3994..76e05401233 100644
--- a/res/cardsfolder/hammer_mage.txt
+++ b/res/cardsfolder/hammer_mage.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$DestroyAll | Cost$ X R T Discard<1/Any> | ValidCards$ Artifact.cmcLEX | SpellDescription$ Destroy all artifacts with converted mana cost X or less.
+A:AB$DestroyAll | Cost$ X R T Discard<1/Card> | ValidCards$ Artifact.cmcLEX | SpellDescription$ Destroy all artifacts with converted mana cost X or less.
 SVar:X:Count$xPaid
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hammer_mage.jpg
diff --git a/res/cardsfolder/icatian_crier.txt b/res/cardsfolder/icatian_crier.txt
index 9620632b4d9..0e7cd25cdb6 100644
--- a/res/cardsfolder/icatian_crier.txt
+++ b/res/cardsfolder/icatian_crier.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-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.
+A:AB$ Token | Cost$ 1 W T Discard<1/Card> | 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
 SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/23.jpg
diff --git a/res/cardsfolder/kris_mage.txt b/res/cardsfolder/kris_mage.txt
index 82e936781b5..99613423692 100644
--- a/res/cardsfolder/kris_mage.txt
+++ b/res/cardsfolder/kris_mage.txt
@@ -3,7 +3,7 @@ ManaCost:R
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$DealDamage | Cost$ R T Discard<1/Any> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
+A:AB$DealDamage | Cost$ R T Discard<1/Card> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kris_mage.jpg
 SVar:RemAIDeck:True
diff --git a/res/cardsfolder/krosan_archer.txt b/res/cardsfolder/krosan_archer.txt
index d774a098ef8..d79b4dd328e 100644
--- a/res/cardsfolder/krosan_archer.txt
+++ b/res/cardsfolder/krosan_archer.txt
@@ -4,7 +4,7 @@ Types:Creature Centaur Archer
 Text:no text
 PT:2/3
 K:Reach
-A:AB$Pump | Cost$ G Discard<1/Any> | NumDef$ +2 | SpellDescription$ CARDNAME gets +0/+2 until end of turn.
+A:AB$Pump | Cost$ G Discard<1/Card> | NumDef$ +2 | SpellDescription$ CARDNAME gets +0/+2 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/krosan_archer.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/246.jpg
diff --git a/res/cardsfolder/latulla_keldon_overseer.txt b/res/cardsfolder/latulla_keldon_overseer.txt
index a18f40ca63b..4cacc10c1b6 100644
--- a/res/cardsfolder/latulla_keldon_overseer.txt
+++ b/res/cardsfolder/latulla_keldon_overseer.txt
@@ -3,7 +3,7 @@ ManaCost:3 R R
 Types:Legendary Creature Spellshaper
 Text:no text
 PT:3/3
-A:AB$DealDamage | Cost$ X R T Discard<2/Any>| Tgt$ TgtCP | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to target creature or player.
+A:AB$DealDamage | Cost$ X R T Discard<2/Card>| Tgt$ TgtCP | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to target creature or player.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/llanowar_mentor.txt b/res/cardsfolder/llanowar_mentor.txt
index 715767339bf..7f8c8b76513 100644
--- a/res/cardsfolder/llanowar_mentor.txt
+++ b/res/cardsfolder/llanowar_mentor.txt
@@ -3,8 +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."
-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."
+#K:abMakeToken G T Discard<1/Card><>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/Card> | 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
 SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/131.jpg
diff --git a/res/cardsfolder/mageta_the_lion.txt b/res/cardsfolder/mageta_the_lion.txt
index d3e30a07c5a..cca8f51dc7f 100644
--- a/res/cardsfolder/mageta_the_lion.txt
+++ b/res/cardsfolder/mageta_the_lion.txt
@@ -3,7 +3,7 @@ ManaCost:3 W W
 Types:Legendary Creature Human Spellshaper
 Text:no text
 PT:3/3
-A:AB$DestroyAll | Cost$ 2 W W T Discard<2/Any> | ValidCards$ Creature.Other | NoRegen$ True | SpellDescription$ Destroy all creatures except for Mageta the Lion. Those creatures can't be regenerated.
+A:AB$DestroyAll | Cost$ 2 W W T Discard<2/Card> | ValidCards$ Creature.Other | NoRegen$ True | SpellDescription$ Destroy all creatures except for Mageta the Lion. Those creatures can't be regenerated.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mageta_the_lion.jpg
 SetInfo:PCY|Rare|http://magiccards.info/scans/en/pr/13.jpg
diff --git a/res/cardsfolder/medicine_bag.txt b/res/cardsfolder/medicine_bag.txt
index 3df342710b5..c5874940dce 100644
--- a/res/cardsfolder/medicine_bag.txt
+++ b/res/cardsfolder/medicine_bag.txt
@@ -2,7 +2,7 @@ Name:Medicine Bag
 ManaCost:3
 Types:Artifact
 Text:no text
-A:AB$Regenerate | Tgt$ TgtC | Cost$ 1 T Discard<1/Any> | SpellDescription$ Regenerate target creature.
+A:AB$Regenerate | Tgt$ TgtC | Cost$ 1 T Discard<1/Card> | SpellDescription$ Regenerate target creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/medicine_bag.jpg
 SetInfo:EXO|Uncommon|http://magiccards.info/scans/en/ex/133.jpg
diff --git a/res/cardsfolder/mental_discipline.txt b/res/cardsfolder/mental_discipline.txt
index 8a904cf1d9e..43a2c019026 100644
--- a/res/cardsfolder/mental_discipline.txt
+++ b/res/cardsfolder/mental_discipline.txt
@@ -2,7 +2,7 @@ Name:Mental Discipline
 ManaCost:1 U U
 Types:Enchantment
 Text:no text
-A:AB$Draw | Cost$ 1 U Discard<1/Any> | NumCards$ 1 | SpellDescription$ Draw a card.
+A:AB$Draw | Cost$ 1 U Discard<1/Card> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mental_discipline.jpg
diff --git a/res/cardsfolder/mesmeric_trance.txt b/res/cardsfolder/mesmeric_trance.txt
index c82639c70a7..47710ea2571 100644
--- a/res/cardsfolder/mesmeric_trance.txt
+++ b/res/cardsfolder/mesmeric_trance.txt
@@ -3,7 +3,7 @@ ManaCost:1 U U
 Types:Enchantment
 Text:no text
 K:Cumulative upkeep:1
-A:AB$Draw | Cost$ U Discard<1/Any> | NumCards $ 1 | SpellDescription$ Draw a card.
+A:AB$Draw | Cost$ U Discard<1/Card> | NumCards $ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mesmeric_trance.jpg
diff --git a/res/cardsfolder/mind_over_matter.txt b/res/cardsfolder/mind_over_matter.txt
index 46289f9207d..c789811426f 100644
--- a/res/cardsfolder/mind_over_matter.txt
+++ b/res/cardsfolder/mind_over_matter.txt
@@ -2,8 +2,8 @@ Name:Mind Over Matter
 ManaCost:2 U U U U
 Types:Enchantment
 Text:no text
-A:AB$Tap | Cost$ Discard<1/Any> | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SpellDescription$ Tap target artifact, creature, or land.
-A:AB$Untap | Cost$ Discard<1/Any> | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SpellDescription$ Untap target artifact, creature, or land.
+A:AB$Tap | Cost$ Discard<1/Card> | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SpellDescription$ Tap target artifact, creature, or land.
+A:AB$Untap | Cost$ Discard<1/Card> | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SpellDescription$ Untap target artifact, creature, or land.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mind_over_matter.jpg
diff --git a/res/cardsfolder/mindless_automaton.txt b/res/cardsfolder/mindless_automaton.txt
index c5a059a162c..01a2d8ab705 100644
--- a/res/cardsfolder/mindless_automaton.txt
+++ b/res/cardsfolder/mindless_automaton.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Construct
 Text:no text
 PT:0/0
 K:etbCounter:P1P1:2
-A:AB$PutCounter | Cost$ 1 Discard<1/Any> | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on Mindless Automaton.
+A:AB$PutCounter | Cost$ 1 Discard<1/Card> | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on Mindless Automaton.
 A:AB$Draw | Cost$ SubCounter<2/P1P1> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mindless_automaton.jpg
diff --git a/res/cardsfolder/mortiphobia.txt b/res/cardsfolder/mortiphobia.txt
index 8a2fa65cd4e..5f3670879d6 100644
--- a/res/cardsfolder/mortiphobia.txt
+++ b/res/cardsfolder/mortiphobia.txt
@@ -2,7 +2,7 @@ Name:Mortiphobia
 ManaCost:1 B B
 Types:Enchantment
 Text:no text
-A:AB$ChangeZone | Cost$ 1 B Discard<1/Any> | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
+A:AB$ChangeZone | Cost$ 1 B Discard<1/Card> | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
 A:AB$ChangeZone | Cost$ 1 B Sac<1/CARDNAME> | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Card | SpellDescription$ Exile target card from a graveyard.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/narcissism.txt b/res/cardsfolder/narcissism.txt
index b8917e571f1..7c47da1fd9e 100644
--- a/res/cardsfolder/narcissism.txt
+++ b/res/cardsfolder/narcissism.txt
@@ -2,7 +2,7 @@ Name:Narcissism
 ManaCost:2 G
 Types:Enchantment
 Text:no text
-A:AB$Pump | Cost$ G Discard<1/Any> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
+A:AB$Pump | Cost$ G Discard<1/Card> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
 A:AB$Pump | Cost$ G Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/narcissism.jpg
diff --git a/res/cardsfolder/notorious_assassin.txt b/res/cardsfolder/notorious_assassin.txt
index fd0e4225f6a..1f76b31ce88 100644
--- a/res/cardsfolder/notorious_assassin.txt
+++ b/res/cardsfolder/notorious_assassin.txt
@@ -3,7 +3,7 @@ ManaCost:3 B
 Types:Creature Human Spellshaper Assassin
 Text:no text
 PT:2/2
-A:AB$Destroy | Cost$ 2 B T Discard<1/Any> | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NoRegen$ True | SpellDescription$ Destroy target nonblack creature. It can't be regenerated.
+A:AB$Destroy | Cost$ 2 B T Discard<1/Card> | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NoRegen$ True | SpellDescription$ Destroy target nonblack creature. It can't be regenerated.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/notorious_assassin.jpg
 SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/150.jpg
diff --git a/res/cardsfolder/oblivion_crown.txt b/res/cardsfolder/oblivion_crown.txt
index 7d46398d953..347af7617e5 100644
--- a/res/cardsfolder/oblivion_crown.txt
+++ b/res/cardsfolder/oblivion_crown.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPump:+0/+0
-A:AB$Pump | Cost$ Discard<1/Any> | Defined$ Enchanted | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Enchanted creature gets +1/+1 until end of turn.
+A:AB$Pump | Cost$ Discard<1/Card> | Defined$ Enchanted | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Enchanted creature gets +1/+1 until end of turn.
 K:Flash
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oblivion_crown.jpg
diff --git a/res/cardsfolder/overtaker.txt b/res/cardsfolder/overtaker.txt
index 44e705f2e88..53253a74d85 100644
--- a/res/cardsfolder/overtaker.txt
+++ b/res/cardsfolder/overtaker.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Merfolk Spellshaper
 Text:no text
 PT:1/1
-A:AB$ GainControl | Cost$ 3 U T Discard<1/Any> | Tgt$ TgtC | LoseControl$ EOT | AddKWs$ Haste | Untap$ True | SpellDescription$ Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn.
+A:AB$ GainControl | Cost$ 3 U T Discard<1/Card> | Tgt$ TgtC | LoseControl$ EOT | AddKWs$ Haste | Untap$ True | SpellDescription$ Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overtaker.jpg
 SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/89.jpg
diff --git a/res/cardsfolder/peace_of_mind.txt b/res/cardsfolder/peace_of_mind.txt
index 968802b9400..720e25cd447 100644
--- a/res/cardsfolder/peace_of_mind.txt
+++ b/res/cardsfolder/peace_of_mind.txt
@@ -2,7 +2,7 @@ Name:Peace of Mind
 ManaCost:1 W
 Types:Enchantment
 Text:no text
-A:AB$GainLife | Cost$ W Discard<1/Any> | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
+A:AB$GainLife | Cost$ W Discard<1/Card> | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/peace_of_mind.jpg
 SetInfo:EXO|Uncommon|http://magiccards.info/scans/en/ex/13.jpg
diff --git a/res/cardsfolder/pegasus_refuge.txt b/res/cardsfolder/pegasus_refuge.txt
index 52667ceb99e..5c975161e99 100644
--- a/res/cardsfolder/pegasus_refuge.txt
+++ b/res/cardsfolder/pegasus_refuge.txt
@@ -2,7 +2,7 @@ Name:Pegasus Refuge
 ManaCost:3 W
 Types:Enchantment
 Text:no text
-A:AB$ Token | Cost$ 2 Discard<1/Any> | TokenImage$ W 1 1 Pegasus Flying | TokenAmount$ 1 | TokenName$ Pegasus | TokenTypes$ Creature,Pegasus | TokenOwner$ Controller | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Put a 1/1 white Pegasus creature token with flying onto the battlefield.
+A:AB$ Token | Cost$ 2 Discard<1/Card> | TokenImage$ W 1 1 Pegasus Flying | TokenAmount$ 1 | TokenName$ Pegasus | TokenTypes$ Creature,Pegasus | TokenOwner$ Controller | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Put a 1/1 white Pegasus creature token with flying onto the battlefield.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pegasus_refuge.jpg
diff --git a/res/cardsfolder/plague_witch.txt b/res/cardsfolder/plague_witch.txt
index 4975390d2eb..5b60b9de7a0 100644
--- a/res/cardsfolder/plague_witch.txt
+++ b/res/cardsfolder/plague_witch.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Elf Spellshaper
 Text:no text
 PT:1/1
-A:AB$Pump | Cost$ B T Discard<1/Any> | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Target creature gets -1/-1 until end of turn.
+A:AB$Pump | Cost$ B T Discard<1/Card> | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Target creature gets -1/-1 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/plague_witch.jpg
 SetInfo:NMS|Common|http://magiccards.info/scans/en/ne/66.jpg
diff --git a/res/cardsfolder/putrid_imp.txt b/res/cardsfolder/putrid_imp.txt
index 11948c0c0c6..1b3e52f28cf 100644
--- a/res/cardsfolder/putrid_imp.txt
+++ b/res/cardsfolder/putrid_imp.txt
@@ -3,7 +3,7 @@ ManaCost:B
 Types:Creature Zombie Imp
 Text:no text
 PT:1/1
-A:AB$Pump | Cost$ Discard<1/Any> | KW$ Flying | SpellDescription$ Putrid Imp gains flying until end of turn.
+A:AB$Pump | Cost$ Discard<1/Card> | KW$ Flying | SpellDescription$ Putrid Imp gains flying until end of turn.
 K:stPumpSelf:Creature:1/1/HIDDEN CARDNAME can't block.:Threshold:Threshold - As long as seven or more cards are in your graveyard, Putrid Imp gets +1/+1 and can't block.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/putrid_imp.jpg
diff --git a/res/cardsfolder/rakdos_guildmage.txt b/res/cardsfolder/rakdos_guildmage.txt
index 63fdce65b5a..322419d5a8c 100644
--- a/res/cardsfolder/rakdos_guildmage.txt
+++ b/res/cardsfolder/rakdos_guildmage.txt
@@ -3,7 +3,7 @@ ManaCost:BR BR
 Types:Creature Zombie Shaman
 Text:no text
 PT:2/2
-A:AB$ Pump | Cost$ 3 B Discard<1/Any> | Tgt$ TgtC | NumAtt$ -2 | NumDef$ -2 | IsCurse$True | SpellDescription$ Target creature gets -2/-2 until end of turn.
+A:AB$ Pump | Cost$ 3 B Discard<1/Card> | Tgt$ TgtC | NumAtt$ -2 | NumDef$ -2 | IsCurse$True | SpellDescription$ Target creature gets -2/-2 until end of turn.
 A:AB$Token | Cost$ 3 R | TokenAmount$ 1 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ Controller | TokenColors$ Red | TokenPower$ 2 | TokenToughness$ 1 | TokenKeywords$ Haste<>At the beginning of the end step, exile CARDNAME. | SpellDescription$ Put a 2/1 red Goblin creature token with haste onto the battlefield. Exile it at the beginning of the next end step.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_guildmage.jpg
diff --git a/res/cardsfolder/resilient_wanderer.txt b/res/cardsfolder/resilient_wanderer.txt
index 160a5d6f886..e47ff71e9ea 100644
--- a/res/cardsfolder/resilient_wanderer.txt
+++ b/res/cardsfolder/resilient_wanderer.txt
@@ -4,11 +4,11 @@ Types:Creature Human Nomad
 Text:no text
 PT:2/3
 K:First Strike
-A:AB$Pump | Cost$ Discard<1/Any> | KW$ Protection from black | SpellDescription$ CARDNAME gains protection from black until end of turn.
-A:AB$Pump | Cost$ Discard<1/Any> | KW$ Protection from blue | SpellDescription$ CARDNAME gains protection from blue until end of turn.
-A:AB$Pump | Cost$ Discard<1/Any> | KW$ Protection from green | SpellDescription$ CARDNAME gains protection from green until end of turn.
-A:AB$Pump | Cost$ Discard<1/Any> | KW$ Protection from red | SpellDescription$ CARDNAME gains protection from red until end of turn.
-A:AB$Pump | Cost$ Discard<1/Any> | KW$ Protection from white | SpellDescription$ CARDNAME gains protection from white until end of turn.
+A:AB$Pump | Cost$ Discard<1/Card> | KW$ Protection from black | SpellDescription$ CARDNAME gains protection from black until end of turn.
+A:AB$Pump | Cost$ Discard<1/Card> | KW$ Protection from blue | SpellDescription$ CARDNAME gains protection from blue until end of turn.
+A:AB$Pump | Cost$ Discard<1/Card> | KW$ Protection from green | SpellDescription$ CARDNAME gains protection from green until end of turn.
+A:AB$Pump | Cost$ Discard<1/Card> | KW$ Protection from red | SpellDescription$ CARDNAME gains protection from red until end of turn.
+A:AB$Pump | Cost$ Discard<1/Card> | KW$ Protection from white | SpellDescription$ CARDNAME gains protection from white until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/resilient_wanderer.jpg
 SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/43.jpg
diff --git a/res/cardsfolder/ridged_kusite.txt b/res/cardsfolder/ridged_kusite.txt
index 24ce9d8ec89..2dd1618b3b8 100644
--- a/res/cardsfolder/ridged_kusite.txt
+++ b/res/cardsfolder/ridged_kusite.txt
@@ -3,7 +3,7 @@ ManaCost:B
 Types:Creature Horror Spellshaper
 Text:no text
 PT:1/1
-A:AB$Pump | Cost$ 1 B T Discard<1/Any> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | KW$ First Strike | SpellDescription$ Target creature gets +1/+0 and gains first strike until end of turn.
+A:AB$Pump | Cost$ 1 B T Discard<1/Card> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | KW$ First Strike | SpellDescription$ Target creature gets +1/+0 and gains first strike until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ridged_kusite.jpg
 SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/78.jpg
diff --git a/res/cardsfolder/rushwood_herbalist.txt b/res/cardsfolder/rushwood_herbalist.txt
index 10678fc014a..1d20cc699a4 100644
--- a/res/cardsfolder/rushwood_herbalist.txt
+++ b/res/cardsfolder/rushwood_herbalist.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Human Spellshaper
 Text:no text
 PT:2/2
-A:AB$Regenerate | Tgt$ TgtC | Cost$ G T Discard<1/Any> | SpellDescription$ Regenerate target creature.
+A:AB$Regenerate | Tgt$ TgtC | Cost$ G T Discard<1/Card> | SpellDescription$ Regenerate target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rushwood_herbalist.jpg
 SetInfo:MMQ|Common|http://magiccards.info/scans/en/mm/265.jpg
diff --git a/res/cardsfolder/seismic_mage.txt b/res/cardsfolder/seismic_mage.txt
index 3f277a3eee9..3bbe3b86329 100644
--- a/res/cardsfolder/seismic_mage.txt
+++ b/res/cardsfolder/seismic_mage.txt
@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$Destroy | Cost$ 2 R T Discard<1/Any> | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Destroy target land.
+A:AB$Destroy | Cost$ 2 R T Discard<1/Card> | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Destroy target land.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seismic_mage.jpg
 SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/211.jpg
diff --git a/res/cardsfolder/skullmead_cauldron.txt b/res/cardsfolder/skullmead_cauldron.txt
index b48ca13cc22..ee62e11d7e6 100644
--- a/res/cardsfolder/skullmead_cauldron.txt
+++ b/res/cardsfolder/skullmead_cauldron.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact
 Text:no text
 A:AB$GainLife | Cost$ T | LifeAmount$ 1 | SpellDescription$ You gain 1 life.
-A:AB$GainLife | Cost$ T Discard<1/Any>| LifeAmount$ 3 | SpellDescription$ You gain 3 life.
+A:AB$GainLife | Cost$ T Discard<1/Card>| LifeAmount$ 3 | SpellDescription$ You gain 3 life.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skullmead_cauldron.jpg
 SetInfo:DIS|Uncommon|http://magiccards.info/scans/en/di/167.jpg
diff --git a/res/cardsfolder/skywing_aven.txt b/res/cardsfolder/skywing_aven.txt
index 2e642c686f0..5a3058e9a82 100644
--- a/res/cardsfolder/skywing_aven.txt
+++ b/res/cardsfolder/skywing_aven.txt
@@ -4,7 +4,7 @@ Types:Creature Bird Soldier
 Text:no text
 PT:2/1
 K:Flying
-A:AB$ ChangeZone | Cost$ Discard<1/Any> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+A:AB$ ChangeZone | Cost$ Discard<1/Card> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skywing_aven.jpg
 SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/47.jpg
diff --git a/res/cardsfolder/sliversmith.txt b/res/cardsfolder/sliversmith.txt
index bc359b327ab..30f16c8e6cc 100644
--- a/res/cardsfolder/sliversmith.txt
+++ b/res/cardsfolder/sliversmith.txt
@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact Creature Spellshaper
 Text:no text
 PT:1/1
-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.
+A:AB$ Token | Cost$ 1 T Discard<1/Card> | 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
 SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/163.jpg
diff --git a/res/cardsfolder/sparkspitter.txt b/res/cardsfolder/sparkspitter.txt
index b22723e0978..2d9aad7ad0a 100644
--- a/res/cardsfolder/sparkspitter.txt
+++ b/res/cardsfolder/sparkspitter.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Creature Elemental Spellshaper
 Text:no text
 PT:1/3
-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."
+A:AB$ Token | Cost$ R T Discard<1/Card> | 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
 SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/109.jpg
diff --git a/res/cardsfolder/stalking_bloodsucker.txt b/res/cardsfolder/stalking_bloodsucker.txt
index 20fd5b425d8..246361c4c67 100644
--- a/res/cardsfolder/stalking_bloodsucker.txt
+++ b/res/cardsfolder/stalking_bloodsucker.txt
@@ -4,7 +4,7 @@ Types:Creature Vampire
 Text:no text
 PT:4/4
 K:Flying
-A:AB$Pump | Cost$ 1 B Discard<1/Any> | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Stalking Bloodsucker gets +2/+2 until end of turn.
+A:AB$Pump | Cost$ 1 B Discard<1/Card> | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Stalking Bloodsucker gets +2/+2 until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stalking_bloodsucker.jpg
 SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/163.jpg
diff --git a/res/cardsfolder/stampede_driver.txt b/res/cardsfolder/stampede_driver.txt
index 0dd1c5ac2b9..2bdc767d0df 100644
--- a/res/cardsfolder/stampede_driver.txt
+++ b/res/cardsfolder/stampede_driver.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$ PumpAll | Cost$ 1 G T Discard<1/Any> | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Trample | SpellDescription$ Creatures you control get +1/+1 and gain trample until end of turn.
+A:AB$ PumpAll | Cost$ 1 G T Discard<1/Card> | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Trample | SpellDescription$ Creatures you control get +1/+1 and gain trample until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stampede_driver.jpg
 SetInfo:NMS|Uncommon|http://magiccards.info/scans/en/ne/122.jpg
diff --git a/res/cardsfolder/stronghold_biologist.txt b/res/cardsfolder/stronghold_biologist.txt
index 3ce4c4e2b57..a0ea33c4054 100644
--- a/res/cardsfolder/stronghold_biologist.txt
+++ b/res/cardsfolder/stronghold_biologist.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$Counter | Cost$ U U T Discard<1/Any> | Type$ Spell | CounterValid$ Card.Creature | SpellDescription$ Counter target creature spell.
+A:AB$Counter | Cost$ U U T Discard<1/Card> | Type$ Spell | CounterValid$ Card.Creature | SpellDescription$ Counter target creature spell.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stronghold_biologist.jpg
 SetInfo:NMS|Uncommon|http://magiccards.info/scans/en/ne/45.jpg
diff --git a/res/cardsfolder/stronghold_machinist.txt b/res/cardsfolder/stronghold_machinist.txt
index f2d633b419c..46b907cbc89 100644
--- a/res/cardsfolder/stronghold_machinist.txt
+++ b/res/cardsfolder/stronghold_machinist.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$Counter | Cost$ U U T Discard<1/Any> | Type$ Spell | CounterValid$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
+A:AB$Counter | Cost$ U U T Discard<1/Card> | Type$ Spell | CounterValid$ Card.nonCreature | SpellDescription$ Counter target noncreature spell.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stronghold_machinist.jpg
 SetInfo:NMS|Uncommon|http://magiccards.info/scans/en/ne/46.jpg
diff --git a/res/cardsfolder/thalakos_drifters.txt b/res/cardsfolder/thalakos_drifters.txt
index 36f10c1a51a..e48fda49e38 100644
--- a/res/cardsfolder/thalakos_drifters.txt
+++ b/res/cardsfolder/thalakos_drifters.txt
@@ -3,7 +3,7 @@ ManaCost:2 U U
 Types:Creature Thalakos
 Text:no text
 PT:3/3
-A:AB$Pump | Cost$ Discard<1/Any> | KW$ Shadow | SpellDescription$ Thalakos Drifters gains shadow until end of turn.
+A:AB$Pump | Cost$ Discard<1/Card> | KW$ Shadow | SpellDescription$ Thalakos Drifters gains shadow until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thalakos_drifters.jpg
 SetInfo:EXO|Rare|http://magiccards.info/scans/en/ex/47.jpg
diff --git a/res/cardsfolder/tireless_tribe.txt b/res/cardsfolder/tireless_tribe.txt
index 300be62430f..66be8f17d34 100644
--- a/res/cardsfolder/tireless_tribe.txt
+++ b/res/cardsfolder/tireless_tribe.txt
@@ -3,7 +3,7 @@ ManaCost:W
 Types:Creature Human Nomad
 Text:no text
 PT:1/1
-A:AB$Pump | Cost$ Discard<1/Any> | NumDef$ +4 | SpellDescription$ CARDNAME gets +0/+4 until end of turn.
+A:AB$Pump | Cost$ Discard<1/Card> | NumDef$ +4 | SpellDescription$ CARDNAME gets +0/+4 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tireless_tribe.jpg
 SetInfo:ODY|Common|http://magiccards.info/scans/en/od/56.jpg
diff --git a/res/cardsfolder/tonic_peddler.txt b/res/cardsfolder/tonic_peddler.txt
index 84232f1759b..3ff26962c0e 100644
--- a/res/cardsfolder/tonic_peddler.txt
+++ b/res/cardsfolder/tonic_peddler.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Creature Human Spellshaper
 PT:1/1
 Text:no text
-A:AB$GainLife | Cost$ W T Discard<1/Any> | LifeAmount$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player to gain 3 life | SpellDescription$ Target player gains 3 life.
+A:AB$GainLife | Cost$ W T Discard<1/Card> | LifeAmount$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player to gain 3 life | SpellDescription$ Target player gains 3 life.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tonic_peddler.jpg
 SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/54.jpg
diff --git a/res/cardsfolder/tortured_existence.txt b/res/cardsfolder/tortured_existence.txt
index 8914ab8d20d..3444ead5643 100644
--- a/res/cardsfolder/tortured_existence.txt
+++ b/res/cardsfolder/tortured_existence.txt
@@ -2,7 +2,7 @@ Name:Tortured Existence
 ManaCost:B
 Types:Enchantment
 Text:no text
-A:AB$ChangeZone | Cost$ B Discard<1/Any> | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target creature card from your graveyard to your hand.
+A:AB$ChangeZone | Cost$ B Discard<1/Card> | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target creature card from your graveyard to your hand.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tortured_existence.jpg
diff --git a/res/cardsfolder/trickster_mage.txt b/res/cardsfolder/trickster_mage.txt
index 435dc3f6235..cd7b5897f6e 100644
--- a/res/cardsfolder/trickster_mage.txt
+++ b/res/cardsfolder/trickster_mage.txt
@@ -3,8 +3,8 @@ ManaCost:U
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$Tap | Cost$ U T Discard<1/Any> | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SpellDescription$ Tap target artifact, creature, or land.
-A:AB$Untap | Cost$ U T Discard<1/Any> | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SpellDescription$ Untap target artifact, creature, or land.
+A:AB$Tap | Cost$ U T Discard<1/Card> | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SpellDescription$ Tap target artifact, creature, or land.
+A:AB$Untap | Cost$ U T Discard<1/Card> | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SpellDescription$ Untap target artifact, creature, or land.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/trickster_mage.jpg
diff --git a/res/cardsfolder/undead_gladiator.txt b/res/cardsfolder/undead_gladiator.txt
index cd159927fd3..ee95aacc055 100644
--- a/res/cardsfolder/undead_gladiator.txt
+++ b/res/cardsfolder/undead_gladiator.txt
@@ -4,7 +4,7 @@ Types:Creature Zombie Barbarian
 Text:no text
 PT:3/1
 K:Cycling:1 B
-A:AB$ChangeZone | Cost$ 1 B Discard<1/Any> | Origin$ Graveyard | Destination$ Hand | ActivatingZone$ Graveyard | ActivatingPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Return Undead Gladiator from your graveyard to your hand. Activate this ability only during your upkeep.
+A:AB$ChangeZone | Cost$ 1 B Discard<1/Card> | Origin$ Graveyard | Destination$ Hand | ActivatingZone$ Graveyard | ActivatingPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Return Undead Gladiator from your graveyard to your hand. Activate this ability only during your upkeep.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/undead_gladiator.jpg
 SetInfo:ONS|Rare|http://magiccards.info/scans/en/on/178.jpg
diff --git a/res/cardsfolder/undertaker.txt b/res/cardsfolder/undertaker.txt
index 2024034cb75..7d5214c49c7 100644
--- a/res/cardsfolder/undertaker.txt
+++ b/res/cardsfolder/undertaker.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Human Spellshaper
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ B T Discard<1/Any> | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target creature card from your graveyard to your hand.
+A:AB$ChangeZone | Cost$ B T Discard<1/Card> | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target creature card from your graveyard to your hand.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/undertaker.jpg
 SetInfo:TSB|Special|http://magiccards.info/scans/en/tsts/53.jpg
diff --git a/res/cardsfolder/urborg_syphon_mage.txt b/res/cardsfolder/urborg_syphon_mage.txt
index b98109eb02a..61a1c4c60fc 100644
--- a/res/cardsfolder/urborg_syphon_mage.txt
+++ b/res/cardsfolder/urborg_syphon_mage.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Human Spellshaper
 Text:no text
 PT:2/2
-A:AB$LoseLife|Cost$2 B T Discard<1/Any>|LifeAmount$2|SubAbility$YouGainLife/2|SpellDescription$Each other player loses 2 life. You gain life equal to the life lost this way.
+A:AB$LoseLife|Cost$2 B T Discard<1/Card>|LifeAmount$2|SubAbility$YouGainLife/2|SpellDescription$Each other player loses 2 life. You gain life equal to the life lost this way.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/tsp/en-us/card108798.jpg
 SetInfo:TSP|Common|http://magiccards.info/scans/en/ts/139.jpg
diff --git a/res/cardsfolder/waste_away.txt b/res/cardsfolder/waste_away.txt
index 73eece20ff1..82029856b59 100644
--- a/res/cardsfolder/waste_away.txt
+++ b/res/cardsfolder/waste_away.txt
@@ -2,7 +2,7 @@ Name:Waste Away
 ManaCost:4 B
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ 4 B Discard<1/Any> | NumAtt$ -5 | NumDef$ -5 | IsCurse$True | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Target creature gets -5/-5 until end of turn.
+A:SP$Pump | Cost$ 4 B Discard<1/Card> | NumAtt$ -5 | NumDef$ -5 | IsCurse$True | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Target creature gets -5/-5 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/waste_away.jpg
 SetInfo:TOR|Common|http://magiccards.info/scans/en/tr/88.jpg
diff --git a/res/cardsfolder/waterfront_bouncer.txt b/res/cardsfolder/waterfront_bouncer.txt
index 69651009453..65e0a4d7fab 100644
--- a/res/cardsfolder/waterfront_bouncer.txt
+++ b/res/cardsfolder/waterfront_bouncer.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Merfolk Spellshaper
 Text:no text
 PT:1/1
-A:AB$ChangeZone | Cost$ U T Discard<1/Any> | ValidTgts$ Creature | TgtPrompt$ Select target Creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
+A:AB$ChangeZone | Cost$ U T Discard<1/Card> | ValidTgts$ Creature | TgtPrompt$ Select target Creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/waterfront_bouncer.jpg
diff --git a/res/cardsfolder/zombie_infestation.txt b/res/cardsfolder/zombie_infestation.txt
index 08efb775e82..5bbb5513467 100644
--- a/res/cardsfolder/zombie_infestation.txt
+++ b/res/cardsfolder/zombie_infestation.txt
@@ -2,7 +2,7 @@ Name:Zombie Infestation
 ManaCost:1 B
 Types:Enchantment
 Text:no text
-A:AB$Token | Cost$ Discard<2/Any> | TokenImage$ B 2 2 Zombie | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ Controller | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | SpellDescription$ Put a 2/2 black Zombie creature token onto the battlefield.
+A:AB$Token | Cost$ Discard<2/Card> | TokenImage$ B 2 2 Zombie | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ Controller | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | SpellDescription$ Put a 2/2 black Zombie creature token onto the battlefield.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/zombie_infestation.jpg