diff --git a/res/cardsfolder/a/abu_jafar.txt b/res/cardsfolder/a/abu_jafar.txt
index c19588a739c..c1a1423870f 100644
--- a/res/cardsfolder/a/abu_jafar.txt
+++ b/res/cardsfolder/a/abu_jafar.txt
@@ -3,7 +3,7 @@ ManaCost:W
 Types:Creature Human
 Text:no text
 PT:0/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME dies, destroy all creatures blocking or blocked by it. They can't be regenerated.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, destroy all creatures blocking or blocked by it. They can't be regenerated.
 SVar:TrigDestroy:AB$ DestroyAll | Cost$ 0 | ValidCards$ Creature.blockingSource,Creature.blockedBySource | NoRegen$ True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abu_jafar.jpg
diff --git a/res/cardsfolder/a/anodet_lurker.txt b/res/cardsfolder/a/anodet_lurker.txt
index bc9b6562240..8bd03660590 100644
--- a/res/cardsfolder/a/anodet_lurker.txt
+++ b/res/cardsfolder/a/anodet_lurker.txt
@@ -3,7 +3,7 @@ ManaCost:5
 Types:Artifact Creature Construct
 Text:no text
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME dies, you gain 3 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you gain 3 life.
 SVar:TrigSac:AB$GainLife | Cost$ 0 | Defined$ TriggeredCardController | LifeAmount$ 3
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/anodet_lurker.jpg
diff --git a/res/cardsfolder/a/arctic_nishoba.txt b/res/cardsfolder/a/arctic_nishoba.txt
index 72cb952cc39..eb5c889087b 100644
--- a/res/cardsfolder/a/arctic_nishoba.txt
+++ b/res/cardsfolder/a/arctic_nishoba.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:6/6
 K:Trample
 K:Cumulative upkeep:GW
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGain | TriggerDescription$ When CARDNAME dies, you gain 2 life for each age counter on it.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGain | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you gain 2 life for each age counter on it.
 SVar:TrigGain:AB$GainLife | Cost$ 0 | Defined$ TriggeredCardController | LifeAmount$ X
 SVar:X:TriggeredCard$CardCounters.AGE/Times.2
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/a/aura_thief.txt b/res/cardsfolder/a/aura_thief.txt
index bf397e72c10..c3c872c228f 100644
--- a/res/cardsfolder/a/aura_thief.txt
+++ b/res/cardsfolder/a/aura_thief.txt
@@ -4,7 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerDescription$ When CARDNAME dies, you gain control of all enchantments. (You don't get to move Auras.)
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you gain control of all enchantments. (You don't get to move Auras.)
 SVar:TrigGainControl:DB$ GainControl | AllValid$ Enchantment | NewController$ You
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aura_thief.jpg
diff --git a/res/cardsfolder/a/aven_fisher.txt b/res/cardsfolder/a/aven_fisher.txt
index 1f803442d44..763e2dbcca6 100644
--- a/res/cardsfolder/a/aven_fisher.txt
+++ b/res/cardsfolder/a/aven_fisher.txt
@@ -4,7 +4,7 @@ Types:Creature Bird Soldier
 Text:no text
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may draw a card.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:SacMe:1
 SVar:Rarity:Common
diff --git a/res/cardsfolder/b/bitterheart_witch.txt b/res/cardsfolder/b/bitterheart_witch.txt
index cda3ad7f481..a7c51f1733a 100644
--- a/res/cardsfolder/b/bitterheart_witch.txt
+++ b/res/cardsfolder/b/bitterheart_witch.txt
@@ -1,13 +1,13 @@
-Name:Bitterheart Witch
-ManaCost:4 B
-Types:Creature Human Shaman
-Text:no text
-PT:1/2
-K:Deathtouch
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME dies, you may search your library for a Curse card, put it onto the battlefield attached to target player, then shuffle your library.
-SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | ChangeType$ Card.Curse | ChangeNum$ 1
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/bitterheart_witch.jpg
-SetInfo:ISD|Uncommon|http://magiccards.info/scans/en/isd/88.jpg
-Oracle:Deathtouch\nWhen Bitterheart Witch dies, you may search your library for a Curse card, put it onto the battlefield attached to target player, then shuffle your library.
+Name:Bitterheart Witch
+ManaCost:4 B
+Types:Creature Human Shaman
+Text:no text
+PT:1/2
+K:Deathtouch
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may search your library for a Curse card, put it onto the battlefield attached to target player, then shuffle your library.
+SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | ChangeType$ Card.Curse | ChangeNum$ 1
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/bitterheart_witch.jpg
+SetInfo:ISD|Uncommon|http://magiccards.info/scans/en/isd/88.jpg
+Oracle:Deathtouch\nWhen Bitterheart Witch dies, you may search your library for a Curse card, put it onto the battlefield attached to target player, then shuffle your library.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/b/black_cat.txt b/res/cardsfolder/b/black_cat.txt
index 7690159262f..7555e38a90a 100644
--- a/res/cardsfolder/b/black_cat.txt
+++ b/res/cardsfolder/b/black_cat.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Zombie Cat
 Text:no text
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME dies, target opponent discards a card at random.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, target opponent discards a card at random.
 SVar:TrigDiscard:AB$ Discard | Cost$ 0 | ValidTgts$ Opponent | NumCards$ 1 | Mode$ Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/black_cat.jpg
 SetInfo:DKA|Common|http://magiccards.info/scans/en/dka/54.jpg
diff --git a/res/cardsfolder/b/body_snatcher.txt b/res/cardsfolder/b/body_snatcher.txt
index 60096b52796..6487ceab87e 100644
--- a/res/cardsfolder/b/body_snatcher.txt
+++ b/res/cardsfolder/b/body_snatcher.txt
@@ -7,7 +7,7 @@ T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefi
 SVar:TrigBodySnatcherDiscardCreature:AB$ Discard | Cost$ 0 | Mode$ TgtChoose | DiscardValid$ Creature | RememberDiscarded$ True | Optional$ True | SubAbility$ DBBodySnatcherExileMe
 SVar:DBBodySnatcherExileMe:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile | ConditionDefined$ Remembered | ConditionPresent$ Creature | ConditionCompare$ EQ0 | SubAbility$ DBBodySnatcherCleanup
 SVar:DBBodySnatcherCleanup:DB$ Cleanup | ClearRemembered$ True
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigBodySnatcherExileMe | TriggerDescription$ When CARDNAME dies, exile CARDNAME and return target creature card from your graveyard to the battlefield.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigBodySnatcherExileMe | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile CARDNAME and return target creature card from your graveyard to the battlefield.
 SVar:TrigBodySnatcherExileMe:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBBodySnatcherReturnCreature
 SVar:DBBodySnatcherReturnCreature:DB$ ChangeZone | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature from your graveyard | Origin$ Graveyard | Destination$ Battlefield
 SVar:NeedsToPlayVar:Y GE2
diff --git a/res/cardsfolder/b/bogardan_phoenix.txt b/res/cardsfolder/b/bogardan_phoenix.txt
index 2dc1aeed338..168e918ff82 100644
--- a/res/cardsfolder/b/bogardan_phoenix.txt
+++ b/res/cardsfolder/b/bogardan_phoenix.txt
@@ -1,16 +1,16 @@
-Name:Bogardan Phoenix
-ManaCost:2 R R R
-Types:Creature Phoenix
-Text:no text
-PT:3/3
-K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME dies, exile it if it had a death counter on it. Otherwise, return it to the battlefield under your control and put a death counter on it.
-SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ DEATH | CounterNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
-SVar:X:TriggeredCard$CardCounters.DEATH
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/bogardan_phoenix.jpg
-SetInfo:VIS|Rare|http://magiccards.info/scans/en/vi/76.jpg
-Oracle:Flying\nWhen Bogardan Phoenix dies, exile it if it had a death counter on it. Otherwise, return it to the battlefield under your control and put a death counter on it.
+Name:Bogardan Phoenix
+ManaCost:2 R R R
+Types:Creature Phoenix
+Text:no text
+PT:3/3
+K:Flying
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile it if it had a death counter on it. Otherwise, return it to the battlefield under your control and put a death counter on it.
+SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBReturn
+SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBPutCounter
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ DEATH | CounterNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
+SVar:X:TriggeredCard$CardCounters.DEATH
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/bogardan_phoenix.jpg
+SetInfo:VIS|Rare|http://magiccards.info/scans/en/vi/76.jpg
+Oracle:Flying\nWhen Bogardan Phoenix dies, exile it if it had a death counter on it. Otherwise, return it to the battlefield under your control and put a death counter on it.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/c/celestial_gatekeeper.txt b/res/cardsfolder/c/celestial_gatekeeper.txt
index e3fbdd1409b..a579f2562ac 100644
--- a/res/cardsfolder/c/celestial_gatekeeper.txt
+++ b/res/cardsfolder/c/celestial_gatekeeper.txt
@@ -4,7 +4,7 @@ Types:Creature Bird Cleric
 Text:no text
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerDescription$ When CARDNAME dies, exile it, then return up to two target Bird and/or Cleric permanent cards from your graveyard to the battlefield.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile it, then return up to two target Bird and/or Cleric permanent cards from your graveyard to the battlefield.
 SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ChangeZone | ValidTgts$ Permanent.Bird+YouCtrl,Permanent.Cleric+YouCtrl | TargetMin$ 0 | TargetMax$ 2 | Origin$ Graveyard | Destination$ Battlefield
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/c/chronozoa.txt b/res/cardsfolder/c/chronozoa.txt
index 2fe1b97f37a..c0931904d01 100644
--- a/res/cardsfolder/c/chronozoa.txt
+++ b/res/cardsfolder/c/chronozoa.txt
@@ -1,15 +1,15 @@
-Name:Chronozoa
-ManaCost:3 U
-Types:Creature Illusion
-Text:no text
-PT:3/3
-K:Flying
-K:Vanishing:3
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigCopyPermanent | TriggerDescription$ When CARDNAME dies, if it had no time counters on it, put two tokens that are copies of it onto the battlefield.
-SVar:TrigCopyPermanent:AB$ CopyPermanent | Cost$ 0 | Defined$ TriggeredCard | NumCopies$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
-SVar:X:TriggeredCard$CardCounters.TIME
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/chronozoa.jpg
-SetInfo:PLC|Rare|http://magiccards.info/scans/en/pc/37.jpg
-Oracle:Flying\nVanishing 3 (This permanent enters the battlefield with three time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)\nWhen Chronozoa dies, if it had no time counters on it, put two tokens that are copies of it onto the battlefield.
+Name:Chronozoa
+ManaCost:3 U
+Types:Creature Illusion
+Text:no text
+PT:3/3
+K:Flying
+K:Vanishing:3
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigCopyPermanent | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, if it had no time counters on it, put two tokens that are copies of it onto the battlefield.
+SVar:TrigCopyPermanent:AB$ CopyPermanent | Cost$ 0 | Defined$ TriggeredCard | NumCopies$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
+SVar:X:TriggeredCard$CardCounters.TIME
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/chronozoa.jpg
+SetInfo:PLC|Rare|http://magiccards.info/scans/en/pc/37.jpg
+Oracle:Flying\nVanishing 3 (This permanent enters the battlefield with three time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)\nWhen Chronozoa dies, if it had no time counters on it, put two tokens that are copies of it onto the battlefield.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/c/clone_shell.txt b/res/cardsfolder/c/clone_shell.txt
index d578301a9ce..efe785f7d07 100644
--- a/res/cardsfolder/c/clone_shell.txt
+++ b/res/cardsfolder/c/clone_shell.txt
@@ -1,16 +1,16 @@
-Name:Clone Shell
-ManaCost:5
-Types:Artifact Creature Shapeshifter
-Text:no text
-PT:2/2
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ Imprint - When CARDNAME enters the battlefield, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library in any order.
-SVar:TrigDig:AB$ Dig | Cost$ 0  | Defined$ You | DigNum$ 4 | DestinationZone$ Exile | ExileFaceDown$ True | Imprint$ True
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigFaceUp | TriggerDescription$ When CARDNAME dies, turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control.
-SVar:TrigFaceUp:AB$ SetState | Cost$ 0 | Defined$ Imprinted | SubAbility$ DBChangeZone | Mode$ TurnFace
-SVar:DBChangeZone:DB$ ChangeZone | Defined$ Imprinted | Origin$ Exile | Destination$ Battlefield | ConditionDefined$ Imprinted | ConditionPresent$ Creature | GainControl$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/clone_shell.jpg
-SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/143.jpg
-Oracle:Imprint - When Clone Shell enters the battlefield, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library in any order.\nWhen Clone Shell dies, turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control.
+Name:Clone Shell
+ManaCost:5
+Types:Artifact Creature Shapeshifter
+Text:no text
+PT:2/2
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ Imprint - When CARDNAME enters the battlefield, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library in any order.
+SVar:TrigDig:AB$ Dig | Cost$ 0  | Defined$ You | DigNum$ 4 | DestinationZone$ Exile | ExileFaceDown$ True | Imprint$ True
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigFaceUp | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control.
+SVar:TrigFaceUp:AB$ SetState | Cost$ 0 | Defined$ Imprinted | SubAbility$ DBChangeZone | Mode$ TurnFace
+SVar:DBChangeZone:DB$ ChangeZone | Defined$ Imprinted | Origin$ Exile | Destination$ Battlefield | ConditionDefined$ Imprinted | ConditionPresent$ Creature | GainControl$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/clone_shell.jpg
+SetInfo:SOM|Uncommon|http://magiccards.info/scans/en/som/143.jpg
+Oracle:Imprint - When Clone Shell enters the battlefield, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library in any order.\nWhen Clone Shell dies, turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/d/deadly_grub.txt b/res/cardsfolder/d/deadly_grub.txt
index d40f3fd10b2..7a1713350e9 100644
--- a/res/cardsfolder/d/deadly_grub.txt
+++ b/res/cardsfolder/d/deadly_grub.txt
@@ -4,7 +4,7 @@ Types:Creature Insect
 Text:no text
 PT:3/1
 K:Vanishing:3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+counters_EQ0_TIME | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, if it had no time counters on it, put a 6/1 green Insect creature token with shroud onto the battlefield. (It can't be the target of spells or abilities.)
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+counters_EQ0_TIME | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, if it had no time counters on it, put a 6/1 green Insect creature token with shroud onto the battlefield. (It can't be the target of spells or abilities.)
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ TriggeredCardController | TokenColors$ Green | TokenPower$ 6 | TokenToughness$ 1 | TokenKeywords$ Shroud
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deadly_grub.jpg
diff --git a/res/cardsfolder/d/deathcurse_ogre.txt b/res/cardsfolder/d/deathcurse_ogre.txt
index 85cbec804fd..510738e4639 100644
--- a/res/cardsfolder/d/deathcurse_ogre.txt
+++ b/res/cardsfolder/d/deathcurse_ogre.txt
@@ -3,7 +3,7 @@ ManaCost:5 B
 Types:Creature Ogre Warrior
 Text:no text
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME dies, each player loses 3 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, each player loses 3 life.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | LifeAmount$ 3 | Defined$ Each
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deathcurse_ogre.jpg
diff --git a/res/cardsfolder/d/doomed_traveler.txt b/res/cardsfolder/d/doomed_traveler.txt
index 8a26bfdcb64..ef0179a416a 100644
--- a/res/cardsfolder/d/doomed_traveler.txt
+++ b/res/cardsfolder/d/doomed_traveler.txt
@@ -1,13 +1,13 @@
-Name:Doomed Traveler
-ManaCost:W
-Types:Creature Human Soldier
-Text:no text
-PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 1 1 Spirit | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
-SVar:SacMe:1
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/doomed_traveler.jpg
-SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/11.jpg
-Oracle:When Doomed Traveler dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
+Name:Doomed Traveler
+ManaCost:W
+Types:Creature Human Soldier
+Text:no text
+PT:1/1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 1 1 Spirit | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
+SVar:SacMe:1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/doomed_traveler.jpg
+SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/11.jpg
+Oracle:When Doomed Traveler dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/d/dusk_urchins.txt b/res/cardsfolder/d/dusk_urchins.txt
index 0389b00f1b4..b210f95b7e7 100644
--- a/res/cardsfolder/d/dusk_urchins.txt
+++ b/res/cardsfolder/d/dusk_urchins.txt
@@ -6,7 +6,7 @@ PT:4/3
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks or blocks, put a -1/-1 counter on it.
 T:Mode$ Blocks | ValidCard$ Card.Self | Execute$ TrigPutCounter | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks or blocks, put a -1/-1 counter on it.
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | CounterType$ M1M1 | CounterNum$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME dies, draw a card for each -1/-1 counter on it.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, draw a card for each -1/-1 counter on it.
 SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ X
 SVar:X:TriggeredCard$CardCounters.M1M1
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/e/elder_cathar.txt b/res/cardsfolder/e/elder_cathar.txt
index 96abb440a90..c90abeba18b 100644
--- a/res/cardsfolder/e/elder_cathar.txt
+++ b/res/cardsfolder/e/elder_cathar.txt
@@ -1,13 +1,13 @@
-Name:Elder Cathar
-ManaCost:2 W
-Types:Creature Human Soldier
-Text:no text
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME dies, put a +1/+1 counter on target creature you control. If that creature is a Human, put two +1/+1 counters on it instead.
-SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ X
-SVar:X:Targeted$Valid Creature.Human/Plus.1
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/elder_cathar.jpg
-SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/12.jpg
-Oracle:When Elder Cathar dies, put a +1/+1 counter on target creature you control. If that creature is a Human, put two +1/+1 counters on it instead.
+Name:Elder Cathar
+ManaCost:2 W
+Types:Creature Human Soldier
+Text:no text
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a +1/+1 counter on target creature you control. If that creature is a Human, put two +1/+1 counters on it instead.
+SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ X
+SVar:X:Targeted$Valid Creature.Human/Plus.1
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/elder_cathar.jpg
+SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/12.jpg
+Oracle:When Elder Cathar dies, put a +1/+1 counter on target creature you control. If that creature is a Human, put two +1/+1 counters on it instead.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/e/elgaud_inquisitor.txt b/res/cardsfolder/e/elgaud_inquisitor.txt
index 95f63adc84b..8d9a2b41b9f 100644
--- a/res/cardsfolder/e/elgaud_inquisitor.txt
+++ b/res/cardsfolder/e/elgaud_inquisitor.txt
@@ -4,7 +4,7 @@ Types:Creature Human Cleric
 Text:no text
 PT:2/2
 K:Lifelink
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 1 1 Spirit | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:SacMe:1
 SVar:Rarity:Common
diff --git a/res/cardsfolder/e/elvish_soultiller.txt b/res/cardsfolder/e/elvish_soultiller.txt
index 49dba4d01ca..56e3dd8f5ce 100644
--- a/res/cardsfolder/e/elvish_soultiller.txt
+++ b/res/cardsfolder/e/elvish_soultiller.txt
@@ -1,13 +1,13 @@
-Name:Elvish Soultiller
-ManaCost:3 G G
-Types:Creature Elf Mutant
-Text:no text
-PT:5/4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When CARDNAME dies, choose a creature type. Shuffle all creature cards of that type from your graveyard into your library.
-SVar:TrigChoose:AB$ ChooseType | Cost$ 0 | Defined$ You | Type$ Creature | AILogic$ MostProminentInComputerGraveyard | SubAbility$ ShuffleInto
-SVar:ShuffleInto:DB$ ChangeZoneAll | ChangeType$ Creature.ChosenType+YouOwn | Origin$ Graveyard | Destination$ Library | Shuffle$ True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_soultiller.jpg
-SetInfo:LGN|Rare|http://magiccards.info/scans/en/le/124.jpg
-Oracle:When Elvish Soultiller dies, choose a creature type. Shuffle all creature cards of that type from your graveyard into your library.
+Name:Elvish Soultiller
+ManaCost:3 G G
+Types:Creature Elf Mutant
+Text:no text
+PT:5/4
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, choose a creature type. Shuffle all creature cards of that type from your graveyard into your library.
+SVar:TrigChoose:AB$ ChooseType | Cost$ 0 | Defined$ You | Type$ Creature | AILogic$ MostProminentInComputerGraveyard | SubAbility$ ShuffleInto
+SVar:ShuffleInto:DB$ ChangeZoneAll | ChangeType$ Creature.ChosenType+YouOwn | Origin$ Graveyard | Destination$ Library | Shuffle$ True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/elvish_soultiller.jpg
+SetInfo:LGN|Rare|http://magiccards.info/scans/en/le/124.jpg
+Oracle:When Elvish Soultiller dies, choose a creature type. Shuffle all creature cards of that type from your graveyard into your library.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/e/enatu_golem.txt b/res/cardsfolder/e/enatu_golem.txt
index 908523287f6..0eb550ca73b 100644
--- a/res/cardsfolder/e/enatu_golem.txt
+++ b/res/cardsfolder/e/enatu_golem.txt
@@ -3,7 +3,7 @@ ManaCost:6
 Types:Artifact Creature Golem
 Text:no text
 PT:3/5
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME dies, you gain 4 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you gain 4 life.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ TriggeredCardController | LifeAmount$ 4
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/enatu_golem.jpg
diff --git a/res/cardsfolder/f/fyndhorn_druid.txt b/res/cardsfolder/f/fyndhorn_druid.txt
index c70d90cc94b..262ed3b92d7 100644
--- a/res/cardsfolder/f/fyndhorn_druid.txt
+++ b/res/cardsfolder/f/fyndhorn_druid.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Elf Druid
 Text:no text
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+gotBlockedThisTurn | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME dies, if it was blocked this turn, you gain 4 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+gotBlockedThisTurn | Execute$ TrigGainLife | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, if it was blocked this turn, you gain 4 life.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ TriggeredCardController | LifeAmount$ 4
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fyndhorn_druid.jpg
diff --git a/res/cardsfolder/g/gamekeeper.txt b/res/cardsfolder/g/gamekeeper.txt
index 73f7efea86d..02c4704bbcf 100644
--- a/res/cardsfolder/g/gamekeeper.txt
+++ b/res/cardsfolder/g/gamekeeper.txt
@@ -1,13 +1,13 @@
-Name:Gamekeeper
-ManaCost:3 G
-Types:Creature Elf
-Text:no text
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and put all other cards revealed this way into your graveyard.
-SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBDigUntil
-SVar:DBDigUntil:DB$ DigUntil | Valid$ Creature | ValidDescription$ Creature | FoundDestination$ Battlefield | RevealedDestination$ Graveyard
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/gamekeeper.jpg
-SetInfo:UDS|Uncommon|http://magiccards.info/scans/en/ud/106.jpg
-Oracle:When Gamekeeper dies, you may exile it. If you do, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and put all other cards revealed this way into your graveyard.
+Name:Gamekeeper
+ManaCost:3 G
+Types:Creature Elf
+Text:no text
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and put all other cards revealed this way into your graveyard.
+SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBDigUntil
+SVar:DBDigUntil:DB$ DigUntil | Valid$ Creature | ValidDescription$ Creature | FoundDestination$ Battlefield | RevealedDestination$ Graveyard
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/gamekeeper.jpg
+SetInfo:UDS|Uncommon|http://magiccards.info/scans/en/ud/106.jpg
+Oracle:When Gamekeeper dies, you may exile it. If you do, reveal cards from the top of your library until you reveal a creature card. Put that card onto the battlefield and put all other cards revealed this way into your graveyard.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/g/grief_tyrant.txt b/res/cardsfolder/g/grief_tyrant.txt
index a3776648505..abaf748edc3 100644
--- a/res/cardsfolder/g/grief_tyrant.txt
+++ b/res/cardsfolder/g/grief_tyrant.txt
@@ -4,7 +4,7 @@ Types:Creature Horror
 Text:no text
 PT:8/8
 K:etbCounter:M1M1:4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigCurse | TriggerDescription$ When CARDNAME dies, put a -1/-1 counter on target creature for each -1/-1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigCurse | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a -1/-1 counter on target creature for each -1/-1 counter on CARDNAME.
 SVar:TrigCurse:AB$ PutCounter | Cost$ 0 | ValidTgts$ Creature | CounterType$ M1M1 | CounterNum$ X
 SVar:X:TriggeredCard$CardCounters.M1M1
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/h/haakon_stromgald_scourge.txt b/res/cardsfolder/h/haakon_stromgald_scourge.txt
index 2d2a818332e..f78f064b4c2 100644
--- a/res/cardsfolder/h/haakon_stromgald_scourge.txt
+++ b/res/cardsfolder/h/haakon_stromgald_scourge.txt
@@ -6,7 +6,7 @@ PT:3/3
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ HIDDEN May be played | AffectedZone$ Graveyard | EffectZone$ Graveyard
 S:Mode$ CantBeCast | ValidCard$ Card.Self | Origin$ Exile,Hand,Library | EffectZone$ Graveyard,Hand,Library | Description$ You may cast CARDNAME from your graveyard, but not from anywhere else.
 S:Mode$ Continuous | Affected$ Knight.YouCtrl | AddHiddenKeyword$ HIDDEN May be played | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ As long as CARDNAME is on the battlefield, you may play Knight cards from your graveyard.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLose  | TriggerDescription$ When CARDNAME dies, you lose 2 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLose  | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you lose 2 life.
 SVar:TrigLose:AB$ LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 2
 SVar:RemRandomDeck:True
 SVar:DiscardMe:5
diff --git a/res/cardsfolder/h/hoarding_dragon.txt b/res/cardsfolder/h/hoarding_dragon.txt
index 40c9b459776..da4e4db0f63 100644
--- a/res/cardsfolder/h/hoarding_dragon.txt
+++ b/res/cardsfolder/h/hoarding_dragon.txt
@@ -6,7 +6,7 @@ PT:4/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for an artifact card, exile it, then shuffle your library.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Exile | ChangeType$ Artifact | ChangeNum$ 1 | RememberChanged$ True
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME dies, you may put the exiled card into its owner's hand.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigReturn | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may put the exiled card into its owner's hand.
 SVar:TrigReturn:DB$ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Exile | Destination$ Hand
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hoarding_dragon.jpg
diff --git a/res/cardsfolder/h/homura_human_ascendant_homuras_essence.txt b/res/cardsfolder/h/homura_human_ascendant_homuras_essence.txt
index 60e49851576..09fc79187ba 100644
--- a/res/cardsfolder/h/homura_human_ascendant_homuras_essence.txt
+++ b/res/cardsfolder/h/homura_human_ascendant_homuras_essence.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Human Monk
 Text:no text
 PT:4/4
 K:CARDNAME can't block.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME dies, return it to the battlefield flipped.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, return it to the battlefield flipped.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ TrigFlip
 SVar:TrigFlip:DB$SetState | Defined$ Self | Mode$ Flip
 SVar:Picture:http://www.wizards.com/global/images/magic/general/homura_human_ascendant.jpg
diff --git a/res/cardsfolder/i/iname_as_one.txt b/res/cardsfolder/i/iname_as_one.txt
index caf96f70a08..391b9728cbf 100644
--- a/res/cardsfolder/i/iname_as_one.txt
+++ b/res/cardsfolder/i/iname_as_one.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:8/8
 T:Mode$ ChangesZone | ValidCard$ Card.wasCastFromHand+Self | Destination$ Battlefield | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it from your hand, you may search your library for a Spirit permanent card, put it onto the battlefield, then shuffle your library.
 SVar:TrigSearch:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | ChangeType$ Spirit.YouCtrl | ChangeNum$ 1
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, return target Spirit permanent card from your graveyard to the battlefield.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, return target Spirit permanent card from your graveyard to the battlefield.
 SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | ValidCard$ Card.Self | SubAbility$ DBReturn
 SVar:DBReturn:DB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Hidden$ True | ChangeType$ Spirit.YouCtrl | ChangeNum$ 1
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/i/iname_life_aspect.txt b/res/cardsfolder/i/iname_life_aspect.txt
index 1deec29314c..1065d161d0e 100644
--- a/res/cardsfolder/i/iname_life_aspect.txt
+++ b/res/cardsfolder/i/iname_life_aspect.txt
@@ -1,15 +1,15 @@
-Name:Iname, Life Aspect
-ManaCost:4 G G
-Types:Legendary Creature Spirit
-Text:no text
-PT:4/4
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, return any number of target Spirit cards from your graveyard to your hand.
-SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | ValidCard$ Card.Self | SubAbility$ DBReturn
-SVar:DBReturn:DB$ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Spirit.YouCtrl | TargetMin$ 0 | TargetMax$ X
-SVar:X:Count$TypeInYourYard.Spirit
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/iname_life_aspect.jpg
-SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/215.jpg
-Oracle:When Iname, Life Aspect dies, you may exile it. If you do, return any number of target Spirit cards from your graveyard to your hand.
+Name:Iname, Life Aspect
+ManaCost:4 G G
+Types:Legendary Creature Spirit
+Text:no text
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, return any number of target Spirit cards from your graveyard to your hand.
+SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | ValidCard$ Card.Self | SubAbility$ DBReturn
+SVar:DBReturn:DB$ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Spirit.YouCtrl | TargetMin$ 0 | TargetMax$ X
+SVar:X:Count$TypeInYourYard.Spirit
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/iname_life_aspect.jpg
+SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/215.jpg
+Oracle:When Iname, Life Aspect dies, you may exile it. If you do, return any number of target Spirit cards from your graveyard to your hand.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/i/ivory_gargoyle.txt b/res/cardsfolder/i/ivory_gargoyle.txt
index 1d9ad08f0ab..12ec049acde 100644
--- a/res/cardsfolder/i/ivory_gargoyle.txt
+++ b/res/cardsfolder/i/ivory_gargoyle.txt
@@ -4,7 +4,7 @@ Types:Creature Gargoyle
 Text:no text
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDelay | TriggerDescription$ When CARDNAME dies, return it to the battlefield under its owner's control at the beginning of the next end step and you skip your next draw step.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDelay | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, return it to the battlefield under its owner's control at the beginning of the next end step and you skip your next draw step.
 SVar:TrigDelay:AB$ DelayedTrigger | Cost$ 0 | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBSkipDraw
 SVar:DBSkipDraw:DB$ Pump | Defined$ You | KW$ Skip your next draw step. | Permanent$ True
diff --git a/res/cardsfolder/j/jotun_owl_keeper.txt b/res/cardsfolder/j/jotun_owl_keeper.txt
index a135f5d3cb7..9836de9efcc 100644
--- a/res/cardsfolder/j/jotun_owl_keeper.txt
+++ b/res/cardsfolder/j/jotun_owl_keeper.txt
@@ -4,7 +4,7 @@ Types:Creature Giant
 Text:no text
 PT:3/3
 K:Cumulative upkeep:WU
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, put a 1/1 white Bird creature token with flying onto the battlefield for each age counter on it.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a 1/1 white Bird creature token with flying onto the battlefield for each age counter on it.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ X | TokenName$ Bird | TokenImage$ W 1 1 Bird Flying | TokenTypes$ Creature,Bird | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
 SVar:X:TriggeredCard$CardCounters.AGE
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/l/loyal_cathar_unhallowed_cathar.txt b/res/cardsfolder/l/loyal_cathar_unhallowed_cathar.txt
index db795733907..14f9704f212 100644
--- a/res/cardsfolder/l/loyal_cathar_unhallowed_cathar.txt
+++ b/res/cardsfolder/l/loyal_cathar_unhallowed_cathar.txt
@@ -4,7 +4,7 @@ Types:Creature Human Soldier
 Text:no text
 PT:2/2
 K:Vigilance
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDelay | TriggerDescription$ When CARDNAME dies, return it to the battlefield transformed under your control at the beginning of the next end step.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDelay | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, return it to the battlefield transformed under your control at the beginning of the next end step.
 SVar:TrigDelay:AB$ DelayedTrigger | Cost$ 0 | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ return CARDNAME to the battlefield transformed
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ TrigTransform
 SVar:TrigTransform:DB$ SetState | Cost$ 0 | Defined$ Self | Mode$ Transform
diff --git a/res/cardsfolder/m/mausoleum_guard.txt b/res/cardsfolder/m/mausoleum_guard.txt
index 373685daf4b..280204f1b36 100644
--- a/res/cardsfolder/m/mausoleum_guard.txt
+++ b/res/cardsfolder/m/mausoleum_guard.txt
@@ -1,13 +1,13 @@
-Name:Mausoleum Guard
-ManaCost:3 W
-Types:Creature Human Scout
-Text:no text
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, put two 1/1 white Spirit creature tokens with flying onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 1 1 Spirit | TokenAmount$ 2 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
-SVar:SacMe:1
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mausoleum_guard.jpg
-SetInfo:ISD|Uncommon|http://magiccards.info/scans/en/isd/20.jpg
-Oracle:When Mausoleum Guard dies, put two 1/1 white Spirit creature tokens with flying onto the battlefield.
+Name:Mausoleum Guard
+ManaCost:3 W
+Types:Creature Human Scout
+Text:no text
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put two 1/1 white Spirit creature tokens with flying onto the battlefield.
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 1 1 Spirit | TokenAmount$ 2 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
+SVar:SacMe:1
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mausoleum_guard.jpg
+SetInfo:ISD|Uncommon|http://magiccards.info/scans/en/isd/20.jpg
+Oracle:When Mausoleum Guard dies, put two 1/1 white Spirit creature tokens with flying onto the battlefield.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/m/moldgraf_monstrosity.txt b/res/cardsfolder/m/moldgraf_monstrosity.txt
index 987396e0bda..c320b9495a8 100644
--- a/res/cardsfolder/m/moldgraf_monstrosity.txt
+++ b/res/cardsfolder/m/moldgraf_monstrosity.txt
@@ -4,7 +4,7 @@ Types:Creature Insect
 Text:no text
 PT:8/8
 K:Trample
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerDescription$ When CARDNAME dies, exile it, then return two creature cards at random from your graveyard to the battlefield.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigExile | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, exile it, then return two creature cards at random from your graveyard to the battlefield.
 SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ChangeZone | ChangeType$ Creature.YouCtrl | ChangeNum$ 2 | Hidden$ True | Origin$ Graveyard | AtRandom$ True | Destination$ Battlefield
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/m/molten_firebird.txt b/res/cardsfolder/m/molten_firebird.txt
index a90860d2400..58cebd52f06 100644
--- a/res/cardsfolder/m/molten_firebird.txt
+++ b/res/cardsfolder/m/molten_firebird.txt
@@ -4,7 +4,7 @@ Types:Creature Phoenix
 Text:no text
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDelay | TriggerDescription$ When CARDNAME dies, return it to the battlefield under its owner's control at the beginning of the next end step and you skip your next draw step.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDelay | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, return it to the battlefield under its owner's control at the beginning of the next end step and you skip your next draw step.
 SVar:TrigDelay:AB$ DelayedTrigger | Cost$ 0 | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | TriggerDescription$ Return CARDNAME to the battlefield.
 SVar:TrigReturn:AB$ ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBSkipDraw
 SVar:DBSkipDraw:DB$ Pump | Defined$ You | KW$ Skip your next draw step. | Permanent$ True
diff --git a/res/cardsfolder/p/pitchburn_devils.txt b/res/cardsfolder/p/pitchburn_devils.txt
index 82cd791ba31..f1e68a5b4c5 100644
--- a/res/cardsfolder/p/pitchburn_devils.txt
+++ b/res/cardsfolder/p/pitchburn_devils.txt
@@ -1,12 +1,12 @@
-Name:Pitchburn Devils
-ManaCost:4 R
-Types:Creature Devil
-Text:no text
-PT:3/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME dies, it deals 3 damage to target creature or player.
-SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 3
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/pitchburn_devils.jpg
-SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/156.jpg
-Oracle:When Pitchburn Devils dies, it deals 3 damage to target creature or player.
+Name:Pitchburn Devils
+ManaCost:4 R
+Types:Creature Devil
+Text:no text
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, it deals 3 damage to target creature or player.
+SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ 3
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/pitchburn_devils.jpg
+SetInfo:ISD|Common|http://magiccards.info/scans/en/isd/156.jpg
+Oracle:When Pitchburn Devils dies, it deals 3 damage to target creature or player.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/r/rooting_kavu.txt b/res/cardsfolder/r/rooting_kavu.txt
index bf8089ada4e..1fbb4d9e45f 100644
--- a/res/cardsfolder/r/rooting_kavu.txt
+++ b/res/cardsfolder/r/rooting_kavu.txt
@@ -3,7 +3,7 @@ ManaCost:2 G G
 Types:Creature Kavu
 Text:no text
 PT:4/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ You| TriggerDescription$ When CARDNAME dies, you may exile it. If you do, shuffle all creature cards from your graveyard into your library.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you may exile it. If you do, shuffle all creature cards from your graveyard into your library.
 SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBShuffle
 SVar:DBShuffle:DB$ChangeZoneAll | ChangeType$ Creature.YouCtrl | Origin$ Graveyard | Destination$ Library | Shuffle$ True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/t/treacherous_werewolf.txt b/res/cardsfolder/t/treacherous_werewolf.txt
index 9193054028b..03d60ceed3f 100644
--- a/res/cardsfolder/t/treacherous_werewolf.txt
+++ b/res/cardsfolder/t/treacherous_werewolf.txt
@@ -4,7 +4,7 @@ Types:Creature Werewolf Minion
 Text:no text
 PT:2/2
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddTrigger$ Dies | AddSVar$ TrigLose | Threshold$ True | Description$ Threshold - As long as seven or more cards are in your graveyard, CARDNAME gets +2/+2 and has "When CARDNAME dies, you lose 4 life."
-SVar:Dies:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLose  | Secondary$ True | TriggerDescription$ When CARDNAME dies, you lose 4 life.
+SVar:Dies:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigLose  | Secondary$ True | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, you lose 4 life.
 SVar:TrigLose:AB$ LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 4
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/treacherous_werewolf.jpg