diff --git a/res/cardsfolder/f/fable_of_wolf_and_owl.txt b/res/cardsfolder/f/fable_of_wolf_and_owl.txt
index 1f0a388d836..05b4397fa8c 100644
--- a/res/cardsfolder/f/fable_of_wolf_and_owl.txt
+++ b/res/cardsfolder/f/fable_of_wolf_and_owl.txt
@@ -2,8 +2,8 @@ Name:Fable of Wolf and Owl
 ManaCost:3 GU GU GU
 Types:Enchantment
 Text:no text
-T:Mode$ SpellCast | ValidCard$ Card.Green+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigWolf | TriggerDescription$ Whenever you cast a green spell, you may put a 2/2 green Wolf creature token onto the battlefield.
-T:Mode$ SpellCast | ValidCard$ Card.Blue+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigBird | TriggerDescription$ Whenever you cast a blue spell, you may put a 1/1 blue Bird creature token with flying onto the battlefield.
+T:Mode$ SpellCast | ValidCard$ Card.Green | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigWolf | TriggerDescription$ Whenever you cast a green spell, you may put a 2/2 green Wolf creature token onto the battlefield.
+T:Mode$ SpellCast | ValidCard$ Card.Blue | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigBird | TriggerDescription$ Whenever you cast a blue spell, you may put a 1/1 blue Bird creature token with flying onto the battlefield.
 SVar:TrigWolf:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Wolf | TokenTypes$ Creature,Wolf | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2
 SVar:TrigBird:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Bird | TokenTypes$ Creature,Bird | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:BuffedBy:Card.Green,Card.Blue
diff --git a/res/cardsfolder/f/faithful_squire_kaiso_memory_of_loyalty.txt b/res/cardsfolder/f/faithful_squire_kaiso_memory_of_loyalty.txt
index 768f1fa7159..0dffc73fc2b 100644
--- a/res/cardsfolder/f/faithful_squire_kaiso_memory_of_loyalty.txt
+++ b/res/cardsfolder/f/faithful_squire_kaiso_memory_of_loyalty.txt
@@ -3,7 +3,7 @@ ManaCost:1 W W
 Types:Creature Human Soldier
 Text:no text
 PT:2/2
-T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidControllingPlayer$ You | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may put a ki counter on CARDNAME.
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may put a ki counter on CARDNAME.
 T:Mode$ Phase | Phase$ End of Turn | IsPresent$ Card.Self+counters_GE2_KI | Execute$ TrigFlip | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of the end step, if there are two or more ki counters on CARDNAME, you may flip it.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ KI | CounterNum$ 1
 SVar:TrigFlip:AB$SetState | Cost$ 0 | Defined$ Self | Mode$ Flip
diff --git a/res/cardsfolder/f/forced_fruition.txt b/res/cardsfolder/f/forced_fruition.txt
index 8468b51dbef..f37a5447068 100644
--- a/res/cardsfolder/f/forced_fruition.txt
+++ b/res/cardsfolder/f/forced_fruition.txt
@@ -2,8 +2,8 @@ Name:Forced Fruition
 ManaCost:4 U U
 Types:Enchantment
 Text:no text
-T:Mode$ SpellCast | ValidCard$ Card | ValidControllingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent casts a spell, that player draws seven cards.
-SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ TriggeredPlayer | NumCards$ 7
+T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent casts a spell, that player draws seven cards.
+SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ TriggeredActivator | NumCards$ 7
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/Forced_Fruition.jpg
diff --git a/res/cardsfolder/f/fugitive_druid.txt b/res/cardsfolder/f/fugitive_druid.txt
index e17c199179c..1454f8e5cc1 100644
--- a/res/cardsfolder/f/fugitive_druid.txt
+++ b/res/cardsfolder/f/fugitive_druid.txt
@@ -3,7 +3,7 @@ ManaCost:3 G
 Types:Creature Human Druid
 Text:no text
 PT:3/2
-T:Mode$ SpellCast | TargetsValid$ Card.Self | ValidCard$ Enchantment.Aura | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME becomes the target of an Aura spell, you draw a card.
+T:Mode$ SpellCast | TargetsValid$ Card.Self | ValidCard$ Aura | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME becomes the target of an Aura spell, you draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fugitive_druid.jpg
diff --git a/res/cardsfolder/f/furious_assault.txt b/res/cardsfolder/f/furious_assault.txt
index cc7f3662cdd..0b7cb41a917 100644
--- a/res/cardsfolder/f/furious_assault.txt
+++ b/res/cardsfolder/f/furious_assault.txt
@@ -2,7 +2,7 @@ Name:Furious Assault
 ManaCost:2 R
 Types:Enchantment
 Text:no text
-T:Mode$ SpellCast | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you cast a creature spell, CARDNAME deals 1 damage to target player.
+T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever you cast a creature spell, CARDNAME deals 1 damage to target player.
 SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtP | NumDmg$ 1
 SVar:BuffedBy:Creature
 SVar:Rarity:Common
diff --git a/res/cardsfolder/g/gelectrode.txt b/res/cardsfolder/g/gelectrode.txt
index dea154caba5..a3b3cc08cbe 100644
--- a/res/cardsfolder/g/gelectrode.txt
+++ b/res/cardsfolder/g/gelectrode.txt
@@ -4,7 +4,7 @@ Types:Creature Weird
 Text:no text
 PT:0/1
 A:AB$ DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
-T:Mode$ SpellCast | ValidCard$ Card.Instant+YouCtrl,Card.Sorcery+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigUntap | OptionalDecider$ You | TriggerDescription$ Whenever you cast an instant or sorcery spell, you may untap CARDNAME.
+T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | OptionalDecider$ You | TriggerDescription$ Whenever you cast an instant or sorcery spell, you may untap CARDNAME.
 SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Self
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gelectrode.jpg
diff --git a/res/cardsfolder/g/gilt_leaf_archdruid.txt b/res/cardsfolder/g/gilt_leaf_archdruid.txt
index fa5a695681b..3877f19dcae 100644
--- a/res/cardsfolder/g/gilt_leaf_archdruid.txt
+++ b/res/cardsfolder/g/gilt_leaf_archdruid.txt
@@ -3,7 +3,7 @@ ManaCost:3 G G
 Types:Creature Elf Druid
 Text:no text
 PT:3/3
-T:Mode$ SpellCast | ValidCard$ Card.Druid+YouCtrl | Execute$ TrigDraw | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever you cast a Druid spell, you may draw a card.
+T:Mode$ SpellCast | ValidCard$ Druid | ValidActivatingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever you cast a Druid spell, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 A:AB$ ChangeZoneAll | Cost$ tapXType<7/Druid> | Origin$ Battlefield | Destination$ Battlefield | ValidTgts$ Player | TgtPrompt$ Select target player | ChangeType$ Land | GainControl$ True | CostDesc$ Tap seven untapped Druids you control: | SpellDescription$ Gain control of all lands target player controls.
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/g/glimpse_of_nature.txt b/res/cardsfolder/g/glimpse_of_nature.txt
index 0ebe06c3d7a..0ea20b34dc0 100644
--- a/res/cardsfolder/g/glimpse_of_nature.txt
+++ b/res/cardsfolder/g/glimpse_of_nature.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Sorcery
 Text:no text
 A:SP$ Effect | Cost$ G | Name$ Glimpse of Nature Effect | Triggers$ CreatureSpell | SVars$ TrigDraw | SpellDescription$ Whenever you cast a creature spell this turn, draw a card.
-SVar:CreatureSpell:Mode$ SpellCast | ValidCard$ Creature.YouCtrl | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a creature spell this turn, draw a card.
+SVar:CreatureSpell:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a creature spell this turn, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:RemRandomDeck:True
 SVar:PlayMain1:TRUE
diff --git a/res/cardsfolder/g/gloryscale_viashino.txt b/res/cardsfolder/g/gloryscale_viashino.txt
index 45a8390ee61..bd590775bb4 100644
--- a/res/cardsfolder/g/gloryscale_viashino.txt
+++ b/res/cardsfolder/g/gloryscale_viashino.txt
@@ -3,7 +3,7 @@ ManaCost:1 R G W
 Types:Creature Viashino Soldier
 Text:no text
 PT:3/3
-T:Mode$ SpellCast | ValidCard$ Card.MultiColor+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a multicolored spell, CARDNAME gets +3/+3 until end of turn.
+T:Mode$ SpellCast | ValidCard$ Card.MultiColor | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a multicolored spell, CARDNAME gets +3/+3 until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | NumAtt$ +3 | NumDef$ +3 | Defined$ Self
 SVar:BuffedBy:Card.MultiColor
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gloryscale_viashino.jpg
diff --git a/res/cardsfolder/g/golem_foundry.txt b/res/cardsfolder/g/golem_foundry.txt
index 8668af3cf7f..b2a1ef985ae 100644
--- a/res/cardsfolder/g/golem_foundry.txt
+++ b/res/cardsfolder/g/golem_foundry.txt
@@ -2,7 +2,7 @@ Name:Golem Foundry
 ManaCost:3
 Types:Artifact
 Text:no text
-T:Mode$ SpellCast | ValidCard$ Artifact.YouCtrl | Execute$ TrigPutCounter | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever you cast an artifact spell, you may put a charge counter on CARDNAME.
+T:Mode$ SpellCast | ValidCard$ Artifact | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever you cast an artifact spell, you may put a charge counter on CARDNAME.
 A:AB$ Token | Cost$ SubCounter<3/CHARGE> | TokenAmount$ 1 | TokenName$ Golem | TokenTypes$ Artifact,Creature,Golem | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 colorless Golem artifact creature token onto the battlefield.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterNum$ 1 | CounterType$ CHARGE
 SVar:Rarity:Common
diff --git a/res/cardsfolder/g/gravelgill_duo.txt b/res/cardsfolder/g/gravelgill_duo.txt
index bc7a4595466..12f1409dc11 100644
--- a/res/cardsfolder/g/gravelgill_duo.txt
+++ b/res/cardsfolder/g/gravelgill_duo.txt
@@ -3,8 +3,8 @@ ManaCost:2 UB
 Types:Creature Merfolk Rogue Warrior
 Text:no text
 PT:2/1
-T:Mode$ SpellCast | ValidCard$ Card.Blue+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump11 | TriggerDescription$ Whenever you cast a blue spell, CARDNAME gets +1/+1 until end of turn.
-T:Mode$ SpellCast | ValidCard$ Card.Black+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPumpFear | TriggerDescription$ Whenever you cast a black spell, CARDNAME gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
+T:Mode$ SpellCast | ValidCard$ Card.Blue | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump11 | TriggerDescription$ Whenever you cast a blue spell, CARDNAME gets +1/+1 until end of turn.
+T:Mode$ SpellCast | ValidCard$ Card.Black | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPumpFear | TriggerDescription$ Whenever you cast a black spell, CARDNAME gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
 SVar:TrigPump11:AB$Pump | Cost$ 0 | NumAtt$ +1 | NumDef$ +1 | Defined$ Self
 SVar:TrigPumpFear:AB$Pump | Cost$ 0 | KW$ Fear | Defined$ Self
 SVar:BuffedBy:Card.Blue,Card.Black
diff --git a/res/cardsfolder/h/hand_of_the_praetors.txt b/res/cardsfolder/h/hand_of_the_praetors.txt
index adceeab6756..0b64ef65094 100644
--- a/res/cardsfolder/h/hand_of_the_praetors.txt
+++ b/res/cardsfolder/h/hand_of_the_praetors.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:3/2
 K:Infect
 S:Mode$ Continuous | Affected$ Creature.withInfect+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other creatures you control with infect get +1/+1.
-T:Mode$ SpellCast | ValidCard$ Creature.withInfect+YouCtrl | Execute$ TrigPoison | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a spell with infect, target player gets a poison counter.
+T:Mode$ SpellCast | ValidCard$ Card.withInfect | ValidActivatingPlayer$ You | Execute$ TrigPoison | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a spell with infect, target player gets a poison counter.
 SVar:TrigPoison:AB$Poison | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | Num$ 1
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/h/havoc.txt b/res/cardsfolder/h/havoc.txt
index 1faf9eb2fdd..c51b9edbf65 100644
--- a/res/cardsfolder/h/havoc.txt
+++ b/res/cardsfolder/h/havoc.txt
@@ -2,7 +2,7 @@ Name:Havoc
 ManaCost:1 R
 Types:Enchantment
 Text:no text
-T:Mode$ SpellCast | ValidCard$ Card.White+YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever an opponent casts a white spell, he or she loses 2 life.
+T:Mode$ SpellCast | ValidCard$ Card.White | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever an opponent casts a white spell, he or she loses 2 life.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 2
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/h/heartwood_storyteller.txt b/res/cardsfolder/h/heartwood_storyteller.txt
index bdf02b9d91a..f4d5b9440ff 100644
--- a/res/cardsfolder/h/heartwood_storyteller.txt
+++ b/res/cardsfolder/h/heartwood_storyteller.txt
@@ -3,8 +3,8 @@ ManaCost:1 G G
 Types:Creature Treefolk
 Text:no text
 PT:2/3
-T:Mode$ SpellCast | TriggerZones$ Battlefield | ValidCard$ Spell.nonCreature+YouDontCtrl | Execute$ TrigDrawYou | OptionalDecider$ You |TriggerDescription$ Whenever a player casts a noncreature spell, each of that player's opponents may draw a card.
-T:Mode$ SpellCast | TriggerZones$ Battlefield | ValidCard$ Spell.nonCreature+YouCtrl | Execute$ TrigDrawOpp | OptionalDecider$ Opponent |TriggerDescription$ Whenever a player casts a noncreature spell, each of that player's opponents may draw a card. | Secondary$ True
+T:Mode$ SpellCast | TriggerZones$ Battlefield | ValidCard$ Spell.nonCreature | ValidActivatingPlayer$ Opponent | Execute$ TrigDrawYou | OptionalDecider$ You |TriggerDescription$ Whenever a player casts a noncreature spell, each of that player's opponents may draw a card.
+T:Mode$ SpellCast | TriggerZones$ Battlefield | ValidCard$ Spell.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigDrawOpp | OptionalDecider$ Opponent |TriggerDescription$ Whenever a player casts a noncreature spell, each of that player's opponents may draw a card. | Secondary$ True
 SVar:TrigDrawYou:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:TrigDrawOpp:AB$ Draw | Cost$ 0 | Defined$ Opponent | NumCards$ 1
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/h/hired_muscle_scarmaker.txt b/res/cardsfolder/h/hired_muscle_scarmaker.txt
index d4f5c5b38dd..c3524e0ff5e 100644
--- a/res/cardsfolder/h/hired_muscle_scarmaker.txt
+++ b/res/cardsfolder/h/hired_muscle_scarmaker.txt
@@ -3,7 +3,7 @@ ManaCost:1 B B
 Types:Creature Human Warrior
 Text:no text
 PT:2/2
-T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidControllingPlayer$ You | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may put a ki counter on CARDNAME.
+T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may put a ki counter on CARDNAME.
 T:Mode$ Phase | Phase$ End of Turn | IsPresent$ Card.Self+counters_GE2_KI | Execute$ TrigFlip | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of the end step, if there are two or more ki counters on CARDNAME, you may flip it.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ KI | CounterNum$ 1
 SVar:TrigFlip:AB$SetState | Cost$ 0 | Defined$ Self | Mode$ Flip
diff --git a/res/cardsfolder/h/hunting_grounds.txt b/res/cardsfolder/h/hunting_grounds.txt
index 46eb6fd0542..0c1b6c8b7ed 100644
--- a/res/cardsfolder/h/hunting_grounds.txt
+++ b/res/cardsfolder/h/hunting_grounds.txt
@@ -2,7 +2,7 @@ Name:Hunting Grounds
 ManaCost:G W
 Types:Enchantment
 Text:no text
-T:Mode$ SpellCast | ValidCard$ Spell.YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigChangeZone | OptionalDecider$ You | Threshold$ True | TriggerDescription$ Threshold - Whenever an opponent casts a spell, you may put a creature card from your hand onto the battlefield.
+T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigChangeZone | OptionalDecider$ You | Threshold$ True | TriggerDescription$ Threshold - Whenever an opponent casts a spell, you may put a creature card from your hand onto the battlefield.
 SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | ChangeType$ Creature | ChangeNum$ 1 | Origin$ Hand | Destination$ Battlefield
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hunting_grounds.jpg