diff --git a/forge-gui/res/cardsfolder/s/saberclaw_golem.txt b/forge-gui/res/cardsfolder/s/saberclaw_golem.txt
index 60bfaf4ce7f..1845b08596f 100644
--- a/forge-gui/res/cardsfolder/s/saberclaw_golem.txt
+++ b/forge-gui/res/cardsfolder/s/saberclaw_golem.txt
@@ -2,6 +2,6 @@ Name:Saberclaw Golem
 ManaCost:5
 Types:Artifact Creature Golem
 PT:4/2
-A:AB$ Pump | Cost$ R | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
+A:AB$ Pump | Cost$ R | KW$ First Strike | Defined$ Self | SpellDescription$ CARDNAME gains first strike until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/saberclaw_golem.jpg
 Oracle:{R}: Saberclaw Golem gains first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sarcomite_myr.txt b/forge-gui/res/cardsfolder/s/sarcomite_myr.txt
index 8c1497b3318..7839171c2e3 100644
--- a/forge-gui/res/cardsfolder/s/sarcomite_myr.txt
+++ b/forge-gui/res/cardsfolder/s/sarcomite_myr.txt
@@ -2,7 +2,7 @@ Name:Sarcomite Myr
 ManaCost:2 U
 Types:Artifact Creature Myr
 PT:2/1
-A:AB$ Pump | Cost$ 2 | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
+A:AB$ Pump | Cost$ 2 | KW$ Flying | Defined$ Self | SpellDescription$ CARDNAME gains flying until end of turn.
 A:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | NumCards$ 1 | SpellDescription$ Draw a card.
 SVar:RemAIDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/fut/en-us/card136212.jpg
diff --git a/forge-gui/res/cardsfolder/s/scornful_aether_lich.txt b/forge-gui/res/cardsfolder/s/scornful_aether_lich.txt
index 23a09371d55..88b5b5da697 100644
--- a/forge-gui/res/cardsfolder/s/scornful_aether_lich.txt
+++ b/forge-gui/res/cardsfolder/s/scornful_aether_lich.txt
@@ -2,6 +2,6 @@ Name:Scornful AEther-Lich
 ManaCost:3 U
 Types:Artifact Creature Zombie Wizard
 PT:2/4
-A:AB$ Pump | Cost$ W B | KW$ Fear & Vigilance | SpellDescription$ CARDNAME gains fear and vigilance until end of turn.
+A:AB$ Pump | Cost$ W B | Defined$ Self | KW$ Fear & Vigilance | SpellDescription$ CARDNAME gains fear and vigilance until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scornful_aether_lich.jpg
 Oracle:{W}{B}: Scornful AEther-Lich gains fear and vigilance until end of turn. (Attacking doesn't cause it to tap, and it can't be blocked except by artifact creatures and/or black creatures.)
diff --git a/forge-gui/res/cardsfolder/s/searchlight_geist.txt b/forge-gui/res/cardsfolder/s/searchlight_geist.txt
index a737ca8d789..b92e4944428 100644
--- a/forge-gui/res/cardsfolder/s/searchlight_geist.txt
+++ b/forge-gui/res/cardsfolder/s/searchlight_geist.txt
@@ -3,6 +3,6 @@ ManaCost:2 B
 Types:Creature Spirit
 PT:2/1
 K:Flying
-A:AB$ Pump | Cost$ 3 B | KW$ Deathtouch | SpellDescription$ CARDNAME gains deathtouch until end of turn.
+A:AB$ Pump | Cost$ 3 B | Defined$ Self | KW$ Deathtouch | SpellDescription$ CARDNAME gains deathtouch until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/searchlight_geist.jpg
 Oracle:Flying\n{3}{B}: Searchlight Geist gains deathtouch until end of turn. (Any amount of damage it deals to a creature is enough to destroy it.)
diff --git a/forge-gui/res/cardsfolder/s/serpentine_kavu.txt b/forge-gui/res/cardsfolder/s/serpentine_kavu.txt
index f9df3830698..27e98b1efb5 100644
--- a/forge-gui/res/cardsfolder/s/serpentine_kavu.txt
+++ b/forge-gui/res/cardsfolder/s/serpentine_kavu.txt
@@ -2,6 +2,6 @@ Name:Serpentine Kavu
 ManaCost:4 G
 Types:Creature Kavu
 PT:4/4
-A:AB$ Pump | Cost$ R | KW$ Haste | SpellDescription$ CARDNAME gains haste until end of turn.
+A:AB$ Pump | Cost$ R | Defined$ Self | KW$ Haste | SpellDescription$ CARDNAME gains haste until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/serpentine_kavu.jpg
 Oracle:{R}: Serpentine Kavu gains haste until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/shore_snapper.txt b/forge-gui/res/cardsfolder/s/shore_snapper.txt
index 3ecf7f941ff..00227ea0985 100644
--- a/forge-gui/res/cardsfolder/s/shore_snapper.txt
+++ b/forge-gui/res/cardsfolder/s/shore_snapper.txt
@@ -2,6 +2,6 @@ Name:Shore Snapper
 ManaCost:2 B
 Types:Creature Beast
 PT:2/2
-A:AB$ Pump | Cost$ U | KW$ Islandwalk | SpellDescription$ CARDNAME gains islandwalk until end of turn.
+A:AB$ Pump | Cost$ U | Defined$ Self | KW$ Islandwalk | SpellDescription$ CARDNAME gains islandwalk until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shore_snapper.jpg
 Oracle:{U}: Shore Snapper gains islandwalk until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sighted_caste_sorcerer.txt b/forge-gui/res/cardsfolder/s/sighted_caste_sorcerer.txt
index d252a8a872b..ccf9818b1f9 100644
--- a/forge-gui/res/cardsfolder/s/sighted_caste_sorcerer.txt
+++ b/forge-gui/res/cardsfolder/s/sighted_caste_sorcerer.txt
@@ -3,6 +3,6 @@ ManaCost:1 W
 Types:Creature Human Wizard
 PT:1/1
 K:Exalted
-A:AB$ Pump | Cost$ U | KW$ Shroud | SpellDescription$ CARDNAME gains shroud until end of turn.
+A:AB$ Pump | Cost$ U | Defined$ Self | KW$ Shroud | SpellDescription$ CARDNAME gains shroud until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sighted_caste_sorcerer.jpg
 Oracle:Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)\n{U}: Sighted-Caste Sorcerer gains shroud until end of turn. (It can't be the target of spells or abilities.)
diff --git a/forge-gui/res/cardsfolder/s/skithiryx_the_blight_dragon.txt b/forge-gui/res/cardsfolder/s/skithiryx_the_blight_dragon.txt
index 64369548687..8de22231c51 100644
--- a/forge-gui/res/cardsfolder/s/skithiryx_the_blight_dragon.txt
+++ b/forge-gui/res/cardsfolder/s/skithiryx_the_blight_dragon.txt
@@ -5,6 +5,6 @@ PT:4/4
 K:Flying
 K:Infect
 A:AB$ Regenerate | Cost$ B B | SpellDescription$ Regenerate CARDNAME.
-A:AB$ Pump | Cost$ B | KW$ Haste | SpellDescription$ CARDNAME gains haste until end of turn.
+A:AB$ Pump | Cost$ B | Defined$ Self | KW$ Haste | SpellDescription$ CARDNAME gains haste until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skithiryx_the_blight_dragon.jpg
 Oracle:Flying\nInfect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)\n{B}: Skithiryx, the Blight Dragon gains haste until end of turn.\n{B}{B}: Regenerate Skithiryx.
diff --git a/forge-gui/res/cardsfolder/s/soltari_emissary.txt b/forge-gui/res/cardsfolder/s/soltari_emissary.txt
index dd482dfdef6..5cbc4f8795b 100644
--- a/forge-gui/res/cardsfolder/s/soltari_emissary.txt
+++ b/forge-gui/res/cardsfolder/s/soltari_emissary.txt
@@ -2,6 +2,6 @@ Name:Soltari Emissary
 ManaCost:1 W
 Types:Creature Soltari Soldier
 PT:2/1
-A:AB$ Pump | Cost$ W | KW$ Shadow | SpellDescription$ CARDNAME gains shadow until end of turn.
+A:AB$ Pump | Cost$ W | KW$ Shadow | Defined$ Self | SpellDescription$ CARDNAME gains shadow until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soltari_emissary.jpg
 Oracle:{W}: Soltari Emissary gains shadow until end of turn. (This creature can block or be blocked by only creatures with shadow.)
diff --git a/forge-gui/res/cardsfolder/s/stillmoon_cavalier.txt b/forge-gui/res/cardsfolder/s/stillmoon_cavalier.txt
index fb27c62735a..df5d2f44640 100644
--- a/forge-gui/res/cardsfolder/s/stillmoon_cavalier.txt
+++ b/forge-gui/res/cardsfolder/s/stillmoon_cavalier.txt
@@ -4,8 +4,8 @@ Types:Creature Zombie Knight
 PT:2/1
 K:Protection from white
 K:Protection from black
-A:AB$ Pump | Cost$ WB | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
-A:AB$ Pump | Cost$ WB | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
-A:AB$ Pump | Cost$ WB WB | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
+A:AB$ Pump | Cost$ WB | Defined$ Self | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
+A:AB$ Pump | Cost$ WB | Defined$ Self | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
+A:AB$ Pump | Cost$ WB WB | Defined$ Self | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stillmoon_cavalier.jpg
 Oracle:Protection from white and from black\n{W/B}: Stillmoon Cavalier gains flying until end of turn.\n{W/B}: Stillmoon Cavalier gains first strike until end of turn.\n{W/B}{W/B}: Stillmoon Cavalier gets +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/stonehorn_chanter.txt b/forge-gui/res/cardsfolder/s/stonehorn_chanter.txt
index ce7b0f1976e..6bdf48c2226 100644
--- a/forge-gui/res/cardsfolder/s/stonehorn_chanter.txt
+++ b/forge-gui/res/cardsfolder/s/stonehorn_chanter.txt
@@ -2,6 +2,6 @@ Name:Stonehorn Chanter
 ManaCost:5 W
 Types:Creature Rhino Cleric
 PT:4/4
-A:AB$ Pump | Cost$ 5 W | KW$ Lifelink & Vigilance | SpellDescription$ CARDNAME gains vigilance and lifelink until end of turn.
+A:AB$ Pump | Cost$ 5 W | Defined$ Self | KW$ Lifelink & Vigilance | SpellDescription$ CARDNAME gains vigilance and lifelink until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stonehorn_chanter.jpg
 Oracle:{5}{W}: Stonehorn Chanter gains vigilance and lifelink until end of turn. (Attacking doesn't cause it to tap. Damage dealt by it also causes you to gain that much life.)
diff --git a/forge-gui/res/cardsfolder/s/stream_hopper.txt b/forge-gui/res/cardsfolder/s/stream_hopper.txt
index e0627b6a067..13a2437345f 100644
--- a/forge-gui/res/cardsfolder/s/stream_hopper.txt
+++ b/forge-gui/res/cardsfolder/s/stream_hopper.txt
@@ -2,6 +2,6 @@ Name:Stream Hopper
 ManaCost:UR
 Types:Creature Goblin
 PT:1/1
-A:AB$ Pump | Cost$ UR | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
+A:AB$ Pump | Cost$ UR | Defined$ Self | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stream_hopper.jpg
 Oracle:{U/R}: Stream Hopper gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/stromgald_crusader.txt b/forge-gui/res/cardsfolder/s/stromgald_crusader.txt
index 87ee29aacdd..9fb8f560e41 100644
--- a/forge-gui/res/cardsfolder/s/stromgald_crusader.txt
+++ b/forge-gui/res/cardsfolder/s/stromgald_crusader.txt
@@ -3,7 +3,7 @@ ManaCost:B B
 Types:Creature Zombie Knight
 PT:2/1
 K:Protection from white
-A:AB$ Pump | Cost$ B | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
-A:AB$ Pump | Cost$ B B | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
+A:AB$ Pump | Cost$ B | Defined$ Self | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
+A:AB$ Pump | Cost$ B B | Defined$ Self | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stromgald_crusader.jpg
 Oracle:Protection from white\n{B}: Stromgald Crusader gains flying until end of turn.\n{B}{B}: Stromgald Crusader gets +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sturdy_hatchling.txt b/forge-gui/res/cardsfolder/s/sturdy_hatchling.txt
index b77792fc418..3985cb46d46 100644
--- a/forge-gui/res/cardsfolder/s/sturdy_hatchling.txt
+++ b/forge-gui/res/cardsfolder/s/sturdy_hatchling.txt
@@ -3,7 +3,7 @@ ManaCost:3 GU
 Types:Creature Elemental
 PT:6/6
 K:etbCounter:M1M1:4
-A:AB$ Pump | Cost$ GU | KW$ Shroud | SpellDescription$ CARDNAME gains shroud until end of turn.
+A:AB$ Pump | Cost$ GU | Defined$ Self | KW$ Shroud | SpellDescription$ CARDNAME gains shroud until end of turn.
 T:Mode$ SpellCast | ValidCard$ Card.Green | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ Whenever you cast a green spell, remove a -1/-1 counter from CARDNAME.
 T:Mode$ SpellCast | ValidCard$ Card.Blue | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigRemoveCounter | TriggerDescription$ Whenever you cast a blue spell, remove a -1/-1 counter from CARDNAME.
 SVar:TrigRemoveCounter:AB$ RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ M1M1 | CounterNum$ 1
diff --git a/forge-gui/res/cardsfolder/t/telethopter.txt b/forge-gui/res/cardsfolder/t/telethopter.txt
index 4737631d908..9f89d5c5f50 100644
--- a/forge-gui/res/cardsfolder/t/telethopter.txt
+++ b/forge-gui/res/cardsfolder/t/telethopter.txt
@@ -2,6 +2,6 @@ Name:Telethopter
 ManaCost:4
 Types:Artifact Creature Thopter
 PT:3/1
-A:AB$ Pump | Cost$ tapXType<1/Creature> | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
+A:AB$ Pump | Cost$ tapXType<1/Creature> | Defined$ Self | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/telethopter.jpg
 Oracle:Tap an untapped creature you control: Telethopter gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/thalakos_drifters.txt b/forge-gui/res/cardsfolder/t/thalakos_drifters.txt
index f2fb0903a15..31d95acebf7 100644
--- a/forge-gui/res/cardsfolder/t/thalakos_drifters.txt
+++ b/forge-gui/res/cardsfolder/t/thalakos_drifters.txt
@@ -2,6 +2,6 @@ Name:Thalakos Drifters
 ManaCost:2 U U
 Types:Creature Thalakos
 PT:3/3
-A:AB$ Pump | Cost$ Discard<1/Card> | KW$ Shadow | SpellDescription$ CARDNAME gains shadow until end of turn.
+A:AB$ Pump | Cost$ Discard<1/Card> | Defined$ Self | KW$ Shadow | SpellDescription$ CARDNAME gains shadow until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thalakos_drifters.jpg
 Oracle:Discard a card: Thalakos Drifters gains shadow until end of turn. (This creature can block or be blocked by only creatures with shadow.)
diff --git a/forge-gui/res/cardsfolder/t/thermal_navigator.txt b/forge-gui/res/cardsfolder/t/thermal_navigator.txt
index a0c3f3aed54..ba720ea8a14 100644
--- a/forge-gui/res/cardsfolder/t/thermal_navigator.txt
+++ b/forge-gui/res/cardsfolder/t/thermal_navigator.txt
@@ -2,6 +2,6 @@ Name:Thermal Navigator
 ManaCost:3
 Types:Artifact Creature Construct
 PT:2/2
-A:AB$ Pump | Cost$ Sac<1/Artifact> | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
+A:AB$ Pump | Cost$ Sac<1/Artifact> | Defined$ Self | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thermal_navigator.jpg
 Oracle:Sacrifice an artifact: Thermal Navigator gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/thermopod.txt b/forge-gui/res/cardsfolder/t/thermopod.txt
index b8ae5e690ca..d13d356e8d3 100644
--- a/forge-gui/res/cardsfolder/t/thermopod.txt
+++ b/forge-gui/res/cardsfolder/t/thermopod.txt
@@ -3,7 +3,7 @@ ManaCost:4 R
 Types:Snow Creature Slug
 PT:4/3
 A:AB$ Mana | Cost$ Sac<1/Creature> | Produced$ R | SpellDescription$ Add {R} to your mana pool.
-A:AB$ Pump | Cost$ S | KW$ Haste | SpellDescription$ CARDNAME gains haste until end of turn.
+A:AB$ Pump | Cost$ S | KW$ Haste | Defined$ Self | SpellDescription$ CARDNAME gains haste until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thermopod.jpg
 Oracle:{S}: Thermopod gains haste until end of turn. ({S} can be paid with one mana from a snow permanent.)\nSacrifice a creature: Add {R} to your mana pool.
diff --git a/forge-gui/res/cardsfolder/t/thorn_thrash_viashino.txt b/forge-gui/res/cardsfolder/t/thorn_thrash_viashino.txt
index 7b4c3453193..e66f1484ab5 100644
--- a/forge-gui/res/cardsfolder/t/thorn_thrash_viashino.txt
+++ b/forge-gui/res/cardsfolder/t/thorn_thrash_viashino.txt
@@ -2,7 +2,7 @@ Name:Thorn-Thrash Viashino
 ManaCost:3 R
 Types:Creature Viashino Warrior
 PT:2/2
-A:AB$ Pump | Cost$ G | KW$ Trample | SpellDescription$ CARDNAME gains trample until end of turn.
+A:AB$ Pump | Cost$ G | KW$ Trample | Defined$ Self | SpellDescription$ CARDNAME gains trample until end of turn.
 K:Devour:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thorn_thrash_viashino.jpg
 Oracle:Devour 2 (As this enters the battlefield, you may sacrifice any number of creatures. This creature enters the battlefield with twice that many +1/+1 counters on it.)\n{G}: Thorn-Thrash Viashino gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/thornling.txt b/forge-gui/res/cardsfolder/t/thornling.txt
index e9c2ff315c4..920ff2e3ff8 100644
--- a/forge-gui/res/cardsfolder/t/thornling.txt
+++ b/forge-gui/res/cardsfolder/t/thornling.txt
@@ -2,10 +2,10 @@ Name:Thornling
 ManaCost:3 G G
 Types:Creature Elemental Shapeshifter
 PT:4/4
-A:AB$ Pump | Cost$ G | KW$ Haste | SpellDescription$ CARDNAME gains haste until end of turn.
-A:AB$ Pump | Cost$ G | KW$ Trample | SpellDescription$ CARDNAME gains trample until end of turn.
-A:AB$ Pump | Cost$ G | KW$ Indestructible | SpellDescription$ CARDNAME gains indestructible until end of turn.
-A:AB$ Pump | Cost$ 1 | NumAtt$ +1 | NumDef$ -1 | SpellDescription$ CARDNAME gets +1/-1 until end of turn.
-A:AB$ Pump | Cost$ 1 | NumAtt$ -1 | NumDef$ +1 | SpellDescription$ CARDNAME gets -1/+1 until end of turn.
+A:AB$ Pump | Cost$ G | KW$ Haste | Defined$ Self | SpellDescription$ CARDNAME gains haste until end of turn.
+A:AB$ Pump | Cost$ G | KW$ Trample | Defined$ Self | SpellDescription$ CARDNAME gains trample until end of turn.
+A:AB$ Pump | Cost$ G | KW$ Indestructible | Defined$ Self | SpellDescription$ CARDNAME gains indestructible until end of turn.
+A:AB$ Pump | Cost$ 1 | NumAtt$ +1 | NumDef$ -1 | Defined$ Self | SpellDescription$ CARDNAME gets +1/-1 until end of turn.
+A:AB$ Pump | Cost$ 1 | NumAtt$ -1 | NumDef$ +1 | Defined$ Self | SpellDescription$ CARDNAME gets -1/+1 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thornling.jpg
 Oracle:{G}: Thornling gains haste until end of turn.\n{G}: Thornling gains trample until end of turn.\n{G}: Thornling gains indestructible until end of turn.\n{1}: Thornling gets +1/-1 until end of turn.\n{1}: Thornling gets -1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/thunder_brute.txt b/forge-gui/res/cardsfolder/t/thunder_brute.txt
index 75189672ad8..7093e9ae373 100644
--- a/forge-gui/res/cardsfolder/t/thunder_brute.txt
+++ b/forge-gui/res/cardsfolder/t/thunder_brute.txt
@@ -5,7 +5,7 @@ PT:5/5
 K:Trample
 K:Tribute 3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+notTributed | Execute$ TrigNotTribute | TriggerDescription$ When CARDNAME enters the battlefield, if tribute wasn't paid, it gains haste until end of turn.
-SVar:TrigNotTribute:AB$ Pump | Cost$ 0 | KW$ Haste
+SVar:TrigNotTribute:AB$ Pump | Cost$ 0 | KW$ Haste | Defined$ Self
 SVar:PlayMain1:TRUE
 SVar:TributeAILogic:CanBlockThisTurn
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thunder_brute.jpg
diff --git a/forge-gui/res/cardsfolder/t/tidal_courier.txt b/forge-gui/res/cardsfolder/t/tidal_courier.txt
index 1731d6f988d..be12b1177ab 100644
--- a/forge-gui/res/cardsfolder/t/tidal_courier.txt
+++ b/forge-gui/res/cardsfolder/t/tidal_courier.txt
@@ -4,7 +4,7 @@ Types:Creature Merfolk
 PT:1/2
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, reveal the top four cards of your library. Put all Merfolk cards revealed this way into your hand and the rest on the bottom of your library in any order.
 SVar:TrigDig:AB$Dig | Cost$ 0 | DigNum$ 4 | Reveal$ True | ChangeNum$ All | ChangeValid$ Merfolk
-A:AB$ Pump | Cost$ 3 U | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
+A:AB$ Pump | Cost$ 3 U | Defined$ Self | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tidal_courier.jpg
 Oracle:When Tidal Courier enters the battlefield, reveal the top four cards of your library. Put all Merfolk cards revealed this way into your hand and the rest on the bottom of your library in any order.\n{3}{U}: Tidal Courier gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/titanium_golem.txt b/forge-gui/res/cardsfolder/t/titanium_golem.txt
index dbe71a539cf..2dd1b9d8473 100644
--- a/forge-gui/res/cardsfolder/t/titanium_golem.txt
+++ b/forge-gui/res/cardsfolder/t/titanium_golem.txt
@@ -2,6 +2,6 @@ Name:Titanium Golem
 ManaCost:5
 Types:Artifact Creature Golem
 PT:3/3
-A:AB$ Pump | Cost$ 1 W | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
+A:AB$ Pump | Cost$ 1 W | Defined$ Self | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/titanium_golem.jpg
 Oracle:{1}{W}: Titanium Golem gains first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/towering_thunderfist.txt b/forge-gui/res/cardsfolder/t/towering_thunderfist.txt
index 9bb6bc92429..e0b8873e021 100644
--- a/forge-gui/res/cardsfolder/t/towering_thunderfist.txt
+++ b/forge-gui/res/cardsfolder/t/towering_thunderfist.txt
@@ -2,6 +2,6 @@ Name:Towering Thunderfist
 ManaCost:4 R
 Types:Creature Giant Soldier
 PT:4/4
-A:AB$ Pump | Cost$ W | KW$ Vigilance | SpellDescription$ CARDNAME gains vigilance until end of turn.
+A:AB$ Pump | Cost$ W | Defined$ Self | KW$ Vigilance | SpellDescription$ CARDNAME gains vigilance until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/towering_thunderfist.jpg
 Oracle:{W}: Towering Thunderfist gains vigilance until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/trespasser_il_vec.txt b/forge-gui/res/cardsfolder/t/trespasser_il_vec.txt
index 9d3496c1e38..342509623de 100644
--- a/forge-gui/res/cardsfolder/t/trespasser_il_vec.txt
+++ b/forge-gui/res/cardsfolder/t/trespasser_il_vec.txt
@@ -2,6 +2,6 @@ Name:Trespasser il-Vec
 ManaCost:2 B
 Types:Creature Human Rogue
 PT:3/1
-A:AB$ Pump | Cost$ Discard<1/Card> | KW$ Shadow | SpellDescription$ CARDNAME gains shadow until end of turn.
+A:AB$ Pump | Cost$ Discard<1/Card> | Defined$ Self | KW$ Shadow | SpellDescription$ CARDNAME gains shadow until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/trespasser_il_vec.jpg
 Oracle:Discard a card: Trespasser il-Vec gains shadow until end of turn. (It can block or be blocked by only creatures with shadow.)
diff --git a/forge-gui/res/cardsfolder/t/truefire_paladin.txt b/forge-gui/res/cardsfolder/t/truefire_paladin.txt
index aaa738f3af2..f19c6b37904 100644
--- a/forge-gui/res/cardsfolder/t/truefire_paladin.txt
+++ b/forge-gui/res/cardsfolder/t/truefire_paladin.txt
@@ -3,7 +3,7 @@ ManaCost:R W
 Types:Creature Human Knight
 PT:2/2
 K:Vigilance
-A:AB$ Pump | Cost$ R W | NumAtt$ +2 | SpellDescription$ CARDNAME gets +2/+0 until end of turn.
-A:AB$ Pump | Cost$ R W | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
+A:AB$ Pump | Cost$ R W | Defined$ Self | NumAtt$ +2 | SpellDescription$ CARDNAME gets +2/+0 until end of turn.
+A:AB$ Pump | Cost$ R W | Defined$ Self | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/truefire_paladin.jpg
 Oracle:Vigilance\n{R}{W}: Truefire Paladin gets +2/+0 until end of turn.\n{R}{W}: Truefire Paladin gains first strike until end of turn.