diff --git a/res/cardsfolder/seasoned_marshal.txt b/res/cardsfolder/seasoned_marshal.txt
index 5986f5b7285..492d16634ab 100644
--- a/res/cardsfolder/seasoned_marshal.txt
+++ b/res/cardsfolder/seasoned_marshal.txt
@@ -4,7 +4,7 @@ Types:Creature Human Soldier
 Text:no text
 PT:2/2
 T:Mode$ Attacks | ValidCard$ Card.Self | Optional$ True | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME attacks, you may tap target creature.
-SVar:TrigTap:AB$Tap | Cost$ 0 | Tgt$ TgtC
+SVar:TrigTap:AB$Tap | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seasoned_marshal.jpg
 SetInfo:8ED|Uncommon|http://magiccards.info/scans/en/8e/44.jpg
diff --git a/res/cardsfolder/seeds_of_strength.txt b/res/cardsfolder/seeds_of_strength.txt
index 1a086e3f5c0..2db83cafba9 100644
--- a/res/cardsfolder/seeds_of_strength.txt
+++ b/res/cardsfolder/seeds_of_strength.txt
@@ -2,9 +2,9 @@ Name:Seeds of Strength
 ManaCost:G W
 Types:Instant
 Text:no text
-A:SP$Pump | Cost$ G W | Tgt$ TgtC | NumAtt$ 1 | NumDef$ 1 | SubAbility$SVar=DBPump1 | SpellDescription$ Target creature gets +1/+1 until end of turn.Target creature gets +1/+1 until end of turn.Target creature gets +1/+1 until end of turn.
-SVar:DBPump1:DB$Pump | Cost$ G W | Tgt$ TgtC | NumAtt$ 1 | NumDef$ 1 | SubAbility$SVar=DBPump2
-SVar:DBPump2:DB$Pump | Cost$ G W | Tgt$ TgtC | NumAtt$ 1 | NumDef$ 1
+A:SP$Pump | Cost$ G W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | SubAbility$ SVar=DBPump1 | SpellDescription$ Target creature gets +1/+1 until end of turn. Target creature gets +1/+1 until end of turn. Target creature gets +1/+1 until end of turn.
+SVar:DBPump1:DB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | SubAbility$SVar=DBPump2
+SVar:DBPump2:DB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seeds_of_strength.jpg
 SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/227.jpg
diff --git a/res/cardsfolder/shambling_shell.txt b/res/cardsfolder/shambling_shell.txt
index ebe9355b210..5a358c5a56f 100644
--- a/res/cardsfolder/shambling_shell.txt
+++ b/res/cardsfolder/shambling_shell.txt
@@ -3,7 +3,7 @@ ManaCost:1 B G
 Types:Creature Plant Zombie
 Text:no text
 PT:3/1
-A:AB$PutCounter | Cost$ Sac<1/CARDNAME> | Tgt$ TgtC | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature.
+A:AB$ PutCounter | Cost$ Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature.
 K:Dredge 3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shambling_shell.jpg
diff --git a/res/cardsfolder/skinrender.txt b/res/cardsfolder/skinrender.txt
index f1726442744..aeea80c813a 100644
--- a/res/cardsfolder/skinrender.txt
+++ b/res/cardsfolder/skinrender.txt
@@ -4,7 +4,7 @@ Types:Creature Zombie
 Text:no text
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put three -1/-1 counters on target creature.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Tgt$ TgtC | CounterType$ M1M1 | CounterNum$ 3
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ M1M1 | CounterNum$ 3
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skinrender.jpg
 SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/78.jpg
diff --git a/res/cardsfolder/slave_of_bolas.txt b/res/cardsfolder/slave_of_bolas.txt
index 91db4a54007..f5ce240644f 100644
--- a/res/cardsfolder/slave_of_bolas.txt
+++ b/res/cardsfolder/slave_of_bolas.txt
@@ -2,7 +2,7 @@ Name:Slave of Bolas
 ManaCost:3 UR B
 Types:Sorcery
 Text:no text
-A:SP$ GainControl | Cost$ 3 UR B | Tgt$ TgtC | Untap$ True | AddKWs$ Haste & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
+A:SP$ GainControl | Cost$ 3 UR B | ValidTgts$ Creature | TgtPrompt$ Select target creature | Untap$ True | AddKWs$ Haste & HIDDEN At the beginning of the end step, sacrifice CARDNAME. | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slave_of_bolas.jpg
diff --git a/res/cardsfolder/smolder_initiate.txt b/res/cardsfolder/smolder_initiate.txt
index 28af89b3a45..1f258539243 100644
--- a/res/cardsfolder/smolder_initiate.txt
+++ b/res/cardsfolder/smolder_initiate.txt
@@ -3,8 +3,8 @@ ManaCost:B
 Types:Creature Elemental Shaman
 Text:no text
 PT:1/1
-T:Mode$SpellCast | ValidCard$ Card.Black | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a player casts a black spell, you may pay 1. If you do, target player loses 1 life.
-SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Tgt$ TgtP | LifeAmount$ 1
+T:Mode$ SpellCast | ValidCard$ Card.Black | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a player casts a black spell, you may pay 1. If you do, target player loses 1 life.
+SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/smolder_initiate.jpg
 SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/78.jpg
diff --git a/res/cardsfolder/somnomancer.txt b/res/cardsfolder/somnomancer.txt
index efc23156c7e..baeac761e7f 100644
--- a/res/cardsfolder/somnomancer.txt
+++ b/res/cardsfolder/somnomancer.txt
@@ -4,7 +4,7 @@ Types:Creature Kithkin Wizard
 Text:no text
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Optional$ True | Execute$ TrigTap | TrggierDescription$ When CARDNAME enters the battlefield, you may tap target creature.
-SVar:TrigTap:AB$Tap | Cost$ 0 | Tgt$ TgtC
+SVar:TrigTap:AB$Tap | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature
 SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/somnomancer.jpg
diff --git a/res/cardsfolder/spirit_en_dal.txt b/res/cardsfolder/spirit_en_dal.txt
index 7537dd7ef72..a1fe13e80a6 100644
--- a/res/cardsfolder/spirit_en_dal.txt
+++ b/res/cardsfolder/spirit_en_dal.txt
@@ -4,7 +4,7 @@ Types:Creature Spirit
 Text:no text
 PT:2/1
 K:Shadow
-A:AB$Pump | Cost$ 1 W | ActivatingZone$ Hand | Tgt$ TgtC | KW$ Shadow | ActivationLimit$ 1 | PlayerTurn$ True | ActivatingPhases$ Upkeep | PrecostDesc$ Forecast - | SpellDescription$ Target creature gains shadow until end of turn. (Activate this ability only during your upkeep and only once each turn.)
+A:AB$ Pump | Cost$ 1 W | ActivatingZone$ Hand | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Shadow | ActivationLimit$ 1 | PlayerTurn$ True | ActivatingPhases$ Upkeep | PrecostDesc$ Forecast - | SpellDescription$ Target creature gains shadow until end of turn. (Activate this ability only during your upkeep and only once each turn.)
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_en_dal.jpg
 SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/17.jpg
diff --git a/res/cardsfolder/stand_firm.txt b/res/cardsfolder/stand_firm.txt
index a4464c2cc5e..df9bbe9f386 100644
--- a/res/cardsfolder/stand_firm.txt
+++ b/res/cardsfolder/stand_firm.txt
@@ -2,7 +2,7 @@ Name:Stand Firm
 ManaCost:W
 Types:Instant
 Text:no text
-A:SP$ Pump | Cost$ W | Tgt$ TgtC | NumAtt$ 1 | NumDef$ 1 | SubAbility$ SVar=DBScry | SpellDescription$ Target creature gets +1/+1 until end of turn. Scry 2 (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+A:SP$ Pump | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | SubAbility$ SVar=DBScry | SpellDescription$ Target creature gets +1/+1 until end of turn. Scry 2 (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 SVar:DBScry:DB$Scry | ScryNum$ 2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stand_firm.jpg
diff --git a/res/cardsfolder/strands_of_undeath.txt b/res/cardsfolder/strands_of_undeath.txt
index 6fb597cddbd..6a2213a71a8 100644
--- a/res/cardsfolder/strands_of_undeath.txt
+++ b/res/cardsfolder/strands_of_undeath.txt
@@ -6,8 +6,8 @@ PT:2/2
 K:Enchant creature
 K:enPump:0/0
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, target player discards two cards.
-A:AB$Regenerate | Cost$ B | Defined$ Enchanted | SpellDescription$ Regenerate enchanted creature.
-SVar:TrigDiscard:AB$Discard | Cost$ 0 | Tgt$ TgtP | NumCards$ 2 | Mode$ TgtChoose
+A:AB$ Regenerate | Cost$ B | Defined$ Enchanted | SpellDescription$ Regenerate enchanted creature.
+SVar:TrigDiscard:AB$Discard | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select a player | NumCards$ 2 | Mode$ TgtChoose
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/strands_of_undeath.jpg
 SetInfo:RAV|Common|http://magiccards.info/scans/en/rav/108.jpg