diff --git a/res/cardsfolder/s/somnophore.txt b/res/cardsfolder/s/somnophore.txt
index bd707125823..b68a03a5539 100644
--- a/res/cardsfolder/s/somnophore.txt
+++ b/res/cardsfolder/s/somnophore.txt
@@ -3,10 +3,8 @@ ManaCost:2 U U
 Types:Creature Illusion
 PT:2/2
 K:Flying
-T:Mode$ DamageDone | ValidSource$ Creature.Self | ValidTarget$ Opponent | Execute$ TrigTapOpp | TriggerDescription$ Whenever CARDNAME deals damage to a player, tap target creature that player controls. That creature doesn't untap during its controller's untap step for as long as CARDNAME remains on the battlefield.
-T:Mode$ DamageDone | ValidSource$ Creature.Self | ValidTarget$ You | Execute$ TrigTapYou | Secondary$ True | TriggerDescription$ Whenever CARDNAME deals damage to a player, tap target creature that player controls. That creature doesn't untap during its controller's untap step for as long as CARDNAME remains on the battlefield.
-SVar:TrigTapOpp:AB$ Tap | Cost$ 0 | ValidTgts$ Creature.YouDontCtrl | SubAbility$ DBSomnophoreAnimate
-SVar:TrigTapYou:AB$ Tap | Cost$ 0 | ValidTgts$ Creature.YouCtrl | SubAbility$ DBSomnophoreAnimate
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals damage to a player, tap target creature that player controls. That creature doesn't untap during its controller's untap step for as long as CARDNAME remains on the battlefield.
+SVar:TrigTap:AB$ Tap | Cost$ 0 | ValidTgts$ Creature | TargetsWithDefinedController$ TriggeredTarget | SubAbility$ DBSomnophoreAnimate
 SVar:DBSomnophoreAnimate:DB$ Pump | Defined$ Targeted | KW$ HIDDEN CARDNAME doesn't untap during your untap step. | UntilHostLeavesPlay$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/somnophore.jpg
diff --git a/res/cardsfolder/s/spiritual_sanctuary.txt b/res/cardsfolder/s/spiritual_sanctuary.txt
index 6565ffd90ca..9a52e5a638e 100644
--- a/res/cardsfolder/s/spiritual_sanctuary.txt
+++ b/res/cardsfolder/s/spiritual_sanctuary.txt
@@ -1,9 +1,7 @@
 Name:Spiritual Sanctuary
 ManaCost:2 W W
 Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Plains.YouCtrl | PresentCompare$ GE1 | Execute$ TrigGainLifeYou | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, if that player controls a Plains, he or she gains 1 life.
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | IsPresent$ Plains.YouDontCtrl | PresentCompare$ GE1 | Execute$ TrigGainLifeOpp | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ At the beginning of each player's upkeep, if that player controls a Plains, he or she gains 1 life.
-SVar:TrigGainLifeYou:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
-SVar:TrigGainLifeOpp:AB$GainLife | Cost$ 0 | Defined$ Opponent | LifeAmount$ 1
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | IsPresent$ Plains.ActivePlayerCtrl | PresentCompare$ GE1 | Execute$ TrigGainLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, if that player controls a Plains, he or she gains 1 life.
+SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | Defined$ TriggeredPlayer | LifeAmount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spiritual_sanctuary.jpg
 Oracle:At the beginning of each player's upkeep, if that player controls a Plains, he or she gains 1 life.
\ No newline at end of file
diff --git a/res/cardsfolder/t/tombstone_stairwell.txt b/res/cardsfolder/t/tombstone_stairwell.txt
index 2fec2e25e31..c9ef0bf5d66 100644
--- a/res/cardsfolder/t/tombstone_stairwell.txt
+++ b/res/cardsfolder/t/tombstone_stairwell.txt
@@ -2,15 +2,14 @@ Name:Tombstone Stairwell
 ManaCost:2 B B
 Types:World Enchantment
 K:Cumulative upkeep:1 B
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | IsPresent$ Card.Self | Execute$ TrigTokenYou | TriggerDescription$ At the beginning of each upkeep, if CARDNAME is on the battlefield, each player puts a 2/2 black Zombie creature token with haste named Tombspawn onto the battlefield for each creature card in his or her graveyard.
-SVar:TrigTokenYou:DB$Token | TokenAmount$ X | References$ X | TokenName$ Tombspawn | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Haste | SubAbility$ TrigTokenOpp | RememberTokens$ True
-SVar:TrigTokenOpp:DB$Token | TokenAmount$ Y | References$ Y | TokenName$ Tombspawn | TokenTypes$ Creature,Zombie | TokenOwner$ Opponent | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Haste | RememberTokens$ True
-SVar:X:Count$TypeInYourYard.Creature
-SVar:Y:Count$TypeInOppYard.Creature
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | IsPresent$ Card.Self | Execute$ TrigRepeat | TriggerDescription$ At the beginning of each upkeep, if CARDNAME is on the battlefield, each player puts a 2/2 black Zombie creature token with haste named Tombspawn onto the battlefield for each creature card in his or her graveyard.
+SVar:TrigRepeat:AB$ RepeatEach | Cost$ 0 | RepeatPlayers$ Player | RepeatSubAbility$ DBToken
+SVar:DBToken:DB$ Token | TokenAmount$ X | References$ X | TokenName$ Tombspawn | TokenTypes$ Creature,Zombie | TokenOwner$ Player.IsRemembered | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Haste | RememberTokens$ True
+SVar:X:Count$ValidGraveyard Creature.RememberedPlayerCtrl
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ DestroyRemembered | TriggerDescription$ At the beginning of each end step or when CARDNAME leaves the battlefield, destroy all tokens put onto the battlefield with CARDNAME. They can't be regenerated.
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Any | Execute$ DestroyRemembered | Secondary$ True | TriggerController$ TriggeredCardController | TriggerDescription$ At the beginning of each end step or when CARDNAME leaves the battlefield, destroy all tokens put onto the battlefield with CARDNAME. They can't be regenerated.
-SVar:DestroyRemembered:DB$DestroyAll | Cost$ 0 | ValidCards$ Card.IsRemembered | NoRegen$ True | SubAbility$ DBCleanUp
-SVar:DBCleanUp:DB$Cleanup | ClearRemembered$ True
+SVar:DestroyRemembered:DB$ DestroyAll | Cost$ 0 | ValidCards$ Card.IsRemembered | NoRegen$ True | SubAbility$ DBCleanUp
+SVar:DBCleanUp:DB$ Cleanup | ClearRemembered$ True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tombstone_stairwell.jpg
 Oracle:Cumulative upkeep {1}{B} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nAt the beginning of each upkeep, if Tombstone Stairwell is on the battlefield, each player puts a 2/2 black Zombie creature token with haste named Tombspawn onto the battlefield for each creature card in his or her graveyard.\nAt the beginning of each end step or when Tombstone Stairwell leaves the battlefield, destroy all tokens put onto the battlefield with Tombstone Stairwell. They can't be regenerated.
\ No newline at end of file