diff --git a/res/cardsfolder/c/child_of_alara.txt b/res/cardsfolder/c/child_of_alara.txt
index 3af3ea26b9c..6ada47ef36e 100644
--- a/res/cardsfolder/c/child_of_alara.txt
+++ b/res/cardsfolder/c/child_of_alara.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Avatar
 Text:no text
 PT:6/6
 K:Trample
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDestroyAll | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, destroy all nonland permanents. They can't be regenerated.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDestroyAll | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, destroy all nonland permanents. They can't be regenerated.
 SVar:TrigDestroyAll:AB$DestroyAll | Cost$ 0 | ValidCards$ Permanent.nonLand | NoRegen$ True
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/child_of_alara.jpg
diff --git a/res/cardsfolder/c/chime_of_night.txt b/res/cardsfolder/c/chime_of_night.txt
index 93f8bf5f904..f7d8ffdd21c 100644
--- a/res/cardsfolder/c/chime_of_night.txt
+++ b/res/cardsfolder/c/chime_of_night.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, destroy target nonblack creature.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDestroy | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, destroy target nonblack creature.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chime_of_night.jpg
diff --git a/res/cardsfolder/c/chimney_imp.txt b/res/cardsfolder/c/chimney_imp.txt
index f05c6c926ec..a494e443dd8 100644
--- a/res/cardsfolder/c/chimney_imp.txt
+++ b/res/cardsfolder/c/chimney_imp.txt
@@ -4,7 +4,7 @@ Types:Creature Imp
 Text:no text
 PT:1/2
 K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, target opponent puts a card from his or her hand on top of his or her library.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, target opponent puts a card from his or her hand on top of his or her library.
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Library | LibraryPosition$ 0 | ValidTgts$ Opponent | ChangeType$ Card | ChangeNum$ 1 | Chooser$ Opponent | Mandatory$ True | IsCurse$ True
 SVar:SacMe:1
 SVar:Rarity:Common
diff --git a/res/cardsfolder/c/chromatic_star.txt b/res/cardsfolder/c/chromatic_star.txt
index 126b2a080a4..0bd9eaa2157 100644
--- a/res/cardsfolder/c/chromatic_star.txt
+++ b/res/cardsfolder/c/chromatic_star.txt
@@ -3,7 +3,7 @@ ManaCost:1
 Types:Artifact
 Text:no text
 A:AB$ Mana | Cost$ 1 T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ TriggeredCardController | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:SacMe:1
diff --git a/res/cardsfolder/c/core_prowler.txt b/res/cardsfolder/c/core_prowler.txt
index 087d5e4c717..4486d131fc1 100644
--- a/res/cardsfolder/c/core_prowler.txt
+++ b/res/cardsfolder/c/core_prowler.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Horror
 Text:no text
 PT:2/2
 K:Infect
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigProliferate | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, proliferate.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigProliferate | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, proliferate.
 SVar:TrigProliferate:AB$Proliferate | Cost$ 0
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/core_prowler.jpg
diff --git a/res/cardsfolder/c/cyclopean_giant.txt b/res/cardsfolder/c/cyclopean_giant.txt
index 7e56d9620db..0ae500d9589 100644
--- a/res/cardsfolder/c/cyclopean_giant.txt
+++ b/res/cardsfolder/c/cyclopean_giant.txt
@@ -3,7 +3,7 @@ ManaCost:2 B B
 Types:Creature Zombie Giant
 Text:no text
 PT:4/2
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigAnimate | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, target land becomes a Swamp. Exile CARDNAME.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigAnimate | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, target land becomes a Swamp. Exile CARDNAME.
 SVar:TrigAnimate:AB$ Animate | Cost$ 0 | ValidTgts$ Land | TgtPrompt$ Select target land | Types$ Swamp | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True | Permanent$ True | SubAbility$ DBExile | SpellDescription$ Target land becomes a Swamp.
 SVar:DBExile:DB$ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Exile
 SVar:Rarity:Common
diff --git a/res/cardsfolder/c/cyclopean_mummy.txt b/res/cardsfolder/c/cyclopean_mummy.txt
index 3b13fd24d51..8d291448bdd 100644
--- a/res/cardsfolder/c/cyclopean_mummy.txt
+++ b/res/cardsfolder/c/cyclopean_mummy.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Zombie
 Text:no text
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, exile CARDNAME.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, exile CARDNAME.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | Defined$ Self
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cyclopean_mummy.jpg
diff --git a/res/cardsfolder/d/darkslick_drake.txt b/res/cardsfolder/d/darkslick_drake.txt
index b306c111c0b..bc28eaf6e4a 100644
--- a/res/cardsfolder/d/darkslick_drake.txt
+++ b/res/cardsfolder/d/darkslick_drake.txt
@@ -4,7 +4,7 @@ Types:Creature Drake
 Text:no text
 PT:2/4
 K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 1 | Defined$ TriggeredCardController
 SVar:SacMe:1
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/d/deaths_head_buzzard.txt b/res/cardsfolder/d/deaths_head_buzzard.txt
index 30711d95d43..34072b48415 100644
--- a/res/cardsfolder/d/deaths_head_buzzard.txt
+++ b/res/cardsfolder/d/deaths_head_buzzard.txt
@@ -4,7 +4,7 @@ Types:Creature Bird
 Text:no text
 PT:2/1
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, all creatures get -1/-1 until end of turn.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigPumpAll | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, all creatures get -1/-1 until end of turn.
 SVar:TrigPumpAll:AB$PumpAll | Cost$ 0 | ValidCards$ Creature | NumAtt$ -1 | NumDef$ -1
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/d/despondency.txt b/res/cardsfolder/d/despondency.txt
index 37f9f61bcec..51d637105ac 100644
--- a/res/cardsfolder/d/despondency.txt
+++ b/res/cardsfolder/d/despondency.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Curse
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -2 | Description$ Enchanted creature gets -2/-0.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand
 SVar:SacMe:2
 SVar:Rarity:Common
diff --git a/res/cardsfolder/d/disease_carriers.txt b/res/cardsfolder/d/disease_carriers.txt
index e4e0c451bca..93641247b44 100644
--- a/res/cardsfolder/d/disease_carriers.txt
+++ b/res/cardsfolder/d/disease_carriers.txt
@@ -3,7 +3,7 @@ ManaCost:2 B B
 Types:Creature Rat
 Text:no text
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, target creature gets -2/-2 until end of turn.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPump | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, target creature gets -2/-2 until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/disease_carriers.jpg
diff --git a/res/cardsfolder/d/dripping_tongue_zubera.txt b/res/cardsfolder/d/dripping_tongue_zubera.txt
index 0d08d71de92..88535082f66 100644
--- a/res/cardsfolder/d/dripping_tongue_zubera.txt
+++ b/res/cardsfolder/d/dripping_tongue_zubera.txt
@@ -2,7 +2,7 @@ Name:Dripping-Tongue Zubera
 ManaCost:1 G
 Types:Creature Zubera Spirit
 Text:no text
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put a 1/1 colorless Spirit creature token onto the battlefield for each Zubera put into a graveyard from the battlefield this turn.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put a 1/1 colorless Spirit creature token onto the battlefield for each Zubera put into a graveyard from the battlefield this turn.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenOwner$ You | TokenPower$ 1 | TokenToughness$ 1 | TokenColors$ Colorless | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenAmount$ X
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Card.Zubera
 PT:1/2
diff --git a/res/cardsfolder/e/ember_fist_zubera.txt b/res/cardsfolder/e/ember_fist_zubera.txt
index 9b09f36c21c..a87fba73c7e 100644
--- a/res/cardsfolder/e/ember_fist_zubera.txt
+++ b/res/cardsfolder/e/ember_fist_zubera.txt
@@ -2,7 +2,7 @@ Name:Ember-Fist Zubera
 ManaCost:1 R
 Types:Creature Zubera Spirit
 Text:no text
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, it deals damage to target creature or player equal to the number of Zubera put into all graveyards from the battlefield this turn.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, it deals damage to target creature or player equal to the number of Zubera put into all graveyards from the battlefield this turn.
 SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Tgt$ TgtCP | NumDmg$ X
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Card.Zubera
 PT:1/2
diff --git a/res/cardsfolder/e/endless_cockroaches.txt b/res/cardsfolder/e/endless_cockroaches.txt
index 8fe6eff696f..62c4b9b8a19 100644
--- a/res/cardsfolder/e/endless_cockroaches.txt
+++ b/res/cardsfolder/e/endless_cockroaches.txt
@@ -3,7 +3,7 @@ ManaCost:1 B B
 Types:Creature Insect
 Text:no text
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand
 SVar:SacMe:2
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/e/enigma_sphinx.txt b/res/cardsfolder/e/enigma_sphinx.txt
index b78ff118df5..cd660961fb0 100644
--- a/res/cardsfolder/e/enigma_sphinx.txt
+++ b/res/cardsfolder/e/enigma_sphinx.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Sphinx
 Text:no text
 PT:5/4
 K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, put it into your library third from the top.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME is put into your graveyard from the battlefield, put it into your library third from the top.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 2
 K:Cascade
 SVar:Picture:http://www.wizards.com/global/images/magic/general/enigma_sphinx.jpg
diff --git a/res/cardsfolder/e/exiled_boggart.txt b/res/cardsfolder/e/exiled_boggart.txt
index a7bf96447e5..af049c43beb 100644
--- a/res/cardsfolder/e/exiled_boggart.txt
+++ b/res/cardsfolder/e/exiled_boggart.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Goblin Rogue
 Text:no text
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, discard a card.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, discard a card.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ TriggeredCardController | NumCards$ 1 | Mode$ TgtChoose
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/exiled_boggart.jpg
diff --git a/res/cardsfolder/f/fallen_ideal.txt b/res/cardsfolder/f/fallen_ideal.txt
index 5a0bff84a20..8a6860a3883 100644
--- a/res/cardsfolder/f/fallen_ideal.txt
+++ b/res/cardsfolder/f/fallen_ideal.txt
@@ -6,7 +6,7 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Flying | AddAbility$ ABPump | Description$ Enchanted creature has flying and "Sacrifice a creature: This creature gets +2/+1 until end of turn."
 SVar:ABPump:AB$ Pump | Cost$ Sac<1/Creature> | NumAtt$ +2 | NumDef$ +1 | SpellDescription$ CARDNAME gets +2/+1 until end of turn.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand
 SVar:SacMe:2
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/f/false_prophet.txt b/res/cardsfolder/f/false_prophet.txt
index f43c8930c1d..50cda428fde 100644
--- a/res/cardsfolder/f/false_prophet.txt
+++ b/res/cardsfolder/f/false_prophet.txt
@@ -3,7 +3,7 @@ ManaCost:2 W W
 Types:Creature Human Cleric
 Text:no text
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, exile all creatures.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigSac | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, exile all creatures.
 SVar:TrigSac:AB$ChangeZoneAll | Cost$ 0 | ChangeType$ Creature | Origin$ Battlefield | Destination$ Exile
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/f/festering_goblin.txt b/res/cardsfolder/f/festering_goblin.txt
index d8cc96767f2..55f90deb055 100644
--- a/res/cardsfolder/f/festering_goblin.txt
+++ b/res/cardsfolder/f/festering_goblin.txt
@@ -3,7 +3,7 @@ ManaCost:B
 Types:Creature Zombie Goblin
 Text:no text
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, target creature gets -1/-1 until end of turn.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPump | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, target creature gets -1/-1 until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/festering_goblin.jpg
diff --git a/res/cardsfolder/f/fiery_mantle.txt b/res/cardsfolder/f/fiery_mantle.txt
index 4112c6ad408..086c804b613 100644
--- a/res/cardsfolder/f/fiery_mantle.txt
+++ b/res/cardsfolder/f/fiery_mantle.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Pump
 A:AB$ Pump | Cost$ R | Defined$ Enchanted | NumAtt$ +1 | SpellDescription$ Enchanted creature gets +1/+0 until end of turn.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand
 SVar:SacMe:2
 SVar:Rarity:Common
diff --git a/res/cardsfolder/f/fire_snake.txt b/res/cardsfolder/f/fire_snake.txt
index c460bb350ea..b7f2c1331c2 100644
--- a/res/cardsfolder/f/fire_snake.txt
+++ b/res/cardsfolder/f/fire_snake.txt
@@ -3,7 +3,7 @@ ManaCost:4 R
 Types:Creature Snake
 Text:no text
 PT:3/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, destroy target land.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, destroy target land.
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Land | TgtPrompt$ Select target land
 SVar:Rarity:Common
 SVar:Picture:http://serv2.tcgimages.eu/img/cards/Portal/fire_snake.jpg
diff --git a/res/cardsfolder/f/flagstones_of_trokair.txt b/res/cardsfolder/f/flagstones_of_trokair.txt
index 0ff692b4373..cb9b0c64501 100644
--- a/res/cardsfolder/f/flagstones_of_trokair.txt
+++ b/res/cardsfolder/f/flagstones_of_trokair.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Legendary Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add W to your mana pool.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may search your library for a Plains card and put it onto the battlefield tapped. If you do, shuffle your library.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ TriggeredCardController | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may search your library for a Plains card and put it onto the battlefield tapped. If you do, shuffle your library.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Card.Plains | ChangeNum$ 1
 SVar:SacMe:3
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/f/flight_spellbomb.txt b/res/cardsfolder/f/flight_spellbomb.txt
index e0aa4c2decc..ec3ecf2cac8 100644
--- a/res/cardsfolder/f/flight_spellbomb.txt
+++ b/res/cardsfolder/f/flight_spellbomb.txt
@@ -3,7 +3,7 @@ ManaCost:1
 Types:Artifact
 Text:no text
 A:AB$ Pump | Cost$ T Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying | SpellDescription$ Target creature gains flying until end of turn.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may pay U. If you do, draw a card.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | OptionalDecider$ TriggeredCardController | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you may pay U. If you do, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ U | NumCards$ 1
 SVar:RemRandomDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/f/floating_dream_zubera.txt b/res/cardsfolder/f/floating_dream_zubera.txt
index 7086fa584c8..250e9ff8c57 100644
--- a/res/cardsfolder/f/floating_dream_zubera.txt
+++ b/res/cardsfolder/f/floating_dream_zubera.txt
@@ -2,7 +2,7 @@ Name:Floating-Dream Zubera
 ManaCost:1 U
 Types:Creature Zubera Spirit
 Text:no text
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card for each Zubera put into a graveyard from the battlefield this turn.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card for each Zubera put into a graveyard from the battlefield this turn.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ X
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Card.Zubera
 PT:1/2
diff --git a/res/cardsfolder/f/fools_demise.txt b/res/cardsfolder/f/fools_demise.txt
index ea8cfb92c0b..142df722ebb 100644
--- a/res/cardsfolder/f/fools_demise.txt
+++ b/res/cardsfolder/f/fools_demise.txt
@@ -6,7 +6,7 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 4 U | ValidTgts$ Creature | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChange | TriggerDescription$ When enchanted creature is put into a graveyard, return that card to the battlefield under your control.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredCard
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
 SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fools_demise.jpg
diff --git a/res/cardsfolder/f/fortitude.txt b/res/cardsfolder/f/fortitude.txt
index f644de386fe..93700bcaadd 100644
--- a/res/cardsfolder/f/fortitude.txt
+++ b/res/cardsfolder/f/fortitude.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Creature | AILogic$ Pump
 A:AB$ Regenerate | Cost$ Sac<1/Forest> | Defined$ Enchanted | SpellDescription$ Regenerate enchanted creature.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Graveyard | Execute$ TrigBounce | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Graveyard | Execute$ TrigBounce | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, return CARDNAME to its owner's hand.
 SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | Defined$ Self
 SVar:RemAIDeck:True
 SVar:Rarity:Common