diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index f5372fb6aea..8093fe94781 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -1992,7 +1992,7 @@ public class CardFactoryUtil {
             final Cost cost = new Cost(k[1], false);
             String costDesc = cost.toSimpleString();
 
-            String strTrig = "Mode$ BecomesTarget | ValidSource$ Card.OppCtrl | ValidTarget$ Card.Self "
+            String strTrig = "Mode$ BecomesTarget | ValidSource$ SpellAbility.OppCtrl | ValidTarget$ Card.Self "
                     + " | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ Ward " + costDesc + " ("
                     + inst.getReminderText() + ")";
             String effect = "DB$ Counter | Defined$ TriggeredSourceSA | UnlessCost$ " + k[1]
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java
index 75fed80d6dd..f7ab98eecf8 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java
@@ -55,18 +55,6 @@ public class TriggerBecomesTarget extends Trigger {
      * @param runParams*/
     @Override
     public final boolean performTest(final Map<AbilityKey, Object> runParams) {
-        if (hasParam("SourceType")) {
-            final SpellAbility sa = (SpellAbility) runParams.get(AbilityKey.SourceSA);
-            if (getParam("SourceType").equalsIgnoreCase("spell")) {
-                if (!sa.isSpell()) {
-                    return false;
-                }
-            } else if (getParam("SourceType").equalsIgnoreCase("ability")) {
-                if (!sa.isAbility()) {
-                    return false;
-                }
-            }
-        }
         if (hasParam("ValidSource")) {
             SpellAbility source = (SpellAbility) runParams.get(AbilityKey.SourceSA);
             if (source == null) {
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTargetOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTargetOnce.java
index 1db1420eb9d..d74b87dfa45 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTargetOnce.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTargetOnce.java
@@ -55,7 +55,7 @@ public class TriggerBecomesTargetOnce extends Trigger {
      * @param runParams*/
     @Override
     public final boolean performTest(final Map<AbilityKey, Object> runParams) {
-        if (!matchesValidParam("ValidSource", ((SpellAbility) runParams.get(AbilityKey.SourceSA)).getHostCard())) {
+        if (!matchesValidParam("ValidSource", runParams.get(AbilityKey.SourceSA))) {
             return false;
         }
         if (!matchesValidParam("ValidTarget", runParams.get(AbilityKey.Targets))) {
diff --git a/forge-gui/res/cardsfolder/a/amulet_of_safekeeping.txt b/forge-gui/res/cardsfolder/a/amulet_of_safekeeping.txt
index e409dc8f72a..7249bb99807 100644
--- a/forge-gui/res/cardsfolder/a/amulet_of_safekeeping.txt
+++ b/forge-gui/res/cardsfolder/a/amulet_of_safekeeping.txt
@@ -1,7 +1,7 @@
 Name:Amulet of Safekeeping
 ManaCost:2
 Types:Artifact
-T:Mode$ BecomesTarget | ValidSource$ Card.OppCtrl | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever you become the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {1}.
+T:Mode$ BecomesTarget | ValidSource$ SpellAbility.OppCtrl | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever you become the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {1}.
 SVar:TrigCounter:DB$ Counter | Defined$ TriggeredSourceSA | UnlessCost$ 1 | UnlessPayer$ TriggeredSourceSAController
 S:Mode$ Continuous | Affected$ Creature.token | AddPower$ -1 | Description$ Creature tokens get -1/-0.
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/a/ashenmoor_liege.txt b/forge-gui/res/cardsfolder/a/ashenmoor_liege.txt
index 287e2bab7c1..23fb162710b 100644
--- a/forge-gui/res/cardsfolder/a/ashenmoor_liege.txt
+++ b/forge-gui/res/cardsfolder/a/ashenmoor_liege.txt
@@ -4,7 +4,7 @@ Types:Creature Elemental Knight
 PT:4/1
 S:Mode$ Continuous | Affected$ Creature.Red+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other red creatures you control get +1/+1.
 S:Mode$ Continuous | Affected$ Creature.Black+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other black creatures you control get +1/+1.
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Card.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability an opponent controls, that player loses 4 life.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability an opponent controls, that player loses 4 life.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredSourceController | LifeAmount$ 4
 SVar:PlayMain1:TRUE
 Oracle:Other black creatures you control get +1/+1.\nOther red creatures you control get +1/+1.\nWhenever Ashenmoor Liege becomes the target of a spell or ability an opponent controls, that player loses 4 life.
diff --git a/forge-gui/res/cardsfolder/b/battle_mammoth.txt b/forge-gui/res/cardsfolder/b/battle_mammoth.txt
index 9980d45bc53..b5eeea96998 100644
--- a/forge-gui/res/cardsfolder/b/battle_mammoth.txt
+++ b/forge-gui/res/cardsfolder/b/battle_mammoth.txt
@@ -3,7 +3,7 @@ ManaCost:3 G G
 Types:Creature Elephant
 PT:6/5
 K:Trample
-T:Mode$ BecomesTarget | ValidTarget$ Permanent.YouCtrl+inZoneBattlefield | ValidSource$ Card.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card.
+T:Mode$ BecomesTarget | ValidTarget$ Permanent.YouCtrl+inZoneBattlefield | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 K:Foretell:2 G G
 Oracle:Trample\nWhenever a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card.\nForetell {2}{G}{G} (During your turn, you may pay {2} and exile this card from your hand face down. Cast it on a later turn for its foretell cost.)
diff --git a/forge-gui/res/cardsfolder/b/blanka_ferocious_friend.txt b/forge-gui/res/cardsfolder/b/blanka_ferocious_friend.txt
index 745e0f1f358..f9889aa702c 100644
--- a/forge-gui/res/cardsfolder/b/blanka_ferocious_friend.txt
+++ b/forge-gui/res/cardsfolder/b/blanka_ferocious_friend.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Human Beast Warrior
 PT:5/5
 K:Haste
 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Trample | CheckSVar$ X | SVarCompare$ GE3 | Description$ Rolling Attack — CARDNAME has trample as long as you've cast three or more spells this turn.
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | SourceType$ Spell | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Electric Thunder — Whenever NICKNAME becomes the target of a spell, he gets +2/+2 until end of turn and deals 2 damage to each opponent.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Electric Thunder — Whenever NICKNAME becomes the target of a spell, he gets +2/+2 until end of turn and deals 2 damage to each opponent.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | NumDef$ +2 | SubAbility$ DBDmg
 SVar:DBDmg:DB$ DealDamage | Defined$ Opponent | NumDmg$ 2
 SVar:X:Count$ThisTurnCast_Card.YouCtrl
diff --git a/forge-gui/res/cardsfolder/b/bolt_bend.txt b/forge-gui/res/cardsfolder/b/bolt_bend.txt
index 97f87c8dbf0..52b9258a0bf 100644
--- a/forge-gui/res/cardsfolder/b/bolt_bend.txt
+++ b/forge-gui/res/cardsfolder/b/bolt_bend.txt
@@ -2,6 +2,6 @@ Name:Bolt Bend
 ManaCost:3 R
 Types:Instant
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 3 | EffectZone$ All | IsPresent$ Creature.YouCtrl+powerGE4 | Description$ This Spell costs {3} less to cast if you control a creature with power 4 or greater.
-A:SP$ ChangeTargets | TargetType$ SpellAbility.numTargets EQ1 | ValidTgts$ Card | TgtPrompt$ Select target spell or ability with a single target | SpellDescription$ Change the target of target spell or ability with a single target.
+A:SP$ ChangeTargets | TargetType$ SpellAbility.numTargets EQ1 | ValidTgts$ Card,Emblem | TgtPrompt$ Select target spell or ability with a single target | SpellDescription$ Change the target of target spell or ability with a single target.
 AI:RemoveDeck:All
 Oracle:This spell costs {3} less to cast if you control a creature with power 4 or greater.\nChange the target of target spell or ability with a single target.
diff --git a/forge-gui/res/cardsfolder/b/bonecrusher_giant_stomp.txt b/forge-gui/res/cardsfolder/b/bonecrusher_giant_stomp.txt
index 103611ee78a..a788fad0283 100644
--- a/forge-gui/res/cardsfolder/b/bonecrusher_giant_stomp.txt
+++ b/forge-gui/res/cardsfolder/b/bonecrusher_giant_stomp.txt
@@ -2,7 +2,7 @@ Name:Bonecrusher Giant
 ManaCost:2 R
 Types:Creature Giant
 PT:4/3
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | SourceType$ Spell | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ When CARDNAME becomes the target of a spell, CARDNAME deals 2 damage to that spell's controller.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ When CARDNAME becomes the target of a spell, CARDNAME deals 2 damage to that spell's controller.
 SVar:TrigDmg:DB$ DealDamage | Defined$ TriggeredSourceController | NumDmg$ 2
 AlternateMode:Adventure
 Oracle:Whenever Bonecrusher Giant becomes the target of a spell, Bonecrusher Giant deals 2 damage to that spell's controller.
diff --git a/forge-gui/res/cardsfolder/b/brine_comber_brinebound_gift.txt b/forge-gui/res/cardsfolder/b/brine_comber_brinebound_gift.txt
index 08de481bad3..ab042e103d2 100644
--- a/forge-gui/res/cardsfolder/b/brine_comber_brinebound_gift.txt
+++ b/forge-gui/res/cardsfolder/b/brine_comber_brinebound_gift.txt
@@ -3,7 +3,7 @@ ManaCost:1 W U
 Types:Creature Spirit
 PT:1/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield or becomes the target of an Aura spell, create a 1/1 white Spirit creature token with flying.
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Aura | SourceType$ Spell | TriggerZones$ Battlefield | Execute$ TrigToken | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or becomes the target of an Aura spell, create a 1/1 white Spirit creature token with flying.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell.Aura | TriggerZones$ Battlefield | Execute$ TrigToken | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or becomes the target of an Aura spell, create a 1/1 white Spirit creature token with flying.
 SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_spirit_flying
 K:Disturb:W U
 SVar:EnchantMe:Multiple
@@ -21,7 +21,7 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield or enchanted creature becomes the target of an Aura spell, create a 1/1 white Spirit creature token with flying.
-T:Mode$ BecomesTarget | ValidTarget$ Creature.EnchantedBy | ValidSource$ Aura | SourceType$ Spell | TriggerZones$ Battlefield | Execute$ TrigToken | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or enchanted creature becomes the target of an Aura spell, create a 1/1 white Spirit creature token with flying.
+T:Mode$ BecomesTarget | ValidTarget$ Creature.EnchantedBy | ValidSource$ Spell.Aura | TriggerZones$ Battlefield | Execute$ TrigToken | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or enchanted creature becomes the target of an Aura spell, create a 1/1 white Spirit creature token with flying.
 SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_spirit_flying
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Graveyard | ReplaceWith$ Exile | Description$ If CARDNAME would be put into a graveyard from anywhere, exile it instead.
 SVar:Exile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard
diff --git a/forge-gui/res/cardsfolder/c/cloud_cover.txt b/forge-gui/res/cardsfolder/c/cloud_cover.txt
index ccad641778f..d89e5c5b275 100644
--- a/forge-gui/res/cardsfolder/c/cloud_cover.txt
+++ b/forge-gui/res/cardsfolder/c/cloud_cover.txt
@@ -1,6 +1,6 @@
 Name:Cloud Cover
 ManaCost:2 W U
 Types:Enchantment
-T:Mode$ BecomesTarget | ValidTarget$ Permanent.YouCtrl+Other+inZoneBattlefield | ValidSource$ Card.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigBounce | OptionalDecider$ You | TriggerDescription$ Whenever another permanent you control becomes the target of a spell or ability an opponent controls, you may return that permanent to its owner's hand.
+T:Mode$ BecomesTarget | ValidTarget$ Permanent.YouCtrl+Other+inZoneBattlefield | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigBounce | OptionalDecider$ You | TriggerDescription$ Whenever another permanent you control becomes the target of a spell or ability an opponent controls, you may return that permanent to its owner's hand.
 SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Defined$ TriggeredTargetLKICopy
 Oracle:Whenever another permanent you control becomes the target of a spell or ability an opponent controls, you may return that permanent to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/d/deflecting_swat.txt b/forge-gui/res/cardsfolder/d/deflecting_swat.txt
index e82ca908e3b..00b217bc019 100644
--- a/forge-gui/res/cardsfolder/d/deflecting_swat.txt
+++ b/forge-gui/res/cardsfolder/d/deflecting_swat.txt
@@ -2,5 +2,5 @@ Name:Deflecting Swat
 ManaCost:2 R
 Types:Instant
 S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
-A:SP$ ChangeTargets | Cost$ 2 R | TargetType$ Spell,Activated,Triggered | Optional$ True | ValidTgts$ Card | TgtPrompt$ Select target spell or ability | SpellDescription$ You may choose new targets for target spell or ability.
+A:SP$ ChangeTargets | Cost$ 2 R | TargetType$ Spell,Activated,Triggered | Optional$ True | ValidTgts$ Card,Emblem | TgtPrompt$ Select target spell or ability | SpellDescription$ You may choose new targets for target spell or ability.
 Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nYou may choose new targets for target spell or ability.
diff --git a/forge-gui/res/cardsfolder/d/departed_deckhand.txt b/forge-gui/res/cardsfolder/d/departed_deckhand.txt
index 61858e5af52..6b9602da876 100644
--- a/forge-gui/res/cardsfolder/d/departed_deckhand.txt
+++ b/forge-gui/res/cardsfolder/d/departed_deckhand.txt
@@ -2,7 +2,7 @@ Name:Departed Deckhand
 ManaCost:1 U
 Types:Creature Spirit Pirate
 PT:2/2
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | SourceType$ Spell | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When CARDNAME becomes the target of a spell, sacrifice it.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When CARDNAME becomes the target of a spell, sacrifice it.
 SVar:TrigSac:DB$ Sacrifice | ValidCard$ Card.Self
 S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | ValidBlocker$ Creature.nonSpirit | Description$ CARDNAME can't be blocked except by Spirits.
 A:AB$ Effect | Cost$ 3 U | ValidTgts$ Creature.YouCtrl+Other | TgtPrompt$ Select another target creature you control | RememberObjects$ Targeted | Name$ Departed Deckhand Effect | StaticAbilities$ EffModeCantBlockBy | SpellDescription$ Another target creature you control can't be blocked this turn except by Spirits.
diff --git a/forge-gui/res/cardsfolder/d/diffusion_sliver.txt b/forge-gui/res/cardsfolder/d/diffusion_sliver.txt
index a4321ce21fd..9b4f55b8bbe 100644
--- a/forge-gui/res/cardsfolder/d/diffusion_sliver.txt
+++ b/forge-gui/res/cardsfolder/d/diffusion_sliver.txt
@@ -2,7 +2,7 @@ Name:Diffusion Sliver
 ManaCost:1 U
 Types:Creature Sliver
 PT:1/1
-T:Mode$ BecomesTarget | ValidSource$ Card.OppCtrl | ValidTarget$ Creature.Sliver+YouCtrl+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever a Sliver creature you control becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {2}.
+T:Mode$ BecomesTarget | ValidSource$ SpellAbility.OppCtrl | ValidTarget$ Creature.Sliver+YouCtrl+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever a Sliver creature you control becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {2}.
 SVar:TrigCounter:DB$ Counter | Defined$ TriggeredSourceSA | UnlessCost$ 2 | UnlessPayer$ TriggeredSourceSAController
 SVar:PlayMain1:TRUE
 Oracle:Whenever a Sliver creature you control becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {2}.
diff --git a/forge-gui/res/cardsfolder/d/diplomatic_escort.txt b/forge-gui/res/cardsfolder/d/diplomatic_escort.txt
index 17465c791e6..dab2737163b 100644
--- a/forge-gui/res/cardsfolder/d/diplomatic_escort.txt
+++ b/forge-gui/res/cardsfolder/d/diplomatic_escort.txt
@@ -2,5 +2,5 @@ Name:Diplomatic Escort
 ManaCost:1 U
 Types:Creature Human Spellshaper
 PT:1/1
-A:AB$ Counter | Cost$ U T Discard<1/Card> | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card | TargetValidTargeting$ Creature.inZoneBattlefield | SpellDescription$ Counter target spell or ability that targets a creature.
+A:AB$ Counter | Cost$ U T Discard<1/Card> | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card,Emblem | TargetValidTargeting$ Creature.inZoneBattlefield | SpellDescription$ Counter target spell or ability that targets a creature.
 Oracle:{U}, {T}, Discard a card: Counter target spell or ability that targets a creature.
diff --git a/forge-gui/res/cardsfolder/d/dormant_gomazoa.txt b/forge-gui/res/cardsfolder/d/dormant_gomazoa.txt
index f87099e341f..e1becd177c0 100644
--- a/forge-gui/res/cardsfolder/d/dormant_gomazoa.txt
+++ b/forge-gui/res/cardsfolder/d/dormant_gomazoa.txt
@@ -5,6 +5,6 @@ PT:5/5
 K:Flying
 K:CARDNAME enters the battlefield tapped.
 K:CARDNAME doesn't untap during your untap step.
-T:Mode$ BecomesTarget | ValidTarget$ You | SourceType$ Spell | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ Whenever you become the target of a spell, you may untap CARDNAME.
+T:Mode$ BecomesTarget | ValidTarget$ You | ValidSource$ Spell | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigUntap | TriggerDescription$ Whenever you become the target of a spell, you may untap CARDNAME.
 SVar:TrigUntap:DB$ Untap | Defined$ Self
 Oracle:Flying\nDormant Gomazoa enters the battlefield tapped.\nDormant Gomazoa doesn't untap during your untap step.\nWhenever you become the target of a spell, you may untap Dormant Gomazoa.
diff --git a/forge-gui/res/cardsfolder/d/dream_strix.txt b/forge-gui/res/cardsfolder/d/dream_strix.txt
index 080a792b01f..4a630e4c481 100644
--- a/forge-gui/res/cardsfolder/d/dream_strix.txt
+++ b/forge-gui/res/cardsfolder/d/dream_strix.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Bird Illusion
 PT:3/2
 K:Flying
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | SourceType$ Spell | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When CARDNAME becomes the target of a spell, sacrifice it.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When CARDNAME becomes the target of a spell, sacrifice it.
 SVar:TrigSac:DB$ Sacrifice | ValidCard$ Card.Self
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLearn | TriggerDescription$ When CARDNAME dies, learn. (You may reveal a Lesson card you own from outside the game and put it into your hand, or discard a card to draw a card.)
 SVar:TrigLearn:DB$ Learn
diff --git a/forge-gui/res/cardsfolder/e/emissary_of_grudges.txt b/forge-gui/res/cardsfolder/e/emissary_of_grudges.txt
index bf2b642de5f..b42af744b66 100644
--- a/forge-gui/res/cardsfolder/e/emissary_of_grudges.txt
+++ b/forge-gui/res/cardsfolder/e/emissary_of_grudges.txt
@@ -6,5 +6,5 @@ K:Flying
 K:Haste
 K:ETBReplacement:Other:ChooseP
 SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent | Secretly$ True | SpellDescription$ As CARDNAME enters the battlefield, secretly choose an opponent.
-A:AB$ ChangeTargets | Cost$ RevealChosenPlayer | TargetType$ Spell,Activated,Triggered | ValidTgts$ Card | ConditionTargetValidTargeting$ Permanent.YouCtrl+inZoneBattlefield,You | ConditionPlayerDefined$ TargetedController | ConditionPlayerContains$ Player.Chosen | GameActivationLimit$ 1 | SpellDescription$ Choose new targets for target spell or ability if it's controlled by the chosen player and if it targets you or a permanent you control. Activate only once.
+A:AB$ ChangeTargets | Cost$ RevealChosenPlayer | TargetType$ Spell,Activated,Triggered | ValidTgts$ Card,Emblem | ConditionTargetValidTargeting$ Permanent.YouCtrl+inZoneBattlefield,You | ConditionPlayerDefined$ TargetedController | ConditionPlayerContains$ Player.Chosen | GameActivationLimit$ 1 | SpellDescription$ Choose new targets for target spell or ability if it's controlled by the chosen player and if it targets you or a permanent you control. Activate only once.
 Oracle:Flying, haste\nAs Emissary of Grudges enters the battlefield, secretly choose an opponent.\nReveal the player you chose: Choose new targets for target spell or ability if it's controlled by the chosen player and if it targets you or a permanent you control. Activate only once.
diff --git a/forge-gui/res/cardsfolder/e/eternal_scourge.txt b/forge-gui/res/cardsfolder/e/eternal_scourge.txt
index 304ddb41f87..22bb825cf49 100644
--- a/forge-gui/res/cardsfolder/e/eternal_scourge.txt
+++ b/forge-gui/res/cardsfolder/e/eternal_scourge.txt
@@ -3,6 +3,6 @@ ManaCost:3
 Types:Creature Eldrazi Horror
 PT:3/3
 S:Mode$ Continuous | Affected$ Card.Self | MayPlay$ True | AffectedZone$ Exile | EffectZone$ Exile | Description$ You may cast CARDNAME from exile.
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Card.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME becomes the target of a spell or ability an opponent controls, exile CARDNAME.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME becomes the target of a spell or ability an opponent controls, exile CARDNAME.
 SVar:TrigChangeZone:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile
 Oracle:You may cast Eternal Scourge from exile.\nWhen Eternal Scourge becomes the target of a spell or ability an opponent controls, exile Eternal Scourge.
diff --git a/forge-gui/res/cardsfolder/f/fblthp_the_lost.txt b/forge-gui/res/cardsfolder/f/fblthp_the_lost.txt
index 3b7de5dafe8..f6e945a9c0b 100644
--- a/forge-gui/res/cardsfolder/f/fblthp_the_lost.txt
+++ b/forge-gui/res/cardsfolder/f/fblthp_the_lost.txt
@@ -7,6 +7,6 @@ SVar:DBDraw:DB$ Draw | NumCards$ DrawNum
 SVar:DrawNum:SVar$LibNum1/LimitMax.2
 SVar:LibNum1:Count$wasCastFromYourLibrary.2.1/Plus.LibNum2
 SVar:LibNum2:TriggeredCardLKI$Valid Card.inZoneLibrary
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | SourceType$ Spell | TriggerZones$ Battlefield | Execute$ TrigShuffle | TriggerDescription$ When CARDNAME becomes the target of a spell, shuffle CARDNAME into its owner's library.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigShuffle | TriggerDescription$ When CARDNAME becomes the target of a spell, shuffle CARDNAME into its owner's library.
 SVar:TrigShuffle:DB$ ChangeZone | Origin$ Battlefield | Destination$ Library | Shuffle$ True | Defined$ Self
 Oracle:When Fblthp, the Lost enters the battlefield, draw a card. If it entered from your library or was cast from your library, draw two cards instead.\nWhen Fblthp becomes the target of a spell, shuffle Fblthp into its owner's library.
diff --git a/forge-gui/res/cardsfolder/f/fey_steed.txt b/forge-gui/res/cardsfolder/f/fey_steed.txt
index b34f6ae2c75..d618949f71c 100644
--- a/forge-gui/res/cardsfolder/f/fey_steed.txt
+++ b/forge-gui/res/cardsfolder/f/fey_steed.txt
@@ -4,7 +4,7 @@ Types:Creature Elk
 PT:4/4
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target attacking creature you control gains indestructible until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl+Other+attacking | TgtPrompt$ Select another target attacking creature you control | KW$ Indestructible
-T:Mode$ BecomesTarget | ValidSource$ Card.OppCtrl | ValidTarget$ Creature.YouCtrl+inZoneBattlefield,Planeswalker.YouCtrl+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever a creature or planeswalker you control becomes the target of a spell or ability an opponent controls, you may draw a card.
+T:Mode$ BecomesTarget | ValidSource$ SpellAbility.OppCtrl | ValidTarget$ Creature.YouCtrl+inZoneBattlefield,Planeswalker.YouCtrl+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever a creature or planeswalker you control becomes the target of a spell or ability an opponent controls, you may draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Defined$ You
 SVar:HasAttackEffect:TRUE
 Oracle:Whenever Fey Steed attacks, another target attacking creature you control gains indestructible until end of turn.\nWhenever a creature or planeswalker you control becomes the target of a spell or ability an opponent controls, you may draw a card.
diff --git a/forge-gui/res/cardsfolder/f/forsaken_wastes.txt b/forge-gui/res/cardsfolder/f/forsaken_wastes.txt
index 7aa5e5dcbc7..701293e98e6 100644
--- a/forge-gui/res/cardsfolder/f/forsaken_wastes.txt
+++ b/forge-gui/res/cardsfolder/f/forsaken_wastes.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:World Enchantment
 S:Mode$ CantGainLife | ValidPlayer$ Player | Description$ Players can't gain life.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, that player loses 1 life.
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | SourceType$ Spell | Execute$ TrigLoseLife5 | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes the target of a spell, that spell's controller loses 5 life.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | Execute$ TrigLoseLife5 | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes the target of a spell, that spell's controller loses 5 life.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredPlayer | LifeAmount$ 1
 SVar:TrigLoseLife5:DB$ LoseLife | Defined$ TriggeredSourceController | LifeAmount$ 5
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/f/frost_titan.txt b/forge-gui/res/cardsfolder/f/frost_titan.txt
index 0c42dc2a641..aaa4f979938 100644
--- a/forge-gui/res/cardsfolder/f/frost_titan.txt
+++ b/forge-gui/res/cardsfolder/f/frost_titan.txt
@@ -2,7 +2,7 @@ Name:Frost Titan
 ManaCost:4 U U
 Types:Creature Giant
 PT:6/6
-T:Mode$ BecomesTarget | ValidSource$ Card.OppCtrl | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {2}.
+T:Mode$ BecomesTarget | ValidSource$ SpellAbility.OppCtrl | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {2}.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, tap target permanent. It doesn't untap during its controller's next untap step.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, tap target permanent. It doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Permanent | TgtPrompt$ Choose target permanent. | SubAbility$ DBPump
diff --git a/forge-gui/res/cardsfolder/f/fugitive_druid.txt b/forge-gui/res/cardsfolder/f/fugitive_druid.txt
index 1e7629ec31c..738878481bd 100644
--- a/forge-gui/res/cardsfolder/f/fugitive_druid.txt
+++ b/forge-gui/res/cardsfolder/f/fugitive_druid.txt
@@ -2,6 +2,6 @@ Name:Fugitive Druid
 ManaCost:3 G
 Types:Creature Human Druid
 PT:3/2
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Aura | SourceType$ Spell | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME becomes the target of an Aura spell, you draw a card.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell.Aura | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME becomes the target of an Aura spell, you draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 Oracle:Whenever Fugitive Druid becomes the target of an Aura spell, you draw a card.
diff --git a/forge-gui/res/cardsfolder/g/gargos_vicious_watcher.txt b/forge-gui/res/cardsfolder/g/gargos_vicious_watcher.txt
index e71ea635db2..39c51a7fbf0 100644
--- a/forge-gui/res/cardsfolder/g/gargos_vicious_watcher.txt
+++ b/forge-gui/res/cardsfolder/g/gargos_vicious_watcher.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Hydra
 PT:8/7
 K:Vigilance
 S:Mode$ ReduceCost | ValidCard$ Card.Hydra | Type$ Spell | Activator$ You | Amount$ 4 | Description$ Hydra spells you cast cost {4} less to cast.
-T:Mode$ BecomesTarget | ValidTarget$ Creature.inZoneBattlefield+YouCtrl | SourceType$ Spell | TriggerZones$ Battlefield | Execute$ DBFight | TriggerDescription$ Whenever a creature you control becomes the target of a spell, CARDNAME fights up to one target creature you don't control.
+T:Mode$ BecomesTarget | ValidTarget$ Creature.inZoneBattlefield+YouCtrl | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ DBFight | TriggerDescription$ Whenever a creature you control becomes the target of a spell, CARDNAME fights up to one target creature you don't control.
 SVar:DBFight:DB$ Fight | Defined$ Self | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Choose target creature you don't control
 SVar:PlayMain1:TRUE
 DeckHints:Type$Hydra
diff --git a/forge-gui/res/cardsfolder/g/goldspan_dragon.txt b/forge-gui/res/cardsfolder/g/goldspan_dragon.txt
index 97c8e7d626e..6048c047a33 100644
--- a/forge-gui/res/cardsfolder/g/goldspan_dragon.txt
+++ b/forge-gui/res/cardsfolder/g/goldspan_dragon.txt
@@ -5,7 +5,7 @@ PT:4/4
 K:Flying
 K:Haste
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME attacks or becomes the target of a spell, create a Treasure token.
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | SourceType$ Spell | TriggerZones$ Battlefield | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or becomes the target of a spell, create a Treasure token.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks or becomes the target of a spell, create a Treasure token.
 SVar:TrigToken:DB$ Token | TokenScript$ c_a_treasure_sac
 S:Mode$ Continuous | Affected$ Card.Treasure+YouCtrl | AddAbility$ Mana | Description$ Treasures you control have "{T}, Sacrifice this artifact: Add two mana of any one color."
 SVar:Mana:AB$ Mana | Cost$ T Sac<1/CARDNAME/this artifact> | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color.
diff --git a/forge-gui/res/cardsfolder/i/illuminator_virtuoso.txt b/forge-gui/res/cardsfolder/i/illuminator_virtuoso.txt
index b544e06096a..8c97b5fdde6 100644
--- a/forge-gui/res/cardsfolder/i/illuminator_virtuoso.txt
+++ b/forge-gui/res/cardsfolder/i/illuminator_virtuoso.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Creature Human Rogue
 PT:1/1
 K:Double Strike
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Card.YouCtrl | SourceType$ Spell | Execute$ TrigConnive | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes the target of a spell you control, it connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell.YouCtrl | Execute$ TrigConnive | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes the target of a spell you control, it connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
 SVar:TrigConnive:DB$ Connive
 DeckHas:Ability$Discard|Counters
 Oracle:Double strike\nWhenever Illuminator Virtuoso becomes the target of a spell you control, it connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
diff --git a/forge-gui/res/cardsfolder/k/kadenas_silencer.txt b/forge-gui/res/cardsfolder/k/kadenas_silencer.txt
index 557294f1c51..d74d2c43f37 100644
--- a/forge-gui/res/cardsfolder/k/kadenas_silencer.txt
+++ b/forge-gui/res/cardsfolder/k/kadenas_silencer.txt
@@ -3,6 +3,6 @@ ManaCost:1 U
 Types:Creature Naga Wizard
 PT:2/1
 T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigCounter | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, counter all abilities your opponents control.
-SVar:TrigCounter:DB$ Counter | AllType$ Activated,Triggered | AllValid$ Card.OppCtrl
+SVar:TrigCounter:DB$ Counter | AllType$ Activated,Triggered | AllValid$ Card.OppCtrl,Emblem.OppCtrl
 K:Megamorph:1 U
 Oracle:When Kadena's Silencer is turned face up, counter all abilities your opponents control.\nMegamorph {1}{U} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its megamorph cost and put a +1/+1 counter on it.)
diff --git a/forge-gui/res/cardsfolder/l/labyrinth_guardian.txt b/forge-gui/res/cardsfolder/l/labyrinth_guardian.txt
index 6644e143a58..106721c5dd8 100644
--- a/forge-gui/res/cardsfolder/l/labyrinth_guardian.txt
+++ b/forge-gui/res/cardsfolder/l/labyrinth_guardian.txt
@@ -2,7 +2,7 @@ Name:Labyrinth Guardian
 ManaCost:1 U
 Types:Creature Illusion Warrior
 PT:2/3
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigSac | SourceType$ Spell | TriggerDescription$ When CARDNAME becomes the target of a spell, sacrifice it.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigSac | ValidSource$ Spell | TriggerDescription$ When CARDNAME becomes the target of a spell, sacrifice it.
 SVar:TrigSac:DB$ Sacrifice | Defined$ Self
 K:Embalm:3 U
 SVar:Targeting:Dies
diff --git a/forge-gui/res/cardsfolder/l/leovold_emissary_of_trest.txt b/forge-gui/res/cardsfolder/l/leovold_emissary_of_trest.txt
index c676f7aadb8..9709913f4f2 100644
--- a/forge-gui/res/cardsfolder/l/leovold_emissary_of_trest.txt
+++ b/forge-gui/res/cardsfolder/l/leovold_emissary_of_trest.txt
@@ -3,6 +3,6 @@ ManaCost:B G U
 Types:Legendary Creature Elf Advisor
 PT:3/3
 S:Mode$ CantDraw | ValidPlayer$ Opponent | DrawLimit$ 1 | Description$ Each opponent can't draw more than one card each turn.
-T:Mode$ BecomesTarget | ValidTarget$ You,Permanent.YouCtrl+inZoneBattlefield | ValidSource$ Card.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever you or a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card.
+T:Mode$ BecomesTarget | ValidTarget$ You,Permanent.YouCtrl+inZoneBattlefield | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever you or a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | SpellDescription$ Draw a card.
 Oracle:Each opponent can't draw more than one card each turn.\nWhenever you or a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card.
diff --git a/forge-gui/res/cardsfolder/l/leyline_of_combustion.txt b/forge-gui/res/cardsfolder/l/leyline_of_combustion.txt
index 736c6d160a3..4677d5d2d87 100644
--- a/forge-gui/res/cardsfolder/l/leyline_of_combustion.txt
+++ b/forge-gui/res/cardsfolder/l/leyline_of_combustion.txt
@@ -3,6 +3,6 @@ ManaCost:2 R R
 Types:Enchantment
 K:MayEffectFromOpeningHand:FromHand
 SVar:FromHand:DB$ ChangeZone | Defined$ Self | Origin$ Hand | Destination$ Battlefield | SpellDescription$ If CARDNAME is in your opening hand, you may begin the game with it on the battlefield.
-T:Mode$ BecomesTargetOnce | ValidTarget$ You,Permanent.YouCtrl+inZoneBattlefield | ValidSource$ Card.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever you and/or at least one permanent you control becomes the target of a spell or ability an opponent controls, CARDNAME deals 2 damage to that player.
+T:Mode$ BecomesTargetOnce | ValidTarget$ You,Permanent.YouCtrl+inZoneBattlefield | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever you and/or at least one permanent you control becomes the target of a spell or ability an opponent controls, CARDNAME deals 2 damage to that player.
 SVar:TrigDmg:DB$ DealDamage | Defined$ TriggeredSourceSAController | NumDmg$ 2
 Oracle:If Leyline of Combustion is in your opening hand, you may begin the game with it on the battlefield.\nWhenever you and/or at least one permanent you control becomes the target of a spell or ability an opponent controls, Leyline of Combustion deals 2 damage to that player.
diff --git a/forge-gui/res/cardsfolder/l/livewire_lash.txt b/forge-gui/res/cardsfolder/l/livewire_lash.txt
index 3cdc35669af..66238ba40a5 100644
--- a/forge-gui/res/cardsfolder/l/livewire_lash.txt
+++ b/forge-gui/res/cardsfolder/l/livewire_lash.txt
@@ -3,6 +3,6 @@ ManaCost:2
 Types:Artifact Equipment
 K:Equip:2
 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ 2 | AddTrigger$ PumpTrigger | AddSVar$ LivewireDamage | Description$ Equipped creature gets +2/+0 and has "Whenever this creature becomes the target of a spell, this creature deals 2 damage to any target."
-SVar:PumpTrigger:Mode$ BecomesTarget | SourceType$ Spell | ValidTarget$ Card.Self | Execute$ LivewireDamage | TriggerDescription$ Whenever this creature becomes the target of a spell, this creature deals 2 damage to any target.
+SVar:PumpTrigger:Mode$ BecomesTarget | ValidSource$ Spell | ValidTarget$ Card.Self | Execute$ LivewireDamage | TriggerDescription$ Whenever this creature becomes the target of a spell, this creature deals 2 damage to any target.
 SVar:LivewireDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2
 Oracle:Equipped creature gets +2/+0 and has "Whenever this creature becomes the target of a spell, this creature deals 2 damage to any target."\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/m/mila_crafty_companion_lukka_wayward_bonder.txt b/forge-gui/res/cardsfolder/m/mila_crafty_companion_lukka_wayward_bonder.txt
index fdc4d92890a..05dc65a259f 100644
--- a/forge-gui/res/cardsfolder/m/mila_crafty_companion_lukka_wayward_bonder.txt
+++ b/forge-gui/res/cardsfolder/m/mila_crafty_companion_lukka_wayward_bonder.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Fox
 PT:2/3
 T:Mode$ AttackersDeclared | AttackedTarget$ Planeswalker.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigWalkerPump | TriggerDescription$ Whenever an opponent attacks one or more planeswalkers you control, put a loyalty counter on each planeswalker you control.
 SVar:TrigWalkerPump:DB$ PutCounterAll | ValidCards$ Planeswalker.YouCtrl | CounterType$ LOYALTY | CounterNum$ 1
-T:Mode$ BecomesTarget | ValidSource$ Card.OppCtrl | ValidTarget$ Permanent.YouCtrl+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card.
+T:Mode$ BecomesTarget | ValidSource$ SpellAbility.OppCtrl | ValidTarget$ Permanent.YouCtrl+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Defined$ You
 AlternateMode:Modal
 Oracle:Whenever an opponent attacks one or more planeswalkers you control, put a loyalty counter on each planeswalker you control.\nWhenever a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card.
diff --git a/forge-gui/res/cardsfolder/m/mirrorshell_crab.txt b/forge-gui/res/cardsfolder/m/mirrorshell_crab.txt
index 1e7c64adf96..2a306398e9c 100644
--- a/forge-gui/res/cardsfolder/m/mirrorshell_crab.txt
+++ b/forge-gui/res/cardsfolder/m/mirrorshell_crab.txt
@@ -3,6 +3,6 @@ ManaCost:5 U U
 Types:Artifact Creature Crab
 PT:5/7
 K:Ward:3
-A:AB$ Counter | Cost$ 2 U Discard<1/CARDNAME> | TargetType$ Spell,Activated,Triggered | ValidTgts$ Card | UnlessCost$ 3 | ActivationZone$ Hand | PrecostDesc$ Channel — | TgtPrompt$ Select target spell or ability | SpellDescription$ Counter target spell or ability unless its controller pays {3}.
+A:AB$ Counter | Cost$ 2 U Discard<1/CARDNAME> | TargetType$ Spell,Activated,Triggered | ValidTgts$ Card,Emblem | UnlessCost$ 3 | ActivationZone$ Hand | PrecostDesc$ Channel — | TgtPrompt$ Select target spell or ability | SpellDescription$ Counter target spell or ability unless its controller pays {3}.
 DeckHas:Ability$Discard
 Oracle:Ward {3} (Whenever this permanent becomes the target of a spell or ability an opponent controls, counter it unless that player pays {3}.)\nChannel - {2}{U}, Discard Mirrorshell Crab: Counter target spell or ability unless its controller pays {3}.
diff --git a/forge-gui/res/cardsfolder/m/mizzium_meddler.txt b/forge-gui/res/cardsfolder/m/mizzium_meddler.txt
index 41a9ca7dc1b..c55eab915c0 100644
--- a/forge-gui/res/cardsfolder/m/mizzium_meddler.txt
+++ b/forge-gui/res/cardsfolder/m/mizzium_meddler.txt
@@ -4,5 +4,5 @@ Types:Creature Vedalken Wizard
 PT:1/4
 K:Flash
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may change a target of target spell or ability to CARDNAME.
-SVar:TrigChange:DB$ ChangeTargets | TargetType$ Spell,Activated,Triggered | ValidTgts$ Card | DefinedMagnet$ Self | ChangeSingleTarget$ True
+SVar:TrigChange:DB$ ChangeTargets | TargetType$ Spell,Activated,Triggered | ValidTgts$ Card,Emblem | DefinedMagnet$ Self | ChangeSingleTarget$ True
 Oracle:Flash (You may cast this spell any time you could cast an instant.)\nWhen Mizzium Meddler enters the battlefield, you may change a target of target spell or ability to Mizzium Meddler.
diff --git a/forge-gui/res/cardsfolder/m/mossdog.txt b/forge-gui/res/cardsfolder/m/mossdog.txt
index 5d04dc74bf6..48763327a6f 100644
--- a/forge-gui/res/cardsfolder/m/mossdog.txt
+++ b/forge-gui/res/cardsfolder/m/mossdog.txt
@@ -2,6 +2,6 @@ Name:Mossdog
 ManaCost:G
 Types:Creature Plant Dog
 PT:1/1
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Card.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability an opponent controls, put a +1/+1 counter on CARDNAME.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability an opponent controls, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterNum$ 1 | CounterType$ P1P1
 Oracle:Whenever Mossdog becomes the target of a spell or ability an opponent controls, put a +1/+1 counter on Mossdog.
diff --git a/forge-gui/res/cardsfolder/m/myriad_construct.txt b/forge-gui/res/cardsfolder/m/myriad_construct.txt
index 0cbb9ab73b0..9da3e9d8d6d 100644
--- a/forge-gui/res/cardsfolder/m/myriad_construct.txt
+++ b/forge-gui/res/cardsfolder/m/myriad_construct.txt
@@ -8,7 +8,7 @@ SVar:DBPutCounter:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ P1P1
 SVar:DBMoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:X:Count$Valid Land.nonBasic+OppCtrl
 SVar:NeedsToPlayKicked:Land.nonBasic+OppCtrl
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | SourceType$ Spell | Execute$ TrigSac | TriggerDescription$ When CARDNAME becomes the target of a spell, sacrifice it and create a number of 1/1 colorless Construct artifact creature tokens equal to its power.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | ValidSource$ Spell | Execute$ TrigSac | TriggerDescription$ When CARDNAME becomes the target of a spell, sacrifice it and create a number of 1/1 colorless Construct artifact creature tokens equal to its power.
 SVar:TrigSac:DB$ Destroy | Defined$ Self | Sacrifice$ True | RememberLKI$ True | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenAmount$ Y | TokenScript$ c_1_1_a_construct | TokenOwner$ You | SubAbility$ DBCleanup
 SVar:Y:RememberedLKI$CardPower
diff --git a/forge-gui/res/cardsfolder/n/not_of_this_world.txt b/forge-gui/res/cardsfolder/n/not_of_this_world.txt
index 14ace5febf4..708e5f41d84 100644
--- a/forge-gui/res/cardsfolder/n/not_of_this_world.txt
+++ b/forge-gui/res/cardsfolder/n/not_of_this_world.txt
@@ -2,7 +2,7 @@ Name:Not of This World
 ManaCost:7
 Types:Tribal Instant Eldrazi
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ CostReduction | Relative$ True | EffectZone$ All | Description$ This spell costs {7} less to cast if it targets a spell or ability that targets a creature you control with power 7 or greater.
-A:SP$ Counter | Cost$ 7 | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability that targets a permanent you control | ValidTgts$ Card | TargetValidTargeting$ Permanent.YouCtrl+inZoneBattlefield | SpellDescription$ Counter target spell or ability that targets a permanent you control.
+A:SP$ Counter | Cost$ 7 | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability that targets a permanent you control | ValidTgts$ Card,Emblem | TargetValidTargeting$ Permanent.YouCtrl+inZoneBattlefield | SpellDescription$ Counter target spell or ability that targets a permanent you control.
 SVar:CostReduction:Count$Compare CheckTgt GE1.7.0
 SVar:CheckTgt:TargetedByTarget$Valid Card.powerGE7+YouCtrl
 Oracle:Counter target spell or ability that targets a permanent you control.\nThis spell costs {7} less to cast if it targets a spell or ability that targets a creature you control with power 7 or greater.
diff --git a/forge-gui/res/cardsfolder/o/overcharged_amalgam.txt b/forge-gui/res/cardsfolder/o/overcharged_amalgam.txt
index aedb9b1edd8..3dca35338f3 100644
--- a/forge-gui/res/cardsfolder/o/overcharged_amalgam.txt
+++ b/forge-gui/res/cardsfolder/o/overcharged_amalgam.txt
@@ -6,7 +6,7 @@ K:Flash
 K:Flying
 K:Exploit
 T:Mode$ Exploited | ValidCard$ Creature | ValidSource$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ When CARDNAME exploits a creature, counter target spell, activated ability, or triggered ability.
-SVar:TrigCounter:DB$ Counter | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card | SpellDescription$ Counter target spell, activated ability, or triggered ability.
+SVar:TrigCounter:DB$ Counter | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card,Emblem | SpellDescription$ Counter target spell, activated ability, or triggered ability.
 AI:RemoveDeck:All
 DeckHas:Ability$Sacrifice
 Oracle:Flash\nFlying\nExploit (When this creature enters the battlefield, you may sacrifice a creature.)\nWhen Overcharged Amalgam exploits a creature, counter target spell, activated ability, or triggered ability.
diff --git a/forge-gui/res/cardsfolder/p/parnesse_the_subtle_brush.txt b/forge-gui/res/cardsfolder/p/parnesse_the_subtle_brush.txt
index d2637234e69..96ac64d310c 100644
--- a/forge-gui/res/cardsfolder/p/parnesse_the_subtle_brush.txt
+++ b/forge-gui/res/cardsfolder/p/parnesse_the_subtle_brush.txt
@@ -2,7 +2,7 @@ Name:Parnesse, the Subtle Brush
 ManaCost:2 U B R
 Types:Legendary Creature Vampire Wizard
 PT:4/4
-T:Mode$ BecomesTarget | ValidTarget$ You,Permanent.YouCtrl+inZoneBattlefield | ValidSource$ Card.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever you or a permanent you control becomes the target of a spell or ability an opponent controls, counter that spell or ability unless that player pays 4 life.
+T:Mode$ BecomesTarget | ValidTarget$ You,Permanent.YouCtrl+inZoneBattlefield | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever you or a permanent you control becomes the target of a spell or ability an opponent controls, counter that spell or ability unless that player pays 4 life.
 SVar:TrigCounter:DB$ Counter | Defined$ TriggeredSourceSA | UnlessCost$ PayLife<4> | UnlessPayer$ TriggeredSourceSAController
 T:Mode$ SpellCopy | ValidActivatingPlayer$ You | NoResolvingCheck$ True | TriggerZones$ Battlefield | Execute$ TrigTarget | TriggerDescription$ Whenever you copy a spell, up to one target opponent may also copy that spell. They may choose new targets for that copy.
 SVar:TrigTarget:DB$ Pump | ValidTgts$ Opponent | SubAbility$ DBCopy
diff --git a/forge-gui/res/cardsfolder/r/rayne_academy_chancellor.txt b/forge-gui/res/cardsfolder/r/rayne_academy_chancellor.txt
index 787d02f91d2..e5527a0f456 100644
--- a/forge-gui/res/cardsfolder/r/rayne_academy_chancellor.txt
+++ b/forge-gui/res/cardsfolder/r/rayne_academy_chancellor.txt
@@ -2,7 +2,7 @@ Name:Rayne, Academy Chancellor
 ManaCost:2 U
 Types:Legendary Creature Human Wizard
 PT:1/1
-T:Mode$ BecomesTarget | ValidTarget$ You,Permanent.YouCtrl+inZoneBattlefield | ValidSource$ Card.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever you or a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card. You may draw an additional card if CARDNAME is enchanted.
+T:Mode$ BecomesTarget | ValidTarget$ You,Permanent.YouCtrl+inZoneBattlefield | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever you or a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card. You may draw an additional card if CARDNAME is enchanted.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | SubAbility$ TrigAddDraw | SpellDescription$ Draw a card.
 SVar:TrigAddDraw:DB$ Draw | NumCards$ 1 | ConditionPresent$ Card.Self+enchanted | ConditionCompare$ GE1 | OptionalDecider$ You | SpellDescription$ Draw an additional card if CARDNAME is enchanted.
 SVar:EnchantMe:Once
diff --git a/forge-gui/res/cardsfolder/r/reality_smasher.txt b/forge-gui/res/cardsfolder/r/reality_smasher.txt
index 07683aa81bf..eeb5b61560a 100644
--- a/forge-gui/res/cardsfolder/r/reality_smasher.txt
+++ b/forge-gui/res/cardsfolder/r/reality_smasher.txt
@@ -4,7 +4,7 @@ Types:Creature Eldrazi
 PT:5/5
 K:Trample
 K:Haste
-T:Mode$ BecomesTarget | ValidSource$ Card.OppCtrl | SourceType$ Spell | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever CARDNAME becomes the target of a spell an opponent controls, counter that spell unless its controller discards a card.
+T:Mode$ BecomesTarget | ValidSource$ Spell.OppCtrl | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever CARDNAME becomes the target of a spell an opponent controls, counter that spell unless its controller discards a card.
 SVar:TrigCounter:DB$ Counter | Defined$ TriggeredSourceSA | UnlessCost$ Discard<1/Card> | UnlessPayer$ TriggeredSourceSAController
 DeckNeeds:Ability$Mana.Colorless
 Oracle:({C} represents colorless mana.)\nTrample, haste\nWhenever Reality Smasher becomes the target of a spell an opponent controls, counter that spell unless its controller discards a card.
diff --git a/forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt b/forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt
index 9319d9462d3..65b60df9d14 100644
--- a/forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt
+++ b/forge-gui/res/cardsfolder/r/reidane_god_of_the_worthy_valkmira_protectors_shield.txt
@@ -17,6 +17,6 @@ ManaCost:3 W
 Types:Legendary Artifact
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card.OppCtrl,Emblem.OppCtrl | ValidTarget$ You,Permanent.YouCtrl | ReplaceWith$ DBReplace | PreventionEffect$ True | Description$ If a source an opponent controls would deal damage to you or a permanent you control, prevent 1 of that damage.
 SVar:DBReplace:DB$ ReplaceDamage | Amount$ 1
-T:Mode$ BecomesTarget | ValidSource$ Card.OppCtrl | ValidTarget$ You,Permanent.YouCtrl+Other+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever you or another permanent you control becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {1}.
+T:Mode$ BecomesTarget | ValidSource$ SpellAbility.OppCtrl | ValidTarget$ You,Permanent.YouCtrl+Other+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever you or another permanent you control becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {1}.
 SVar:TrigCounter:DB$ Counter | Defined$ TriggeredSourceSA | UnlessCost$ 1 | UnlessPayer$ TriggeredSourceSAController
 Oracle:If a source an opponent controls would deal damage to you or a permanent you control, prevent 1 of that damage.\nWhenever you or another permanent you control becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {1}.
diff --git a/forge-gui/res/cardsfolder/r/repudiate_replicate.txt b/forge-gui/res/cardsfolder/r/repudiate_replicate.txt
index 582a4a0fe52..94d4425590c 100644
--- a/forge-gui/res/cardsfolder/r/repudiate_replicate.txt
+++ b/forge-gui/res/cardsfolder/r/repudiate_replicate.txt
@@ -1,7 +1,7 @@
 Name:Repudiate
 ManaCost:GU GU
 Types:Instant
-A:SP$ Counter | Cost$ GU GU | TgtPrompt$ Select target Activated or Triggered Ability | ValidTgts$ Card | TargetType$ Activated,Triggered | SpellDescription$ Counter target activated or triggered ability.
+A:SP$ Counter | Cost$ GU GU | TgtPrompt$ Select target Activated or Triggered Ability | ValidTgts$ Card,Emblem | TargetType$ Activated,Triggered | SpellDescription$ Counter target activated or triggered ability.
 AI:RemoveDeck:All
 AlternateMode:Split
 Oracle:Counter target activated or triggered ability. (Mana abilities can't be targeted.)
diff --git a/forge-gui/res/cardsfolder/s/scalelord_reckoner.txt b/forge-gui/res/cardsfolder/s/scalelord_reckoner.txt
index e6f517c590c..0ca82ee29bb 100644
--- a/forge-gui/res/cardsfolder/s/scalelord_reckoner.txt
+++ b/forge-gui/res/cardsfolder/s/scalelord_reckoner.txt
@@ -3,7 +3,7 @@ ManaCost:3 W W
 Types:Creature Dragon
 PT:4/4
 K:Flying
-T:Mode$ BecomesTarget | ValidTarget$ Dragon.inZoneBattlefield+YouCtrl | ValidSource$ Card.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever a Dragon you control becomes the target of a spell or ability an opponent controls, destroy target nonland permanent that player controls.
+T:Mode$ BecomesTarget | ValidTarget$ Dragon.inZoneBattlefield+YouCtrl | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever a Dragon you control becomes the target of a spell or ability an opponent controls, destroy target nonland permanent that player controls.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Permanent.nonLand | TargetsWithDefinedController$ TriggeredSourceController | TgtPrompt$ Select target nonland permanent that player controls.
 DeckHints:Type$Dragon
 Oracle:Flying\nWhenever a Dragon you control becomes the target of a spell or ability an opponent controls, destroy target nonland permanent that player controls.
diff --git a/forge-gui/res/cardsfolder/s/shapers_sanctuary.txt b/forge-gui/res/cardsfolder/s/shapers_sanctuary.txt
index de3b6acda86..e40b34c0127 100644
--- a/forge-gui/res/cardsfolder/s/shapers_sanctuary.txt
+++ b/forge-gui/res/cardsfolder/s/shapers_sanctuary.txt
@@ -1,6 +1,6 @@
 Name:Shapers' Sanctuary
 ManaCost:G
 Types:Enchantment
-T:Mode$ BecomesTarget | ValidSource$ Card.OppCtrl | ValidTarget$ Creature.YouCtrl+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever a creature you control becomes the target of a spell or ability an opponent controls, you may draw a card.
+T:Mode$ BecomesTarget | ValidSource$ SpellAbility.OppCtrl | ValidTarget$ Creature.YouCtrl+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Whenever a creature you control becomes the target of a spell or ability an opponent controls, you may draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1 | Defined$ You
 Oracle:Whenever a creature you control becomes the target of a spell or ability an opponent controls, you may draw a card.
diff --git a/forge-gui/res/cardsfolder/s/shield_mare.txt b/forge-gui/res/cardsfolder/s/shield_mare.txt
index 4f39f8eeceb..98ca747b9ad 100644
--- a/forge-gui/res/cardsfolder/s/shield_mare.txt
+++ b/forge-gui/res/cardsfolder/s/shield_mare.txt
@@ -4,6 +4,6 @@ Types:Creature Horse
 PT:2/3
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.Red | Description$ CARDNAME can't be blocked by red creatures.
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ DBGainLife | TriggerDescription$ When CARDNAME enters the battlefield or becomes the target of a spell or ability an opponent controls, you gain 3 life.
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Card.OppCtrl | TriggerZones$ Battlefield | Execute$ DBGainLife | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or becomes the target of a spell or ability an opponent controls, you gain 3 life.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ DBGainLife | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or becomes the target of a spell or ability an opponent controls, you gain 3 life.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3
 Oracle:Shield Mare can't be blocked by red creatures.\nWhen Shield Mare enters the battlefield or becomes the target of a spell or ability an opponent controls, you gain 3 life.
diff --git a/forge-gui/res/cardsfolder/s/silhouette.txt b/forge-gui/res/cardsfolder/s/silhouette.txt
index f3cbe5aa5b2..0f5856f1d89 100644
--- a/forge-gui/res/cardsfolder/s/silhouette.txt
+++ b/forge-gui/res/cardsfolder/s/silhouette.txt
@@ -2,5 +2,5 @@ Name:Silhouette
 ManaCost:1 U
 Types:Instant
 A:SP$ Effect | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberObjects$ Targeted | ReplacementEffects$ RPrevent | StackDescription$ SpellDescription | SpellDescription$ Choose target creature. If a spell or ability that targets that creature would cause a source to deal damage to that creature this turn, prevent that damage.
-SVar:RPrevent:Event$ DamageDone | ValidCause$ Spell.IsTargeting Remembered,Activated.IsTargeting Remembered | ValidTarget$ Card.IsRemembered | Prevent$ True | Description$ If a spell or ability that targets that creature would cause a source to deal damage to that creature this turn, prevent that damage.
+SVar:RPrevent:Event$ DamageDone | ValidCause$ SpellAbility.IsTargeting Remembered | ValidTarget$ Card.IsRemembered | Prevent$ True | Description$ If a spell or ability that targets that creature would cause a source to deal damage to that creature this turn, prevent that damage.
 Oracle:Choose target creature. If a spell or ability that targets that creature would cause a source to deal damage to that creature this turn, prevent that damage.
diff --git a/forge-gui/res/cardsfolder/s/silver_wyvern.txt b/forge-gui/res/cardsfolder/s/silver_wyvern.txt
index 0151324bf7e..eb8ea042291 100644
--- a/forge-gui/res/cardsfolder/s/silver_wyvern.txt
+++ b/forge-gui/res/cardsfolder/s/silver_wyvern.txt
@@ -3,6 +3,6 @@ ManaCost:3 U U
 Types:Creature Drake
 PT:4/3
 K:Flying
-A:AB$ ChangeTargets | Cost$ U | TargetType$ SpellAbility.numTargets EQ1+IsTargeting Self | ValidTgts$ Card | TgtPrompt$ Select target spell or ability that targets only CARDNAME | TargetRestriction$ Creature | SpellDescription$ Change the target of target spell or ability that targets only CARDNAME. The new target must be a creature.
+A:AB$ ChangeTargets | Cost$ U | TargetType$ SpellAbility.numTargets EQ1+IsTargeting Self | ValidTgts$ Card,Emblem | TgtPrompt$ Select target spell or ability that targets only CARDNAME | TargetRestriction$ Creature | SpellDescription$ Change the target of target spell or ability that targets only CARDNAME. The new target must be a creature.
 AI:RemoveDeck:All
 Oracle:Flying\n{U}: Change the target of target spell or ability that targets only Silver Wyvern. The new target must be a creature.
diff --git a/forge-gui/res/cardsfolder/s/silverfur_partisan.txt b/forge-gui/res/cardsfolder/s/silverfur_partisan.txt
index 0290c90ae7f..0e05028403d 100644
--- a/forge-gui/res/cardsfolder/s/silverfur_partisan.txt
+++ b/forge-gui/res/cardsfolder/s/silverfur_partisan.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Wolf Warrior
 PT:2/2
 K:Trample
-T:Mode$ BecomesTarget | ValidTarget$ Wolf.YouCtrl+inZoneBattlefield,Werewolf.YouCtrl+inZoneBattlefield | ValidSource$ Instant,Sorcery | SourceType$ spell | TriggerZones$ Battlefield | Execute$ DBToken | TriggerDescription$ Whenever a Wolf or Werewolf you control becomes the target of an instant or sorcery spell, create a 2/2 green Wolf creature token.
+T:Mode$ BecomesTarget | ValidTarget$ Wolf.YouCtrl+inZoneBattlefield,Werewolf.YouCtrl+inZoneBattlefield | ValidSource$ Instant,Sorcery | TriggerZones$ Battlefield | Execute$ DBToken | TriggerDescription$ Whenever a Wolf or Werewolf you control becomes the target of an instant or sorcery spell, create a 2/2 green Wolf creature token.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_2_2_wolf | TokenOwner$ You
 DeckHints:Type$Wolf|Werewolf
 Oracle:Trample\nWhenever a Wolf or Werewolf you control becomes the target of an instant or sorcery spell, create a 2/2 green Wolf creature token.
diff --git a/forge-gui/res/cardsfolder/s/siren_stormtamer.txt b/forge-gui/res/cardsfolder/s/siren_stormtamer.txt
index de644130755..6628f01304d 100644
--- a/forge-gui/res/cardsfolder/s/siren_stormtamer.txt
+++ b/forge-gui/res/cardsfolder/s/siren_stormtamer.txt
@@ -3,5 +3,5 @@ ManaCost:U
 Types:Creature Siren Pirate Wizard
 PT:1/1
 K:Flying
-A:AB$ Counter | Cost$ U Sac<1/CARDNAME> | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card | TargetValidTargeting$ You,Creature.YouCtrl+inZoneBattlefield | SpellDescription$ Counter target spell or ability that targets you or a creature you control.
+A:AB$ Counter | Cost$ U Sac<1/CARDNAME> | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card,Emblem | TargetValidTargeting$ You,Creature.YouCtrl+inZoneBattlefield | SpellDescription$ Counter target spell or ability that targets you or a creature you control.
 Oracle:Flying\n{U}, Sacrifice Siren Stormtamer: Counter target spell or ability that targets you or a creature you control.
diff --git a/forge-gui/res/cardsfolder/s/skophos_maze_warden.txt b/forge-gui/res/cardsfolder/s/skophos_maze_warden.txt
index f6d15d7b9a4..64d3468b6de 100644
--- a/forge-gui/res/cardsfolder/s/skophos_maze_warden.txt
+++ b/forge-gui/res/cardsfolder/s/skophos_maze_warden.txt
@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Creature Minotaur Warrior
 PT:3/4
 A:AB$ Pump | Cost$ 1 | NumAtt$ +1 | NumDef$ -1 | SpellDescription$ CARDNAME gets +1/-1 until end of turn.
-T:Mode$ BecomesTarget | ValidSource$ Land.namedLabyrinth of Skophos+YouCtrl | SourceType$ Ability | ValidTarget$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigFight | OptionalDecider$ You | TriggerDescription$ Whenever another creature becomes the target of an ability of a land you control named Labyrinth of Skophos, you may have CARDNAME fight that creature. (Each deals damage equal to its power to the other.)
+T:Mode$ BecomesTarget | ValidSource$ Ability.Land+namedLabyrinth of Skophos+YouCtrl | ValidTarget$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigFight | OptionalDecider$ You | TriggerDescription$ Whenever another creature becomes the target of an ability of a land you control named Labyrinth of Skophos, you may have CARDNAME fight that creature. (Each deals damage equal to its power to the other.)
 SVar:TrigFight:DB$ Fight | Defined$ Self | ExtraDefined$ TriggeredTarget
 DeckNeeds:Name$Labyrinth of Skophos
 Oracle:{1}: Skophos Maze-Warden gets +1/-1 until end of turn.\nWhenever another creature becomes the target of an ability of a land you control named Labyrinth of Skophos, you may have Skophos Maze-Warden fight that creature. (Each deals damage equal to its power to the other.)
diff --git a/forge-gui/res/cardsfolder/s/spectral_prison.txt b/forge-gui/res/cardsfolder/s/spectral_prison.txt
index 81c684daab7..e2f67a687ec 100644
--- a/forge-gui/res/cardsfolder/s/spectral_prison.txt
+++ b/forge-gui/res/cardsfolder/s/spectral_prison.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Curse
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
-T:Mode$ BecomesTarget | ValidTarget$ Card.EnchantedBy | SourceType$ Spell | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever enchanted creature becomes the target of a spell, sacrifice CARDNAME.
+T:Mode$ BecomesTarget | ValidTarget$ Card.EnchantedBy | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever enchanted creature becomes the target of a spell, sacrifice CARDNAME.
 SVar:TrigSac:DB$ Sacrifice | Defined$ Self
 Oracle:Enchant creature\nEnchanted creature doesn't untap during its controller's untap step.\nWhen enchanted creature becomes the target of a spell, sacrifice Spectral Prison.
diff --git a/forge-gui/res/cardsfolder/s/spellskite.txt b/forge-gui/res/cardsfolder/s/spellskite.txt
index 01f2ca5de48..24aa2c37638 100644
--- a/forge-gui/res/cardsfolder/s/spellskite.txt
+++ b/forge-gui/res/cardsfolder/s/spellskite.txt
@@ -2,5 +2,5 @@ Name:Spellskite
 ManaCost:2
 Types:Artifact Creature Phyrexian Horror
 PT:0/4
-A:AB$ ChangeTargets | Cost$ PU | TargetType$ Spell,Activated,Triggered | ValidTgts$ Card | DefinedMagnet$ Self | ChangeSingleTarget$ True | SpellDescription$ Change a target of target spell or ability to CARDNAME.
+A:AB$ ChangeTargets | Cost$ PU | TargetType$ Spell,Activated,Triggered | ValidTgts$ Card,Emblem | DefinedMagnet$ Self | ChangeSingleTarget$ True | SpellDescription$ Change a target of target spell or ability to CARDNAME.
 Oracle:{U/P}: Change a target of target spell or ability to Spellskite. ({U/P} can be paid with either {U} or 2 life.)
diff --git a/forge-gui/res/cardsfolder/s/stormchaser_drake.txt b/forge-gui/res/cardsfolder/s/stormchaser_drake.txt
index d9a6da2fadb..d63b42e40b9 100644
--- a/forge-gui/res/cardsfolder/s/stormchaser_drake.txt
+++ b/forge-gui/res/cardsfolder/s/stormchaser_drake.txt
@@ -3,6 +3,6 @@ ManaCost:1 U
 Types:Creature Drake
 PT:2/1
 K:Flying
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Card.YouCtrl | SourceType$ Spell | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes the target of a spell you control, draw a card.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell.YouCtrl | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME becomes the target of a spell you control, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 Oracle:Flying\nWhenever Stormchaser Drake becomes the target of a spell you control, draw a card.
diff --git a/forge-gui/res/cardsfolder/s/summary_dismissal.txt b/forge-gui/res/cardsfolder/s/summary_dismissal.txt
index 68b2e0266c8..3c61f4db46c 100644
--- a/forge-gui/res/cardsfolder/s/summary_dismissal.txt
+++ b/forge-gui/res/cardsfolder/s/summary_dismissal.txt
@@ -2,6 +2,6 @@ Name:Summary Dismissal
 ManaCost:2 U U
 Types:Instant
 A:SP$ ChangeZoneAll | Cost$ 2 U U | ChangeType$ Card.Other | Origin$ Stack | Destination$ Exile | Fizzle$ True | SubAbility$ DBCounter | SpellDescription$ Exile all other spells and counter all abilities.
-SVar:DBCounter:DB$ Counter | AllType$ Activated,Triggered | AllValid$ Card
+SVar:DBCounter:DB$ Counter | AllType$ Activated,Triggered | AllValid$ Card,Emblem
 AI:RemoveDeck:All
 Oracle:Exile all other spells and counter all abilities.
diff --git a/forge-gui/res/cardsfolder/t/thorn_lieutenant.txt b/forge-gui/res/cardsfolder/t/thorn_lieutenant.txt
index 7bbd57bcb67..df9a6c81389 100644
--- a/forge-gui/res/cardsfolder/t/thorn_lieutenant.txt
+++ b/forge-gui/res/cardsfolder/t/thorn_lieutenant.txt
@@ -2,7 +2,7 @@ Name:Thorn Lieutenant
 ManaCost:1 G
 Types:Creature Elf Warrior
 PT:2/3
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell.OppCtrl,Activated.OppCtrl,Triggered.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME becomes the target of a spell or ability an opponent controls, create a 1/1 green Elf Warrior creature token.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME becomes the target of a spell or ability an opponent controls, create a 1/1 green Elf Warrior creature token.
 SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenAmount$ 1 | TokenScript$ g_1_1_elf_warrior
 A:AB$ Pump | Cost$ 5 G | NumAtt$ +4 | NumDef$ +4 | SpellDescription$ CARDNAME gets +4/+4 until end of turn.
 DeckHas:Ability$Token
diff --git a/forge-gui/res/cardsfolder/t/thunderbreak_regent.txt b/forge-gui/res/cardsfolder/t/thunderbreak_regent.txt
index 95a843b1dbd..a712eb9396c 100644
--- a/forge-gui/res/cardsfolder/t/thunderbreak_regent.txt
+++ b/forge-gui/res/cardsfolder/t/thunderbreak_regent.txt
@@ -3,7 +3,7 @@ ManaCost:2 R R
 Types:Creature Dragon
 PT:4/4
 K:Flying
-T:Mode$ BecomesTarget | ValidTarget$ Dragon.YouCtrl+inZoneBattlefield | ValidSource$ Card.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a Dragon you control becomes the target of a spell or ability an opponent controls, CARDNAME deals 3 damage to that player.
+T:Mode$ BecomesTarget | ValidTarget$ Dragon.YouCtrl+inZoneBattlefield | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a Dragon you control becomes the target of a spell or ability an opponent controls, CARDNAME deals 3 damage to that player.
 SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredSourceController | NumDmg$ 3
 DeckHints:Type$Dragon
 Oracle:Flying\nWhenever a Dragon you control becomes the target of a spell or ability an opponent controls, Thunderbreak Regent deals 3 damage to that player.
diff --git a/forge-gui/res/cardsfolder/u/unsettled_mariner.txt b/forge-gui/res/cardsfolder/u/unsettled_mariner.txt
index dfac24f6f14..9c470e02d08 100644
--- a/forge-gui/res/cardsfolder/u/unsettled_mariner.txt
+++ b/forge-gui/res/cardsfolder/u/unsettled_mariner.txt
@@ -3,6 +3,6 @@ ManaCost:W U
 Types:Creature Shapeshifter
 PT:2/2
 K:Changeling
-T:Mode$ BecomesTarget | ValidTarget$ You,Permanent.YouCtrl+inZoneBattlefield | ValidSource$ Card.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever you or a permanent you control becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {1}.
+T:Mode$ BecomesTarget | ValidTarget$ You,Permanent.YouCtrl+inZoneBattlefield | ValidSource$ SpellAbility.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever you or a permanent you control becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {1}.
 SVar:TrigCounter:DB$ Counter | Defined$ TriggeredSourceSA | UnlessCost$ 1 | UnlessPayer$ TriggeredSourceSAController
 Oracle:Changeling (This card is every creature type.)\nWhenever you or a permanent you control becomes the target of a spell or ability an opponent controls, counter that spell or ability unless its controller pays {1}.
diff --git a/forge-gui/res/cardsfolder/upcoming/laezel_githyanki_warrior.txt b/forge-gui/res/cardsfolder/upcoming/laezel_githyanki_warrior.txt
index 4a1ab90db09..061e7120318 100644
--- a/forge-gui/res/cardsfolder/upcoming/laezel_githyanki_warrior.txt
+++ b/forge-gui/res/cardsfolder/upcoming/laezel_githyanki_warrior.txt
@@ -6,7 +6,7 @@ K:Double Strike
 K:Specialize:1
 T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigAnimate | TriggerDescription$ When you cast this spell, it gains "When this creature becomes the target of a spell or ability an opponent controls, you may exile this creature, then return it to the battlefield under its owner's control."
 SVar:TrigAnimate:DB$ Animate | Triggers$ BecomesTarget
-SVar:BecomesTarget:Mode$ BecomesTarget | ValidSource$ Card.OppCtrl | ValidTarget$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigBlink | OptionalDecider$ You | TriggerDescription$ When this creature becomes the target of a spell or ability an opponent controls, you may exile this creature, then return it to the battlefield under its owner's control.
+SVar:BecomesTarget:Mode$ BecomesTarget | ValidSource$ SpellAbility.OppCtrl | ValidTarget$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigBlink | OptionalDecider$ You | TriggerDescription$ When this creature becomes the target of a spell or ability an opponent controls, you may exile this creature, then return it to the battlefield under its owner's control.
 SVar:TrigBlink:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ TriggeredTargetLKICopy | SubAbility$ DBReturn | RememberChanged$ True
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/upcoming/salvaged_manaworker.txt b/forge-gui/res/cardsfolder/upcoming/salvaged_manaworker.txt
index aa9c2dc92ce..4b18c04d599 100644
--- a/forge-gui/res/cardsfolder/upcoming/salvaged_manaworker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/salvaged_manaworker.txt
@@ -3,4 +3,4 @@ ManaCost:2
 Types:Artifact Creature Construct
 PT:1/3
 A:AB$ Mana | Cost$ 1 | Produced$ Any | ActivationLimit$ 1 | SpellDescription$ Add one mana of any color. Activate only once each turn.
-Oracle:Add one mana of any color. Activate only once each turn.
\ No newline at end of file
+Oracle:{1}: Add one mana of any color. Activate only once each turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/w/warden_of_the_woods.txt b/forge-gui/res/cardsfolder/w/warden_of_the_woods.txt
index 48e0cf0c66b..1bb6de7f770 100644
--- a/forge-gui/res/cardsfolder/w/warden_of_the_woods.txt
+++ b/forge-gui/res/cardsfolder/w/warden_of_the_woods.txt
@@ -3,6 +3,6 @@ ManaCost:4 G G
 Types:Creature Treefolk
 PT:5/7
 K:Vigilance
-T:Mode$ BecomesTarget | ValidSource$ Card.OppCtrl | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability an opponent controls, you may draw two cards.
+T:Mode$ BecomesTarget | ValidSource$ SpellAbility.OppCtrl | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME becomes the target of a spell or ability an opponent controls, you may draw two cards.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 2 | OptionalDecider$ You
 Oracle:Vigilance (Attacking doesn't cause this creature to tap.)\nWhenever Warden of the Woods becomes the target of a spell or ability an opponent controls, you may draw two cards.
diff --git a/forge-gui/res/cardsfolder/w/wild_defiance.txt b/forge-gui/res/cardsfolder/w/wild_defiance.txt
index be0bd8504cb..56cae97e373 100644
--- a/forge-gui/res/cardsfolder/w/wild_defiance.txt
+++ b/forge-gui/res/cardsfolder/w/wild_defiance.txt
@@ -1,6 +1,6 @@
 Name:Wild Defiance
 ManaCost:2 G
 Types:Enchantment
-T:Mode$ BecomesTarget | ValidTarget$ Creature.YouCtrl+inZoneBattlefield | ValidSource$ Instant,Sorcery | SourceType$ spell | TriggerZones$ Battlefield | Execute$ WildPump | TriggerDescription$ Whenever a creature you control becomes the target of an instant or sorcery spell, it gets +3/+3 until end of turn.
+T:Mode$ BecomesTarget | ValidTarget$ Creature.YouCtrl+inZoneBattlefield | ValidSource$ Instant,Sorcery | TriggerZones$ Battlefield | Execute$ WildPump | TriggerDescription$ Whenever a creature you control becomes the target of an instant or sorcery spell, it gets +3/+3 until end of turn.
 SVar:WildPump:DB$ Pump | Defined$ TriggeredTarget | NumAtt$ +3 | NumDef$ +3
 Oracle:Whenever a creature you control becomes the target of an instant or sorcery spell, that creature gets +3/+3 until end of turn.
diff --git a/forge-gui/res/cardsfolder/w/willbender.txt b/forge-gui/res/cardsfolder/w/willbender.txt
index 44221c09c1c..748a8c723bb 100644
--- a/forge-gui/res/cardsfolder/w/willbender.txt
+++ b/forge-gui/res/cardsfolder/w/willbender.txt
@@ -4,6 +4,6 @@ Types:Creature Human Wizard
 PT:1/2
 K:Morph:1 U
 T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, change the target of target spell or ability with a single target.
-SVar:TrigChange:DB$ ChangeTargets | TargetType$ SpellAbility.numTargets EQ1 | ValidTgts$ Card | TgtPrompt$ Select target spell or ability with a single target
+SVar:TrigChange:DB$ ChangeTargets | TargetType$ SpellAbility.numTargets EQ1 | ValidTgts$ Card,Emblem | TgtPrompt$ Select target spell or ability with a single target
 AI:RemoveDeck:All
 Oracle:Morph {1}{U} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)\nWhen Willbender is turned face up, change the target of target spell or ability with a single target.
diff --git a/forge-gui/res/cardsfolder/w/willbreaker.txt b/forge-gui/res/cardsfolder/w/willbreaker.txt
index 5735b9f0fe9..f98461c4578 100644
--- a/forge-gui/res/cardsfolder/w/willbreaker.txt
+++ b/forge-gui/res/cardsfolder/w/willbreaker.txt
@@ -2,6 +2,6 @@ Name:Willbreaker
 ManaCost:3 U U
 Types:Creature Human Wizard
 PT:2/3
-T:Mode$ BecomesTarget | ValidTarget$ Creature.OppCtrl+inZoneBattlefield | ValidSource$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainControl | TriggerDescription$ Whenever a creature an opponent controls becomes the target of a spell or ability you control, gain control of that creature for as long as you control CARDNAME.
+T:Mode$ BecomesTarget | ValidTarget$ Creature.OppCtrl+inZoneBattlefield | ValidSource$ SpellAbility.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainControl | TriggerDescription$ Whenever a creature an opponent controls becomes the target of a spell or ability you control, gain control of that creature for as long as you control CARDNAME.
 SVar:TrigGainControl:DB$ GainControl | Defined$ TriggeredTarget | NewController$ You | LoseControl$ LeavesPlay,LoseControl
 Oracle:Whenever a creature an opponent controls becomes the target of a spell or ability you control, gain control of that creature for as long as you control Willbreaker.
diff --git a/forge-gui/res/cardsfolder/w/wylls_reversal.txt b/forge-gui/res/cardsfolder/w/wylls_reversal.txt
index 73d96a0c9bb..f974da962ea 100644
--- a/forge-gui/res/cardsfolder/w/wylls_reversal.txt
+++ b/forge-gui/res/cardsfolder/w/wylls_reversal.txt
@@ -1,7 +1,7 @@
 Name:Wyll's Reversal
 ManaCost:2 R
 Types:Instant
-A:SP$ Pump | TargetType$ SpellAbility.numTargets GE1 | TgtZone$ Stack | ValidTgts$ Card | TgtPrompt$ Select target spell or ability with one or more targets | SubAbility$ RollD20 | StackDescription$ {p:You} chooses {s:Targeted}. | SpellDescription$ Choose target spell or ability with one or more targets.
+A:SP$ Pump | TargetType$ SpellAbility.numTargets GE1 | TgtZone$ Stack | ValidTgts$ Card,Emblem | TgtPrompt$ Select target spell or ability with one or more targets | SubAbility$ RollD20 | StackDescription$ {p:You} chooses {s:Targeted}. | SpellDescription$ Choose target spell or ability with one or more targets.
 SVar:RollD20:DB$ RollDice | Sides$ 20 | Modifier$ Y | ResultSubAbilities$ 1-14:ChooseNew,Else:ChooseAndCopy | StackDescription$ SpellDescription | SpellDescription$ Roll a d20 and add the greatest power among creatures you control.
 SVar:ChooseNew:DB$ ChangeTargets | Defined$ Targeted | Optional$ True | SpellDescription$ 1—14 VERT You may choose new targets for that spell or ability.
 SVar:ChooseAndCopy:DB$ ChangeTargets | Defined$ Targeted | Optional$ True | SubAbility$ DBCopy | SpellDescription$ 15+ VERT You may choose new targets for that spell or ability.
diff --git a/forge-gui/res/tokenscripts/u_2_2_illusion_illusory.txt b/forge-gui/res/tokenscripts/u_2_2_illusion_illusory.txt
index 4a44367534a..7ae15913bcd 100644
--- a/forge-gui/res/tokenscripts/u_2_2_illusion_illusory.txt
+++ b/forge-gui/res/tokenscripts/u_2_2_illusion_illusory.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Creature Illusion
 Colors:blue
 PT:2/2
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | SourceType$ Spell | TriggerZones$ Battlefield | Execute$ DoSac | TriggerDescription$ When CARDNAME becomes the target of a spell, sacrifice it.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ DoSac | TriggerDescription$ When CARDNAME becomes the target of a spell, sacrifice it.
 SVar:TokenTgtDies:SVar:Targeting:Dies
 SVar:DoSac:DB$ Sacrifice | Defined$ Self
 Oracle:When this creatures becomes the target of a spell, sacrifice it.