diff --git a/res/cardsfolder/d/detritivore.txt b/res/cardsfolder/d/detritivore.txt
index e6eec8fb859..bde7ede3513 100644
--- a/res/cardsfolder/d/detritivore.txt
+++ b/res/cardsfolder/d/detritivore.txt
@@ -8,7 +8,7 @@ K:Suspend:X:XCantBe0 X 3 R
 T:Mode$ CounterRemoved | ValidCard$ Card.Self  | TriggerZones$ Exile | CounterType$ TIME | Execute$ TrigDestroy | TriggerDescription$ Whenever a time counter is removed from CARDNAME while it's exiled, destroy target nonbasic land.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Land.nonBasic | TgtPrompt$ Select a nonbasic land.
 SVar:X:Count$xPaid
-SVar:Y:Count$ValidGraveyard Land.nonBasic+YouDontCtrl
+SVar:Y:Count$ValidGraveyard Land.nonBasic+OppCtrl
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/detritivore.jpg
 Oracle:Detritivore's power and toughness are each equal to the number of nonbasic land cards in your opponents' graveyards.\nSuspend X-{X}{3}{R}. X can't be 0. (Rather than cast this card from your hand, you may pay {X}{3}{R} and exile it with X time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)\nWhenever a time counter is removed from Detritivore while it's exiled, destroy target nonbasic land.
\ No newline at end of file
diff --git a/res/cardsfolder/g/gather_specimens.txt b/res/cardsfolder/g/gather_specimens.txt
index 84925ffd52f..893a36e6216 100644
--- a/res/cardsfolder/g/gather_specimens.txt
+++ b/res/cardsfolder/g/gather_specimens.txt
@@ -2,7 +2,7 @@ Name:Gather Specimens
 ManaCost:3 U U U
 Types:Instant
 A:SP$ Effect | Cost$ 3 U U U | Name$ Gather Specimens Effect | ReplacementEffects$ OppCreatEnters | SVars$ ETBYourCtrl | SpellDescription$ If a creature would enter the battlefield under an opponent's control this turn, it enters the battlefield under your control instead.
-SVar:OppCreatEnters:Event$ Moved | Destination$ Battlefield | ValidCard$ Creature.YouDontCtrl | ReplaceWith$ ETBYourCtrl | Description$ If a creature would enter the battlefield under an opponent's control this turn, it enters the battlefield under your control instead.
+SVar:OppCreatEnters:Event$ Moved | Destination$ Battlefield | ValidCard$ Creature.OppCtrl | ReplaceWith$ ETBYourCtrl | Description$ If a creature would enter the battlefield under an opponent's control this turn, it enters the battlefield under your control instead.
 SVar:ETBYourCtrl:AB$ ChangeZone | Cost$ 0 | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | GainControl$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gather_specimens.jpg
diff --git a/res/cardsfolder/h/hidden_herd.txt b/res/cardsfolder/h/hidden_herd.txt
index d38353f1b1d..001f89fa790 100644
--- a/res/cardsfolder/h/hidden_herd.txt
+++ b/res/cardsfolder/h/hidden_herd.txt
@@ -1,7 +1,7 @@
 Name:Hidden Herd
 ManaCost:G
 Types:Enchantment
-T:Mode$ LandPlayed | ValidCard$ Land.nonBasic+YouDontCtrl | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment | Execute$ TrigAnimate | TriggerDescription$ When an opponent plays a nonbasic land, if CARDNAME is an enchantment, CARDNAME becomes a 3/3 Beast creature.
+T:Mode$ LandPlayed | ValidCard$ Land.nonBasic+OppCtrl | TriggerZones$ Battlefield | IsPresent$ Card.Self+Enchantment | Execute$ TrigAnimate | TriggerDescription$ When an opponent plays a nonbasic land, if CARDNAME is an enchantment, CARDNAME becomes a 3/3 Beast creature.
 SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 3 | Toughness$ 3  | Types$ Creature,Beast | OverwriteTypes$ True | Permanent$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hidden_herd.jpg
 Oracle:When an opponent plays a nonbasic land, if Hidden Herd is an enchantment, Hidden Herd becomes a 3/3 Beast creature.
\ No newline at end of file
diff --git a/res/cardsfolder/h/huntmaster_of_the_fells_ravager_of_the_fells.txt b/res/cardsfolder/h/huntmaster_of_the_fells_ravager_of_the_fells.txt
index a2b92285cb0..085428d0e5c 100644
--- a/res/cardsfolder/h/huntmaster_of_the_fells_ravager_of_the_fells.txt
+++ b/res/cardsfolder/h/huntmaster_of_the_fells_ravager_of_the_fells.txt
@@ -22,7 +22,7 @@ PT:4/4
 K:Trample
 T:Mode$ Transformed | ValidCard$ Card.Self | Execute$ DamageAndMoreDamage | TriggerDescription$ Whenever this creature transforms into CARDNAME, it deals 2 damage to target opponent and 2 damage to up to one target creature that player controls.
 SVar:DamageAndMoreDamage:AB$ DealDamage | Cost$ 0 | ValidTgts$ Opponent | NumDmg$ 2 | SubAbility$ MoreDamage
-SVar:MoreDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | NumDmg$ 2 | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature opponent controls
+SVar:MoreDamage:DB$ DealDamage | ValidTgts$ Creature | TargetsWithDefinedController$ Targeted | NumDmg$ 2 | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature opponent controls
 T:Mode$Phase | Phase$ Upkeep | WerewolfUntransformCondition$ True | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ At the beginning of each upkeep, if a player cast two or more spells last turn, transform CARDNAME.
 SVar:TrigTransform:AB$SetState | Cost$ 0 | Defined$ Self | Mode$ Transform
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ravager_of_the_fells.jpg
diff --git a/res/cardsfolder/k/kismet.txt b/res/cardsfolder/k/kismet.txt
index ebfcc0c065b..c988ae29b94 100644
--- a/res/cardsfolder/k/kismet.txt
+++ b/res/cardsfolder/k/kismet.txt
@@ -1,7 +1,7 @@
 Name:Kismet
 ManaCost:3 W
 Types:Enchantment
-S:Mode$ ETBTapped | ValidCard$ Artifact.YouDontCtrl,Creature.YouDontCtrl,Land.YouDontCtrl | Description$ Artifacts, creatures, and lands played by your opponents enter the battlefield tapped.
+S:Mode$ ETBTapped | ValidCard$ Artifact.OppCtrl,Creature.OppCtrl,Land.OppCtrl | Description$ Artifacts, creatures, and lands played by your opponents enter the battlefield tapped.
 SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kismet.jpg
 Oracle:Artifacts, creatures, and lands played by your opponents enter the battlefield tapped.
\ No newline at end of file
diff --git a/res/cardsfolder/p/polluted_bonds.txt b/res/cardsfolder/p/polluted_bonds.txt
index e3619b382f8..cd7826131ad 100644
--- a/res/cardsfolder/p/polluted_bonds.txt
+++ b/res/cardsfolder/p/polluted_bonds.txt
@@ -1,7 +1,7 @@
 Name:Polluted Bonds
 ManaCost:3 B B
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever a land enters the battlefield under an opponent's control, that player loses 2 life and you gain 2 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever a land enters the battlefield under an opponent's control, that player loses 2 life and you gain 2 life.
 SVar:TrigDrain:AB$ LoseLife | Cost$ 0 | Defined$ TriggeredCardController | LifeAmount$ 2 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/polluted_bonds.jpg
diff --git a/res/cardsfolder/p/pure_intentions.txt b/res/cardsfolder/p/pure_intentions.txt
index a6e1dd5c4ec..1fe7596e84c 100644
--- a/res/cardsfolder/p/pure_intentions.txt
+++ b/res/cardsfolder/p/pure_intentions.txt
@@ -2,7 +2,7 @@ Name:Pure Intentions
 ManaCost:W
 Types:Instant Arcane
 A:SP$ Effect | Cost$ W | Name$ Pure Intentions Effect | Triggers$ PureDiscarded | SVars$ TrigPureChange | SpellDescription$ Whenever a spell or ability an opponent controls causes you to discard cards this turn, return those cards from your graveyard to your hand.
-SVar:PureDiscarded:Mode$ Discarded | ValidCard$ Card.YouCtrl | ValidCause$ Card.YouDontCtrl | TriggerZones$ Command | Execute$ TrigPureChange | TriggerDescription$ Whenever a spell or ability an opponent controls causes you to discard cards this turn, return those cards from your graveyard to your hand.
+SVar:PureDiscarded:Mode$ Discarded | ValidCard$ Card.YouCtrl | ValidCause$ Card.OppCtrl | TriggerZones$ Command | Execute$ TrigPureChange | TriggerDescription$ Whenever a spell or ability an opponent controls causes you to discard cards this turn, return those cards from your graveyard to your hand.
 SVar:TrigPureChange:AB$ ChangeZone | Cost$ 0 | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Hand
 T:Mode$ Discarded | ValidCard$ Card.Self | ValidCause$ Card.OppCtrl | Execute$ TrigPureReturn | TriggerDescription$ When a spell or ability an opponent controls causes you to discard CARDNAME, return it to your hand.
 SVar:TrigPureReturn:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand