diff --git a/forge-gui/res/cardsfolder/t/taborax_hopes_demise.txt b/forge-gui/res/cardsfolder/t/taborax_hopes_demise.txt
index 262dc9ece38..9c02840a57c 100644
--- a/forge-gui/res/cardsfolder/t/taborax_hopes_demise.txt
+++ b/forge-gui/res/cardsfolder/t/taborax_hopes_demise.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Demon Cleric
 PT:2/2
 K:Flying
 S:Mode$ Continuous | Affected$ Card.Self+counters_GE5_P1P1 | AddKeyword$ Lifelink | Description$ CARDNAME has lifelink as long as it has five or more +1/+1 counters on it.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another nontoken creature you control dies, put a +1/+1 counter on CARDNAME. If that creature was a Cleric, you may draw a card. If you do, you lose 1 life.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.!token+Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another nontoken creature you control dies, put a +1/+1 counter on CARDNAME. If that creature was a Cleric, you may draw a card. If you do, you lose 1 life.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 1 | UnlessCost$ Draw<1/You> | UnlessSwitched$ True | UnlessPayer$ You | ConditionDefined$ TriggeredCardLKICopy | ConditionPresent$ Creature.Cleric | ConditionCompare$ EQ1
 DeckHas:Ability$Counters
diff --git a/forge-gui/res/cardsfolder/t/tamiyo_the_moon_sage.txt b/forge-gui/res/cardsfolder/t/tamiyo_the_moon_sage.txt
index 8df75c5bef6..b7c74c7dc5f 100644
--- a/forge-gui/res/cardsfolder/t/tamiyo_the_moon_sage.txt
+++ b/forge-gui/res/cardsfolder/t/tamiyo_the_moon_sage.txt
@@ -8,7 +8,7 @@ A:AB$ Draw | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select
 SVar:X:Count$Valid Creature.tapped+TargetedPlayerCtrl
 A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem — Tamiyo, the Moon Sage | Image$ emblem_tamiyo_the_moon_sage | StaticAbilities$ UnlimitedHand | Triggers$ TamiyoCardToGrave | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "You have no maximum hand size" and "Whenever a card is put into your graveyard from anywhere, you may return it to your hand."
 SVar:UnlimitedHand:Mode$ Continuous | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size.
-SVar:TamiyoCardToGrave:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.nonToken+YouOwn | OptionalDecider$ You | TriggerZones$ Command | Execute$ TamiyoReturn | TriggerDescription$ Whenever a card is put into your graveyard from anywhere, you may return it to your hand.
+SVar:TamiyoCardToGrave:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.!token+YouOwn | OptionalDecider$ You | TriggerZones$ Command | Execute$ TamiyoReturn | TriggerDescription$ Whenever a card is put into your graveyard from anywhere, you may return it to your hand.
 SVar:TamiyoReturn:DB$ ChangeZone | Defined$ TriggeredCardLKICopy | Origin$ Graveyard | Destination$ Hand
 SVar:PlayMain1:TRUE
 Oracle:[+1]: Tap target permanent. It doesn't untap during its controller's next untap step.\n[-2]: Draw a card for each tapped creature target player controls.\n[-8]: You get an emblem with "You have no maximum hand size" and "Whenever a card is put into your graveyard from anywhere, you may return it to your hand."
diff --git a/forge-gui/res/cardsfolder/t/tan_jolom_the_worldwalker.txt b/forge-gui/res/cardsfolder/t/tan_jolom_the_worldwalker.txt
index 9a0e1b74a95..e868be96fd6 100644
--- a/forge-gui/res/cardsfolder/t/tan_jolom_the_worldwalker.txt
+++ b/forge-gui/res/cardsfolder/t/tan_jolom_the_worldwalker.txt
@@ -3,5 +3,5 @@ ManaCost:1 G W U
 Types:Legendary Creature Spirit
 PT:3/3
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigAnimate | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, choose up to one target artifact or land you control that isn't a creature or token. Until end of turn, it becomes a 3/3 Spirit creature with vigilance and double team in addition to its other types.
-SVar:TrigAnimate:DB$ Animate | ValidTgts$ Artifact.nonCreature+nonToken+YouCtrl,Land.nonCreature+nonToken+YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target artifact or land you control that isn't a creature or token | Power$ 3 | Toughness$ 3 | Types$ Creature,Spirit | Keywords$ Vigilance & Double team
+SVar:TrigAnimate:DB$ Animate | ValidTgts$ Artifact.nonCreature+!token+YouCtrl,Land.nonCreature+!token+YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target artifact or land you control that isn't a creature or token | Power$ 3 | Toughness$ 3 | Types$ Creature,Spirit | Keywords$ Vigilance & Double team
 Oracle:At the beginning of combat on your turn, choose up to one target artifact or land you control that isn't a creature or token. Until end of turn, it becomes a 3/3 Spirit creature with vigilance and double team in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/t/teferi_druid_of_argoth.txt b/forge-gui/res/cardsfolder/t/teferi_druid_of_argoth.txt
index ca27018577b..eda014d822d 100644
--- a/forge-gui/res/cardsfolder/t/teferi_druid_of_argoth.txt
+++ b/forge-gui/res/cardsfolder/t/teferi_druid_of_argoth.txt
@@ -3,6 +3,6 @@ ManaCost:2 G G G
 Types:Legendary Creature Human Druid
 PT:3/4
 K:Flash
-S:Mode$ Continuous | Affected$ Creature.YouOwn+nonToken | AffectedZone$ Hand,Graveyard,Exile,Library,Command,Stack | AddKeyword$ Flash | Description$ Creature cards you own that aren't on the battlefield have flash.
+S:Mode$ Continuous | Affected$ Creature.YouOwn+!token | AffectedZone$ Hand,Graveyard,Exile,Library,Command,Stack | AddKeyword$ Flash | Description$ Creature cards you own that aren't on the battlefield have flash.
 S:Mode$ CantBeCast | ValidCard$ Card | OnlySorcerySpeed$ True | Caster$ Opponent | Description$ Each opponent can cast spells only any time they could cast a sorcery.
 Oracle:Flash\nCreature cards you own that aren't on the battlefield have flash.\nEach opponent can cast spells only any time they could cast a sorcery.
diff --git a/forge-gui/res/cardsfolder/t/teferi_mage_of_zhalfir.txt b/forge-gui/res/cardsfolder/t/teferi_mage_of_zhalfir.txt
index a1b7e045181..b5ff49ef514 100644
--- a/forge-gui/res/cardsfolder/t/teferi_mage_of_zhalfir.txt
+++ b/forge-gui/res/cardsfolder/t/teferi_mage_of_zhalfir.txt
@@ -3,6 +3,6 @@ ManaCost:2 U U U
 Types:Legendary Creature Human Wizard
 PT:3/4
 K:Flash
-S:Mode$ Continuous | Affected$ Creature.YouOwn+nonToken | AffectedZone$ Hand,Graveyard,Exile,Library,Command,Stack | AddKeyword$ Flash | Description$ Creature cards you own that aren't on the battlefield have flash.
+S:Mode$ Continuous | Affected$ Creature.YouOwn+!token | AffectedZone$ Hand,Graveyard,Exile,Library,Command,Stack | AddKeyword$ Flash | Description$ Creature cards you own that aren't on the battlefield have flash.
 S:Mode$ CantBeCast | ValidCard$ Card | OnlySorcerySpeed$ True | Caster$ Opponent | Description$ Each opponent can cast spells only any time they could cast a sorcery.
 Oracle:Flash\nCreature cards you own that aren't on the battlefield have flash.\nEach opponent can cast spells only any time they could cast a sorcery.
diff --git a/forge-gui/res/cardsfolder/t/teferis_realm.txt b/forge-gui/res/cardsfolder/t/teferis_realm.txt
index 6c360fed317..31146cde73f 100644
--- a/forge-gui/res/cardsfolder/t/teferis_realm.txt
+++ b/forge-gui/res/cardsfolder/t/teferis_realm.txt
@@ -3,9 +3,9 @@ ManaCost:1 U U
 Types:World Enchantment
 T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each player's upkeep, that player chooses artifact, creature, land, or non-Aura enchantment. All nontoken permanents of that type phase out. (While they're phased out, they're treated as though they don't exist. Each one phases in before its controller untaps during their next untap step.)
 SVar:TrigChoose:DB$ GenericChoice | Choices$ ChooseCreature,ChooseArtifact,ChooseLand,ChooseEnchant | Defined$ TriggeredPlayer | ShowChoice$ True | AILogic$ Phasing
-SVar:ChooseCreature:DB$ Phases | AllValid$ Creature.nonToken | SpellDescription$ Creature
-SVar:ChooseArtifact:DB$ Phases | AllValid$ Artifact.nonToken | SpellDescription$ Artifact
-SVar:ChooseLand:DB$ Phases | AllValid$ Land.nonToken | SpellDescription$ Land
-SVar:ChooseEnchant:DB$ Phases | AllValid$ Enchantment.nonAura+nonToken | SpellDescription$ non-Aura Enchantment
+SVar:ChooseCreature:DB$ Phases | AllValid$ Creature.!token | SpellDescription$ Creature
+SVar:ChooseArtifact:DB$ Phases | AllValid$ Artifact.!token | SpellDescription$ Artifact
+SVar:ChooseLand:DB$ Phases | AllValid$ Land.!token | SpellDescription$ Land
+SVar:ChooseEnchant:DB$ Phases | AllValid$ Enchantment.nonAura+!token | SpellDescription$ non-Aura Enchantment
 AI:RemoveDeck:Random
 Oracle:At the beginning of each player's upkeep, that player chooses artifact, creature, land, or non-Aura enchantment. All nontoken permanents of that type phase out. (While they're phased out, they're treated as though they don't exist. Each one phases in before its controller untaps during their next untap step.)
diff --git a/forge-gui/res/cardsfolder/t/tergrid_god_of_fright_tergrids_lantern.txt b/forge-gui/res/cardsfolder/t/tergrid_god_of_fright_tergrids_lantern.txt
index 28cc89a80da..23e45ef3850 100644
--- a/forge-gui/res/cardsfolder/t/tergrid_god_of_fright_tergrids_lantern.txt
+++ b/forge-gui/res/cardsfolder/t/tergrid_god_of_fright_tergrids_lantern.txt
@@ -3,8 +3,8 @@ ManaCost:3 B B
 Types:Legendary Creature God
 PT:4/5
 K:Menace
-T:Mode$ Sacrificed | ValidCard$ Permanent.nonToken+OppCtrl | OptionalDecider$ You | Execute$ TrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent sacrifices a nontoken permanent, you may put that card from a graveyard onto the battlefield under your control.
-T:Mode$ Discarded | ValidCard$ Permanent.nonToken+OppCtrl | OptionalDecider$ You | Execute$ TrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent discards a permanent card, you may put that card from a graveyard onto the battlefield under your control.
+T:Mode$ Sacrificed | ValidCard$ Permanent.!token+OppCtrl | OptionalDecider$ You | Execute$ TrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent sacrifices a nontoken permanent, you may put that card from a graveyard onto the battlefield under your control.
+T:Mode$ Discarded | ValidCard$ Permanent.!token+OppCtrl | OptionalDecider$ You | Execute$ TrigReturn | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent discards a permanent card, you may put that card from a graveyard onto the battlefield under your control.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredCard
 SVar:PlayMain1:TRUE
 AlternateMode:Modal
diff --git a/forge-gui/res/cardsfolder/t/teysa_orzhov_scion_avatar.txt b/forge-gui/res/cardsfolder/t/teysa_orzhov_scion_avatar.txt
index 7a7f25569e1..c63b0fc1923 100644
--- a/forge-gui/res/cardsfolder/t/teysa_orzhov_scion_avatar.txt
+++ b/forge-gui/res/cardsfolder/t/teysa_orzhov_scion_avatar.txt
@@ -2,7 +2,7 @@ Name:Teysa, Orzhov Scion Avatar
 ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:+0/-2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken | TriggerZones$ Command | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature dies, create a 1/1 white Spirit creature token with flying.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.!token | TriggerZones$ Command | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature dies, create a 1/1 white Spirit creature token with flying.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You
 DeckHas:Ability$Token
 Oracle:Hand +0, life -2\nWhenever a nontoken creature dies, create a 1/1 white Spirit creature token with flying.
diff --git a/forge-gui/res/cardsfolder/t/the_alright_henge.txt b/forge-gui/res/cardsfolder/t/the_alright_henge.txt
index f2579d1c9bd..a6a818bd608 100644
--- a/forge-gui/res/cardsfolder/t/the_alright_henge.txt
+++ b/forge-gui/res/cardsfolder/t/the_alright_henge.txt
@@ -2,7 +2,7 @@ Name:The Alright Henge
 ManaCost:3 G
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add {G}{G}.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a nontoken creature enters the battlefield under your control, put a +1/+1 counter on it.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.!token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a nontoken creature enters the battlefield under your control, put a +1/+1 counter on it.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
 Oracle:{T}: Add {G}{G}. You gain 2 life.\nWhenever a nontoken creature enters the battlefield under your control, put a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/t/the_apprentices_folly.txt b/forge-gui/res/cardsfolder/t/the_apprentices_folly.txt
index 9bf91b12383..5d086dc45a7 100644
--- a/forge-gui/res/cardsfolder/t/the_apprentices_folly.txt
+++ b/forge-gui/res/cardsfolder/t/the_apprentices_folly.txt
@@ -2,7 +2,7 @@ Name:The Apprentice's Folly
 ManaCost:2 U R
 Types:Enchantment Saga
 K:Chapter:3:DBClone,DBClone,DBSac
-SVar:DBClone:DB$ CopyPermanent | Defined$ Targeted | AddTypes$ Reflection | ValidTgts$ Creature.nonToken+doesNotShareNameWith Card.token+YouCtrl | TgtPrompt$ Choose target nontoken creature you control that doesn't have the same name as a token you control | AddKeywords$ Haste | NonLegendary$ True | SpellDescription$ Choose target nontoken creature you control that doesn't have the same name as a token you control. Create a token that's a copy of it, except it isn't legendary, is a Reflection in addition to its other types, and has haste.
+SVar:DBClone:DB$ CopyPermanent | Defined$ Targeted | AddTypes$ Reflection | ValidTgts$ Creature.!token+doesNotShareNameWith Card.token+YouCtrl | TgtPrompt$ Choose target nontoken creature you control that doesn't have the same name as a token you control | AddKeywords$ Haste | NonLegendary$ True | SpellDescription$ Choose target nontoken creature you control that doesn't have the same name as a token you control. Create a token that's a copy of it, except it isn't legendary, is a Reflection in addition to its other types, and has haste.
 SVar:DBSac:DB$ SacrificeAll | ValidCards$ Reflection.YouCtrl | SpellDescription$ Sacrifice all Reflections you control.
 DeckHas:Ability$Token|Sacrifice & Type$Reflection
 Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI, II — Choose target nontoken creature you control that doesn't have the same name as a token you control. Create a token that's a copy of it, except it isn't legendary, is a Reflection in addition to its other types, and has haste.\nIII — Sacrifice all Reflections you control.
diff --git a/forge-gui/res/cardsfolder/t/the_blackstaff_of_waterdeep.txt b/forge-gui/res/cardsfolder/t/the_blackstaff_of_waterdeep.txt
index 0fd361f9573..cdc7cf6f9d3 100644
--- a/forge-gui/res/cardsfolder/t/the_blackstaff_of_waterdeep.txt
+++ b/forge-gui/res/cardsfolder/t/the_blackstaff_of_waterdeep.txt
@@ -2,5 +2,5 @@ Name:The Blackstaff of Waterdeep
 ManaCost:U
 Types:Legendary Artifact
 K:You may choose not to untap CARDNAME during your untap step.
-A:AB$ Animate | Cost$ 1 U T | ValidTgts$ Artifact.Other+nonToken+YouCtrl | TgtPrompt$ Select another target nontoken artifact you control | Duration$ UntilUntaps | Power$ 4 | Toughness$ 4 | Types$ Creature | PrecostDesc$ Animate Walking Statue — | SpellDescription$ Another target nontoken artifact you control becomes a 4/4 artifact creature for as long as CARDNAME remains tapped. Activate only as a sorcery. | SorcerySpeed$ True | StackDescription$ SpellDescription
+A:AB$ Animate | Cost$ 1 U T | ValidTgts$ Artifact.Other+!token+YouCtrl | TgtPrompt$ Select another target nontoken artifact you control | Duration$ UntilUntaps | Power$ 4 | Toughness$ 4 | Types$ Creature | PrecostDesc$ Animate Walking Statue — | SpellDescription$ Another target nontoken artifact you control becomes a 4/4 artifact creature for as long as CARDNAME remains tapped. Activate only as a sorcery. | SorcerySpeed$ True | StackDescription$ SpellDescription
 Oracle:You may choose not to untap The Blackstaff of Waterdeep during your untap step.\nAnimate Walking Statue — {1}{U}, {T}: Another target nontoken artifact you control becomes a 4/4 artifact creature for as long as The Blackstaff of Waterdeep remains tapped. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/t/the_curse_of_fenric.txt b/forge-gui/res/cardsfolder/t/the_curse_of_fenric.txt
index ce1ba8bc120..93e502b9c5e 100644
--- a/forge-gui/res/cardsfolder/t/the_curse_of_fenric.txt
+++ b/forge-gui/res/cardsfolder/t/the_curse_of_fenric.txt
@@ -5,7 +5,7 @@ K:Chapter:3:DBDestroy,DBAnimate,DBFight
 SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ OneEach | TargetsForEachPlayer$ True | RememberLKI$ True | SubAbility$ DBToken | SpellDescription$ For each player, destroy up to one target creature that player controls. For each creature destroyed this way, its controller creates a 3/3 green Mutant creature token with deathtouch.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_3_3_mutant_deathtouch | TokenOwner$ RememberedController | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:DBAnimate:DB$ Animate | ValidTgts$ Creature.nonToken | TgtPrompt$ Select target nontoken creature | Power$ 6 | Toughness$ 6 | RemoveAllAbilities$ True | Types$ Legendary,Creature,Horror | RemoveCreatureTypes$ True | Name$ Fenric | Duration$ Permanent | SpellDescription$ Target nontoken creature becomes a 6/6 legendary Horror creature named Fenric and loses all abilities.
+SVar:DBAnimate:DB$ Animate | ValidTgts$ Creature.!token | TgtPrompt$ Select target nontoken creature | Power$ 6 | Toughness$ 6 | RemoveAllAbilities$ True | Types$ Legendary,Creature,Horror | RemoveCreatureTypes$ True | Name$ Fenric | Duration$ Permanent | SpellDescription$ Target nontoken creature becomes a 6/6 legendary Horror creature named Fenric and loses all abilities.
 SVar:DBFight:DB$ Pump | ValidTgts$ Creature.Mutant | AILogic$ Fight | TgtPrompt$ Select target Mutant | SubAbility$ DBFightBis | SpellDescription$ Target Mutant fights another target creature named Fenric.
 SVar:DBFightBis:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.namedFenric | TgtPrompt$ Select target creature named Fenric
 SVar:OneEach:PlayerCountPlayers$Amount
diff --git a/forge-gui/res/cardsfolder/t/the_dark_barony.txt b/forge-gui/res/cardsfolder/t/the_dark_barony.txt
index ccda8048462..7d5d9849a20 100644
--- a/forge-gui/res/cardsfolder/t/the_dark_barony.txt
+++ b/forge-gui/res/cardsfolder/t/the_dark_barony.txt
@@ -1,7 +1,7 @@
 Name:The Dark Barony
 ManaCost:no cost
 Types:Plane Ulgrotha
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.nonToken+nonBlack | TriggerZones$ Command | Execute$ TrigLoseLife | TriggerDescription$ Whenever a nonblack card is put into a player's graveyard from anywhere, that player loses 1 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.!token+nonBlack | TriggerZones$ Command | Execute$ TrigLoseLife | TriggerDescription$ Whenever a nonblack card is put into a player's graveyard from anywhere, that player loses 1 life.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredCardOwner | LifeAmount$ 1
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever chaos ensues, each opponent discards a card.
 SVar:RolledChaos:DB$ Discard | Mode$ TgtChoose | Defined$ Opponent
diff --git a/forge-gui/res/cardsfolder/t/the_gitrog_monster.txt b/forge-gui/res/cardsfolder/t/the_gitrog_monster.txt
index 6620180d6a8..fcab4f63f59 100644
--- a/forge-gui/res/cardsfolder/t/the_gitrog_monster.txt
+++ b/forge-gui/res/cardsfolder/t/the_gitrog_monster.txt
@@ -6,7 +6,7 @@ K:Deathtouch
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUpkeep | TriggerDescription$ At the beginning of your upkeep, sacrifice CARDNAME unless you sacrifice a land.
 SVar:TrigUpkeep:DB$ Sacrifice | UnlessPayer$ You | UnlessCost$ Sac<1/Land>
 S:Mode$ Continuous | Affected$ You | AdjustLandPlays$ 1 | Description$ You may play an additional land on each of your turns.
-T:Mode$ ChangesZoneAll | ValidCards$ Land.YouOwn+nonToken | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever one or more land cards are put into your graveyard from anywhere, draw a card.
+T:Mode$ ChangesZoneAll | ValidCards$ Land.YouOwn+!token | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever one or more land cards are put into your graveyard from anywhere, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 DeckHas:Ability$Graveyard
 Oracle:Deathtouch\nAt the beginning of your upkeep, sacrifice The Gitrog Monster unless you sacrifice a land.\nYou may play an additional land on each of your turns.\nWhenever one or more land cards are put into your graveyard from anywhere, draw a card.
diff --git a/forge-gui/res/cardsfolder/t/the_grand_tour.txt b/forge-gui/res/cardsfolder/t/the_grand_tour.txt
index 05e65e14fe9..a93e7b3b649 100644
--- a/forge-gui/res/cardsfolder/t/the_grand_tour.txt
+++ b/forge-gui/res/cardsfolder/t/the_grand_tour.txt
@@ -1,7 +1,7 @@
 Name:The Grand Tour
 ManaCost:1 U
 Types:Instant
-A:SP$ ChangeZone | ValidTgts$ Permanent.nonToken | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target nontoken permanent | RememberTargets$ True | SubAbility$ DBHand | SpellDescription$ Exile target permanent,
+A:SP$ ChangeZone | ValidTgts$ Permanent.!token | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target nontoken permanent | RememberTargets$ True | SubAbility$ DBHand | SpellDescription$ Exile target permanent,
 SVar:DBHand:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Hand | SubAbility$ DBDiscard | SpellDescription$ then put it into its owner's hand.
 SVar:DBDiscard:DB$ Discard | Mode$ Defined | Defined$ RememberedOwner | DefinedCards$ Remembered | SubAbility$ DBLibrary | SpellDescription$ That player discards that card,
 SVar:DBLibrary:DB$ ChangeZone | Origin$ Graveyard | Destination$ Library | LibraryPosition$ 0 | Defined$ Remembered | SubAbility$ DBReturn | SpellDescription$ then puts it on top of their library.
diff --git a/forge-gui/res/cardsfolder/t/the_great_henge.txt b/forge-gui/res/cardsfolder/t/the_great_henge.txt
index 8461fbf3f73..85b73763c9b 100644
--- a/forge-gui/res/cardsfolder/t/the_great_henge.txt
+++ b/forge-gui/res/cardsfolder/t/the_great_henge.txt
@@ -5,7 +5,7 @@ S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone
 SVar:X:Count$Valid Creature.YouCtrl$GreatestPower
 A:AB$ Mana | Cost$ T | Produced$ G | Amount$ 2 | SubAbility$ DBGainLife | AILogic$ AtOppEOT | SpellDescription$ Add {G}{G}. You gain 2 life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a nontoken creature you control enters, put a +1/+1 counter on it and draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.!token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a nontoken creature you control enters, put a +1/+1 counter on it and draw a card.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
 DeckHas:Ability$LifeGain|Counters
diff --git a/forge-gui/res/cardsfolder/t/the_haunt_of_hightower.txt b/forge-gui/res/cardsfolder/t/the_haunt_of_hightower.txt
index c9a2ad1f50d..a5168ea06fd 100644
--- a/forge-gui/res/cardsfolder/t/the_haunt_of_hightower.txt
+++ b/forge-gui/res/cardsfolder/t/the_haunt_of_hightower.txt
@@ -7,7 +7,7 @@ K:Lifelink
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ Whenever CARDNAME attacks, defending player discards a card.
 SVar:TrigDiscard:DB$ Discard | Defined$ TriggeredDefendingPlayer | NumCards$ 1 | Mode$ TgtChoose
 SVar:HasAttackEffect:TRUE
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.nonToken+OppOwn | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a card is put into an opponent's graveyard from anywhere, put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.!token+OppOwn | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a card is put into an opponent's graveyard from anywhere, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
 Oracle:Flying, lifelink\nWhenever The Haunt of Hightower attacks, defending player discards a card.\nWhenever a card is put into an opponent's graveyard from anywhere, put a +1/+1 counter on The Haunt of Hightower.
diff --git a/forge-gui/res/cardsfolder/t/the_heron_moon.txt b/forge-gui/res/cardsfolder/t/the_heron_moon.txt
index 75af83097ea..03551b1b0c1 100644
--- a/forge-gui/res/cardsfolder/t/the_heron_moon.txt
+++ b/forge-gui/res/cardsfolder/t/the_heron_moon.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Legendary Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ ChangeZoneAll | Cost$ 1 T | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | ChangeType$ Card.BottomLibrary | Origin$ Library | Destination$ Exile | SpellDescription$ Exile the bottom card of target opponent's library.
-T:Mode$ ChangesZoneAll | ValidCards$ Card.OppOwn+nonToken+nonCopiedSpell | Destination$ Exile | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever one or more cards an opponent owns are put into exile, put a release counter on CARDNAME. Then if it has thirteen or more release counters on it, sacrifice it and create a copy of Emrakul, the Promised End. Cast it without paying its mana cost.
+T:Mode$ ChangesZoneAll | ValidCards$ Card.OppOwn+!token+nonCopiedSpell | Destination$ Exile | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever one or more cards an opponent owns are put into exile, put a release counter on CARDNAME. Then if it has thirteen or more release counters on it, sacrifice it and create a copy of Emrakul, the Promised End. Cast it without paying its mana cost.
 SVar:TrigPutCounter:DB$ PutCounter | CounterType$ RELEASE | Defined$ Self | CounterNum$ 1 | SubAbility$ DBSac
 SVar:DBSac:DB$ Sacrifice | SacValid$ Self | RememberSacrificed$ True | ConditionPresent$ Card.Self+counters_GE13_RELEASE | SubAbility$ DBNameCard
 SVar:DBNameCard:DB$ NameCard | Defined$ You | ChooseFromList$ Emrakul; the Promised End | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCast | StackDescription$ None
diff --git a/forge-gui/res/cardsfolder/t/the_master_gallifreys_end.txt b/forge-gui/res/cardsfolder/t/the_master_gallifreys_end.txt
index 0c9a050e6e6..c8db877982d 100644
--- a/forge-gui/res/cardsfolder/t/the_master_gallifreys_end.txt
+++ b/forge-gui/res/cardsfolder/t/the_master_gallifreys_end.txt
@@ -2,7 +2,7 @@ Name:The Master, Gallifrey's End
 ManaCost:2 B R
 Types:Legendary Creature Time Lord Rogue
 PT:4/3
-T:Mode$ ChangesZone | ValidCard$ Creature.Artifact+nonToken+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | OptionalDecider$ You | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Make Them Pay — Whenever a nontoken artifact creature you control dies, you may exile it. If you do, choose an opponent with the most life among your opponents. That player faces a villainous choice — They lose 4 life, or you create a token that's a copy of that card.
+T:Mode$ ChangesZone | ValidCard$ Creature.Artifact+!token+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | OptionalDecider$ You | Execute$ TrigExile | TriggerZones$ Battlefield | TriggerDescription$ Make Them Pay — Whenever a nontoken artifact creature you control dies, you may exile it. If you do, choose an opponent with the most life among your opponents. That player faces a villainous choice — They lose 4 life, or you create a token that's a copy of that card.
 SVar:TrigExile:DB$ ChangeZone | RememberChanged$ True | Origin$ Graveyard | Destination$ Exile | Defined$ TriggeredNewCardLKICopy | SubAbility$ DBChoosePlayer
 SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent+lifeEQX | SubAbility$ DBChoice
 SVar:X:Count$OppGreatestLifeTotal
diff --git a/forge-gui/res/cardsfolder/t/the_mycosynth_gardens.txt b/forge-gui/res/cardsfolder/t/the_mycosynth_gardens.txt
index ff2a76864de..ce40add6a57 100644
--- a/forge-gui/res/cardsfolder/t/the_mycosynth_gardens.txt
+++ b/forge-gui/res/cardsfolder/t/the_mycosynth_gardens.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land Sphere
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
-A:AB$ Clone | Cost$ X T | ValidTgts$ Artifact.YouCtrl+cmcEQX+nonToken | TgtPrompt$ Select target nontoken artifact you control | SpellDescription$ CARDNAME becomes a copy of target nontoken artifact you control with mana value X.
+A:AB$ Clone | Cost$ X T | ValidTgts$ Artifact.YouCtrl+cmcEQX+!token | TgtPrompt$ Select target nontoken artifact you control | SpellDescription$ CARDNAME becomes a copy of target nontoken artifact you control with mana value X.
 SVar:X:Count$xPaid
 DeckHints:Type$Artifact
 Oracle:{T}: Add {C}.\n{1}, {T}: Add one mana of any color.\n{X}, {T}: The Mycosynth Gardens becomes a copy of target nontoken artifact you control with mana value X.
diff --git a/forge-gui/res/cardsfolder/t/the_prydwen_steel_flagship.txt b/forge-gui/res/cardsfolder/t/the_prydwen_steel_flagship.txt
index 35a47ca88e1..1af82eec053 100644
--- a/forge-gui/res/cardsfolder/t/the_prydwen_steel_flagship.txt
+++ b/forge-gui/res/cardsfolder/t/the_prydwen_steel_flagship.txt
@@ -4,7 +4,7 @@ Types:Legendary Artifact Vehicle
 PT:6/6
 K:Flying
 K:Crew:2
-T:Mode$ ChangesZone | ValidCard$ Artifact.nonToken+Other+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken artifact you control enters, create a 2/2 white Human Knight creature token with "This creature gets +2/+2 as long as an artifact entered the battlefield under your control this turn."
+T:Mode$ ChangesZone | ValidCard$ Artifact.!token+Other+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken artifact you control enters, create a 2/2 white Human Knight creature token with "This creature gets +2/+2 as long as an artifact entered the battlefield under your control this turn."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_2_2_human_knight_artifact_pump | TokenOwner$ You
 DeckHas:Ability$Token
 DeckHints:Type$Human|Knight
diff --git a/forge-gui/res/cardsfolder/t/the_skullspore_nexus.txt b/forge-gui/res/cardsfolder/t/the_skullspore_nexus.txt
index c29ae9b12ea..95c3a627897 100644
--- a/forge-gui/res/cardsfolder/t/the_skullspore_nexus.txt
+++ b/forge-gui/res/cardsfolder/t/the_skullspore_nexus.txt
@@ -3,7 +3,7 @@ ManaCost:6 G G
 Types:Legendary Artifact
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ CARDNAME costs {X} less to cast, where X is the greatest power among creatures you control.
 SVar:X:Count$Valid Creature.YouCtrl$GreatestPower
-T:Mode$ ChangesZoneAll | ValidCards$ Creature.nonToken+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever one or more nontoken creatures you control die, create a green Fungus Dinosaur creature token with base power and toughness each equal to the total power of those creatures.
+T:Mode$ ChangesZoneAll | ValidCards$ Creature.!token+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever one or more nontoken creatures you control die, create a green Fungus Dinosaur creature token with base power and toughness each equal to the total power of those creatures.
 SVar:TrigToken:DB$ Token | TokenScript$ g_x_x_fungus_dinosaur | TokenPower$ Z | TokenToughness$ Z
 SVar:Z:TriggerObjectsCards$CardPower
 A:AB$ Pump | Cost$ 2 T | NumAtt$ Double | ValidTgts$ Creature | StackDescription$ REP target creature_{c:Targeted} | SpellDescription$ Double target creature's power until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/the_war_doctor.txt b/forge-gui/res/cardsfolder/t/the_war_doctor.txt
index ae2c46fa837..e6e8ef4abe5 100644
--- a/forge-gui/res/cardsfolder/t/the_war_doctor.txt
+++ b/forge-gui/res/cardsfolder/t/the_war_doctor.txt
@@ -3,7 +3,7 @@ ManaCost:2 R W
 Types:Legendary Creature Time Lord Doctor
 PT:3/5
 T:Mode$ PhaseOutAll | ValidCards$ Permanent.phasedOutOther | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever one or more other permanents phase out and whenever one or more other cards are put into exile from anywhere, put a time counter on CARDNAME.
-T:Mode$ ChangesZoneAll | ValidCards$ Card.Other+nonToken+!copiedSpell | Origin$ Any | Destination$ Exile | TriggerZones$ Battlefield | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever one or more other permanents phase out and whenever one or more other cards are put into exile from anywhere, put a time counter on CARDNAME.
+T:Mode$ ChangesZoneAll | ValidCards$ Card.Other+!token+!copiedSpell | Origin$ Any | Destination$ Exile | TriggerZones$ Battlefield | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever one or more other permanents phase out and whenever one or more other cards are put into exile from anywhere, put a time counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | CounterType$ TIME
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME attacks, it deals damage equal to the number of time counters on it to any target. If a creature dealt damage this way would die this turn, exile it instead.
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | DamageSource$ TriggeredAttackerLKICopy | NumDmg$ Count$CardCounters.TIME | RememberDamaged$ True | ReplaceDyingDefined$ Remembered.Creature | SubAbility$ DBCleanup
diff --git a/forge-gui/res/cardsfolder/t/the_war_games.txt b/forge-gui/res/cardsfolder/t/the_war_games.txt
index 7733282b951..cb31f4ecdef 100644
--- a/forge-gui/res/cardsfolder/t/the_war_games.txt
+++ b/forge-gui/res/cardsfolder/t/the_war_games.txt
@@ -6,7 +6,7 @@ SVar:DBTokens:DB$ Token | TokenAmount$ 3 | TokenTapped$ True | TokenScript$ w_1_
 SVar:DBGoad:DB$ Goad | Defined$ Remembered | Duration$ AsLongAsInPlay | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:DBPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.Warrior | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each Warrior creature.
-SVar:DBMayExile:DB$ ImmediateTrigger | Execute$ TrigExileAll | UnlessCost$ Exile<1/Creature.nonToken> | UnlessPayer$ You | UnlessSwitched$ True | SpellDescription$ You may exile a nontoken creature you control. When you do, exile all Warriors.
+SVar:DBMayExile:DB$ ImmediateTrigger | Execute$ TrigExileAll | UnlessCost$ Exile<1/Creature.!token> | UnlessPayer$ You | UnlessSwitched$ True | SpellDescription$ You may exile a nontoken creature you control. When you do, exile all Warriors.
 SVar:TrigExileAll:DB$ ChangeZoneAll | ChangeType$ Warrior | Origin$ Battlefield | Destination$ Exile
 DeckHas:Ability$Token & Type$Warrior
 Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after IV.)\nI — Each player creates three tapped 1/1 white Warrior creature tokens. The tokens are goaded for as long as The War Games remains on the battlefield.\nII, III — Put a +1/+1 counter on each Warrior creature.\nIV — You may exile a nontoken creature you control. When you do, exile all Warriors.
diff --git a/forge-gui/res/cardsfolder/t/theoretical_duplication.txt b/forge-gui/res/cardsfolder/t/theoretical_duplication.txt
index 7dd3bead7db..6e590dd2e76 100644
--- a/forge-gui/res/cardsfolder/t/theoretical_duplication.txt
+++ b/forge-gui/res/cardsfolder/t/theoretical_duplication.txt
@@ -2,7 +2,7 @@ Name:Theoretical Duplication
 ManaCost:2 U
 Types:Instant
 A:SP$ Effect | Triggers$ CreatureETB | SpellDescription$ Whenever a nontoken creature enters under an opponent's control this turn, create a token that's a copy of that creature.
-SVar:CreatureETB:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken+OppCtrl | TriggerZones$ Command | Execute$ TrigCopy | TriggerDescription$ Whenever a nontoken creature enters under an opponent's control this turn, create a token that's a copy of that creature.
+SVar:CreatureETB:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.!token+OppCtrl | TriggerZones$ Command | Execute$ TrigCopy | TriggerDescription$ Whenever a nontoken creature enters under an opponent's control this turn, create a token that's a copy of that creature.
 SVar:TrigCopy:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy | Controller$ You
 DeckHas:Ability$Token
 Oracle:Whenever a nontoken creature enters under an opponent's control this turn, create a token that's a copy of that creature.
diff --git a/forge-gui/res/cardsfolder/t/thieves_auction.txt b/forge-gui/res/cardsfolder/t/thieves_auction.txt
index a12f2d7cd08..fa2fe231edc 100644
--- a/forge-gui/res/cardsfolder/t/thieves_auction.txt
+++ b/forge-gui/res/cardsfolder/t/thieves_auction.txt
@@ -1,7 +1,7 @@
 Name:Thieves' Auction
 ManaCost:4 R R R
 Types:Sorcery
-A:SP$ ChangeZoneAll | ChangeType$ Permanent.nonToken | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBRepeatChoose | StackDescription$ SpellDescription | SpellDescription$ Exile all nontoken permanents. Starting with you, each player chooses one of the exiled cards and puts it onto the battlefield tapped under their control. Repeat this process until all cards exiled this way have been chosen.
+A:SP$ ChangeZoneAll | ChangeType$ Permanent.!token | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBRepeatChoose | StackDescription$ SpellDescription | SpellDescription$ Exile all nontoken permanents. Starting with you, each player chooses one of the exiled cards and puts it onto the battlefield tapped under their control. Repeat this process until all cards exiled this way have been chosen.
 SVar:DBRepeatChoose:DB$ Repeat | RepeatSubAbility$ DBRepeat | RepeatDefined$ Remembered | RepeatPresent$ Card | StackDescription$ None
 SVar:DBRepeat:DB$ RepeatEach | StartingWith$ You | RepeatPlayers$ Player | RepeatSubAbility$ DBChoose
 SVar:DBChoose:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Card.IsRemembered | ForgetChosen$ True | ChoiceZone$ Exile | SubAbility$ DBGainControl
diff --git a/forge-gui/res/cardsfolder/t/thopter_foundry.txt b/forge-gui/res/cardsfolder/t/thopter_foundry.txt
index 85f55ea634a..14b50ed9897 100644
--- a/forge-gui/res/cardsfolder/t/thopter_foundry.txt
+++ b/forge-gui/res/cardsfolder/t/thopter_foundry.txt
@@ -1,7 +1,7 @@
 Name:Thopter Foundry
 ManaCost:WB U
 Types:Artifact
-A:AB$ Token | Cost$ 1 Sac<1/Artifact.nonToken/nontoken artifact> | TokenAmount$ 1 | TokenScript$ u_1_1_a_thopter_flying | TokenOwner$ You | SubAbility$ DBGainLife | SpellDescription$ Create a 1/1 blue Thopter artifact creature token with flying.
+A:AB$ Token | Cost$ 1 Sac<1/Artifact.!token/nontoken artifact> | TokenAmount$ 1 | TokenScript$ u_1_1_a_thopter_flying | TokenOwner$ You | SubAbility$ DBGainLife | SpellDescription$ Create a 1/1 blue Thopter artifact creature token with flying.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1 | SpellDescription$ You gain 1 life.
 SVar:AIPreference:SacCost$Permanent.namedSword of the Meek
 DeckHas:Ability$Token|LifeGain
diff --git a/forge-gui/res/cardsfolder/t/thraben_watcher.txt b/forge-gui/res/cardsfolder/t/thraben_watcher.txt
index d5c6567f328..da03abd1bfc 100644
--- a/forge-gui/res/cardsfolder/t/thraben_watcher.txt
+++ b/forge-gui/res/cardsfolder/t/thraben_watcher.txt
@@ -4,6 +4,6 @@ Types:Creature Angel
 PT:2/2
 K:Flying
 K:Vigilance
-S:Mode$ Continuous | Affected$ Creature.nonToken+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Vigilance | Description$ Other nontoken creatures you control get +1/+1 and have vigilance.
+S:Mode$ Continuous | Affected$ Creature.!token+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Vigilance | Description$ Other nontoken creatures you control get +1/+1 and have vigilance.
 SVar:PlayMain1:TRUE
 Oracle:Flying, vigilance\nOther nontoken creatures you control get +1/+1 and have vigilance.
diff --git a/forge-gui/res/cardsfolder/t/timothar_baron_of_bats.txt b/forge-gui/res/cardsfolder/t/timothar_baron_of_bats.txt
index dee93d0d856..d947aac8861 100644
--- a/forge-gui/res/cardsfolder/t/timothar_baron_of_bats.txt
+++ b/forge-gui/res/cardsfolder/t/timothar_baron_of_bats.txt
@@ -3,7 +3,7 @@ ManaCost:4 B B
 Types:Legendary Creature Vampire Noble
 PT:4/4
 K:Ward:Discard<1/Card>
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Vampire.Other+nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken Vampire you control dies, you may pay {1} and exile it. If you do, create a 1/1 black Bat creature token with flying. It gains "When this creature deals combat damage to a player, sacrifice it and return the exiled card to the battlefield tapped."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Vampire.Other+!token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another nontoken Vampire you control dies, you may pay {1} and exile it. If you do, create a 1/1 black Bat creature token with flying. It gains "When this creature deals combat damage to a player, sacrifice it and return the exiled card to the battlefield tapped."
 SVar:TrigToken:AB$ Token | Cost$ 1 ExileAnyGrave<1/Card.TriggeredNewCard> | TokenRemembered$ ExiledCards | TokenScript$ b_1_1_bat_flying | ImprintTokens$ True | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Imprinted | Duration$ Permanent | Triggers$ CDTrigger
 SVar:CDTrigger:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ When this creature deals combat damage to a player, sacrifice it and return the exiled card to the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/t/titania_voice_of_gaea_titania_gaea_incarnate.txt b/forge-gui/res/cardsfolder/t/titania_voice_of_gaea_titania_gaea_incarnate.txt
index 4cda57bda05..6f1535e46a7 100644
--- a/forge-gui/res/cardsfolder/t/titania_voice_of_gaea_titania_gaea_incarnate.txt
+++ b/forge-gui/res/cardsfolder/t/titania_voice_of_gaea_titania_gaea_incarnate.txt
@@ -3,7 +3,7 @@ ManaCost:1 G G
 Types:Legendary Creature Elemental
 PT:3/4
 K:Reach
-T:Mode$ ChangesZoneAll | ValidCards$ Land.YouOwn+nonToken | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigLifegain | TriggerDescription$ Whenever one or more land cards are put into your graveyard from anywhere, you gain 2 life.
+T:Mode$ ChangesZoneAll | ValidCards$ Land.YouOwn+!token | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigLifegain | TriggerDescription$ Whenever one or more land cards are put into your graveyard from anywhere, you gain 2 life.
 SVar:TrigLifegain:DB$ GainLife | LifeAmount$ 2
 T:Mode$ Phase | Phase$ Upkeep | CheckSVar$ X | SVarCompare$ GE4 | IsPresent$ Card.Self+YouOwn | IsPresent2$ Land.YouCtrl+YouOwn+namedArgoth; Sanctum of Nature | ValidPlayer$ You | Execute$ Meld | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, if there are four or more land cards in your graveyard and you both own and control CARDNAME and a land named Argoth, Sanctum of Nature, exile them, then meld them into Titania, Gaea Incarnate.
 SVar:Meld:DB$ Meld | Name$ Titania, Gaea Incarnate | Primary$ Titania, Voice of Gaea | Secondary$ Argoth, Sanctum of Nature | SecondaryType$ Land
diff --git a/forge-gui/res/cardsfolder/t/tobias_doomed_conqueror.txt b/forge-gui/res/cardsfolder/t/tobias_doomed_conqueror.txt
index c18531a3294..c718110450f 100644
--- a/forge-gui/res/cardsfolder/t/tobias_doomed_conqueror.txt
+++ b/forge-gui/res/cardsfolder/t/tobias_doomed_conqueror.txt
@@ -5,6 +5,6 @@ PT:3/2
 K:Flash
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME dies, create a 2/2 black Zombie creature token for each nontoken creature you controlled that died this turn.
 SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ b_2_2_zombie | TokenOwner$ You
-SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.nonToken+YouCtrl
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.!token+YouCtrl
 DeckHas:Ability$Token
 Oracle:Flash\nWhen Tobias, Doomed Conqueror dies, create a 2/2 black Zombie creature token for each nontoken creature you controlled that died this turn.
diff --git a/forge-gui/res/cardsfolder/t/totentanz_swarm_piper.txt b/forge-gui/res/cardsfolder/t/totentanz_swarm_piper.txt
index 4f74dcde2a9..b56a5d2055b 100644
--- a/forge-gui/res/cardsfolder/t/totentanz_swarm_piper.txt
+++ b/forge-gui/res/cardsfolder/t/totentanz_swarm_piper.txt
@@ -2,7 +2,7 @@ Name:Totentanz, Swarm Piper
 ManaCost:1 B R
 Types:Legendary Creature Human Warlock Bard
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, create a 1/1 black Rat creature token with "This creature can't block."
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+!token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, create a 1/1 black Rat creature token with "This creature can't block."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_rat_noblock | TokenOwner$ You
 A:AB$ Pump | Cost$ 1 B | ValidTgts$ Rat.attacking | TgtPrompt$ Select target attacking Rat | KW$ Deathtouch | SpellDescription$ Target attacking Rat gains deathtouch until end of turn.
 DeckHas:Ability$Token & Type$Rat
diff --git a/forge-gui/res/cardsfolder/t/trial_of_a_time_lord.txt b/forge-gui/res/cardsfolder/t/trial_of_a_time_lord.txt
index 67aff6e3c79..9a73d6bb34a 100644
--- a/forge-gui/res/cardsfolder/t/trial_of_a_time_lord.txt
+++ b/forge-gui/res/cardsfolder/t/trial_of_a_time_lord.txt
@@ -2,7 +2,7 @@ Name:Trial of a Time Lord
 ManaCost:1 W W
 Types:Enchantment Saga
 K:Chapter:4:DBExile,DBExile,DBExile,DBVote
-SVar:DBExile:DB$ ChangeZone | ValidTgts$ Creature.nonToken+OppCtrl | TgtPrompt$ Choose target nontoken creature an opponent controls | Origin$ Battlefield | Destination$ Exile | Duration$ UntilHostLeavesPlay | SpellDescription$ Exile target nontoken creature an opponent controls until CARDNAME leaves the battlefield.
+SVar:DBExile:DB$ ChangeZone | ValidTgts$ Creature.!token+OppCtrl | TgtPrompt$ Choose target nontoken creature an opponent controls | Origin$ Battlefield | Destination$ Exile | Duration$ UntilHostLeavesPlay | SpellDescription$ Exile target nontoken creature an opponent controls until CARDNAME leaves the battlefield.
 SVar:DBVote:DB$ Vote | Defined$ Player | VoteType$ Innocent,Guilty | VoteInnocent$ DBInnocent | Tied$ DBInnocent | VoteGuilty$ DBGuilty | SpellDescription$ Starting with you, each player votes for innocent or guilty. If guilty gets more votes, the owner of each card exiled with CARDNAME puts that card on the bottom of their library.
 SVar:DBInnocent:DB$ Effect
 SVar:DBGuilty:DB$ ChangeZoneAll | ChangeType$ Card.ExiledWithSource | Origin$ Exile | Destination$ Library | LibraryPosition$ -1
diff --git a/forge-gui/res/cardsfolder/t/turntimber_sower.txt b/forge-gui/res/cardsfolder/t/turntimber_sower.txt
index e9804b83a0e..5fb77087997 100644
--- a/forge-gui/res/cardsfolder/t/turntimber_sower.txt
+++ b/forge-gui/res/cardsfolder/t/turntimber_sower.txt
@@ -2,7 +2,7 @@ Name:Turntimber Sower
 ManaCost:2 G
 Types:Creature Elf Druid
 PT:3/3
-T:Mode$ ChangesZoneAll | ValidCards$ Land.YouOwn+nonToken | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever one or more land cards are put into your graveyard from anywhere, create a 0/1 green Plant creature token.
+T:Mode$ ChangesZoneAll | ValidCards$ Land.YouOwn+!token | Origin$ Any | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever one or more land cards are put into your graveyard from anywhere, create a 0/1 green Plant creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_0_1_plant | TokenOwner$ You
 A:AB$ ChangeZone | Cost$ G Sac<3/Creature> | TgtPrompt$ Choose target land card in your graveyard | ValidTgts$ Land.YouCtrl | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return target land card from your graveyard to your hand.
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/t/twining_twins_swift_spiral.txt b/forge-gui/res/cardsfolder/t/twining_twins_swift_spiral.txt
index 5f7a25bc523..18edbcbb2bb 100644
--- a/forge-gui/res/cardsfolder/t/twining_twins_swift_spiral.txt
+++ b/forge-gui/res/cardsfolder/t/twining_twins_swift_spiral.txt
@@ -13,7 +13,7 @@ ALTERNATE
 Name:Swift Spiral
 ManaCost:1 W
 Types:Instant Adventure
-A:SP$ ChangeZone | ValidTgts$ Creature.nonToken | TgtPrompt$ Select target nontoken creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig | RememberChanged$ True | StackDescription$ REP target nontoken creature_{c:Targeted} | SpellDescription$ Exile target nontoken creature. Return it to the battlefield under its owner's control at the beginning of the next end step.
+A:SP$ ChangeZone | ValidTgts$ Creature.!token | TgtPrompt$ Select target nontoken creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig | RememberChanged$ True | StackDescription$ REP target nontoken creature_{c:Targeted} | SpellDescription$ Exile target nontoken creature. Return it to the battlefield under its owner's control at the beginning of the next end step.
 SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ Remembered | SubAbility$ DBCleanup | TriggerDescription$ Return it to the battlefield under its owner's control at the beginning of the next end step.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ DelayTriggerRememberedLKI | Origin$ Exile | Destination$ Battlefield
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/u/ulder_ravengard_marshal.txt b/forge-gui/res/cardsfolder/u/ulder_ravengard_marshal.txt
index 8b0d5f823bf..88ab1ec12b9 100644
--- a/forge-gui/res/cardsfolder/u/ulder_ravengard_marshal.txt
+++ b/forge-gui/res/cardsfolder/u/ulder_ravengard_marshal.txt
@@ -3,8 +3,8 @@ ManaCost:1 R W
 Types:Legendary Creature Human Noble Soldier
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpEOT | TriggerDescription$ When CARDNAME enters, another target nontoken creature you control gains double team until end of turn.
-SVar:TrigPumpEOT:DB$ Pump | ValidTgts$ Creature.YouCtrl+nonToken+Other | TgtPrompt$ Select another target nontoken creature you control | KW$ Double team
+SVar:TrigPumpEOT:DB$ Pump | ValidTgts$ Creature.YouCtrl+!token+Other | TgtPrompt$ Select another target nontoken creature you control | KW$ Double team
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigConjure | TriggerDescription$ Whenever NICKNAME attacks, conjure a duplicate of another target nontoken attacking creature into your hand.
-SVar:TrigConjure:DB$ MakeCard | ValidTgts$ Creature.attacking+Other+nonToken | TgtPrompt$ Select another target nontoken creature that is attacking | Conjure$ True | DefinedName$ Targeted | Zone$ Hand
+SVar:TrigConjure:DB$ MakeCard | ValidTgts$ Creature.attacking+Other+!token | TgtPrompt$ Select another target nontoken creature that is attacking | Conjure$ True | DefinedName$ Targeted | Zone$ Hand
 SVar:HasAttackEffect:TRUE
 Oracle:When Ulder Ravengard, Marshal enters, another target nontoken creature you control gains double team until end of turn.\nWhenever Ulder Ravengard attacks, conjure a duplicate of another target nontoken attacking creature into your hand.
diff --git a/forge-gui/res/cardsfolder/u/ulvenwald_mysteries.txt b/forge-gui/res/cardsfolder/u/ulvenwald_mysteries.txt
index 0f0917ba7fd..1e3ff909ba3 100644
--- a/forge-gui/res/cardsfolder/u/ulvenwald_mysteries.txt
+++ b/forge-gui/res/cardsfolder/u/ulvenwald_mysteries.txt
@@ -1,7 +1,7 @@
 Name:Ulvenwald Mysteries
 ManaCost:2 G
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigInvestigate | TriggerDescription$ Whenever a nontoken creature you control dies, investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+!token | TriggerZones$ Battlefield | Execute$ TrigInvestigate | TriggerDescription$ Whenever a nontoken creature you control dies, investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
 SVar:TrigInvestigate:DB$ Investigate
 T:Mode$ Sacrificed | ValidCard$ Clue.YouCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice a Clue, create a 1/1 white Human Soldier creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_human_soldier | TokenOwner$ You
diff --git a/forge-gui/res/cardsfolder/u/uncivil_unrest.txt b/forge-gui/res/cardsfolder/u/uncivil_unrest.txt
index 9c74e243fd6..f13b605d3dd 100644
--- a/forge-gui/res/cardsfolder/u/uncivil_unrest.txt
+++ b/forge-gui/res/cardsfolder/u/uncivil_unrest.txt
@@ -1,7 +1,7 @@
 Name:Uncivil Unrest
 ManaCost:4 R
 Types:Enchantment
-S:Mode$ Continuous | Affected$ Creature.nonToken+YouCtrl | AddKeyword$ Riot | Description$ Nontoken creatures you control have riot. (They enter with your choice of a +1/+1 counter or haste.)
+S:Mode$ Continuous | Affected$ Creature.!token+YouCtrl | AddKeyword$ Riot | Description$ Nontoken creatures you control have riot. (They enter with your choice of a +1/+1 counter or haste.)
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.YouCtrl+counters_GE1_P1P1 | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ If a creature you control with a +1/+1 counter on it would deal damage to a permanent or player, it deals double that damage instead.
 SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
diff --git a/forge-gui/res/cardsfolder/u/undead_alchemist.txt b/forge-gui/res/cardsfolder/u/undead_alchemist.txt
index 423bdaaa638..53245515a7f 100644
--- a/forge-gui/res/cardsfolder/u/undead_alchemist.txt
+++ b/forge-gui/res/cardsfolder/u/undead_alchemist.txt
@@ -5,7 +5,7 @@ PT:4/2
 R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.Zombie+YouCtrl | ValidTarget$ Player | ReplaceWith$ Mill | IsCombat$ True | ExecuteMode$ PerTarget | Description$ If a Zombie you control would deal combat damage to a player, instead that player mills that many cards.
 SVar:Mill:DB$ Mill | Defined$ ReplacedTarget | NumCards$ X
 SVar:X:ReplaceCount$DamageAmount
-T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+OppOwn | Origin$ Library | Destination$ Graveyard | Execute$ ExileAndToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature card is put into an opponent's graveyard from their library, exile that card and create a 2/2 black Zombie creature token.
+T:Mode$ ChangesZone | ValidCard$ Creature.!token+OppOwn | Origin$ Library | Destination$ Graveyard | Execute$ ExileAndToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature card is put into an opponent's graveyard from their library, exile that card and create a 2/2 black Zombie creature token.
 SVar:ExileAndToken:DB$ ChangeZone | Defined$ TriggeredCardLKICopy | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenScript$ b_2_2_zombie | TokenOwner$ You | TokenAmount$ 1
 DeckHas:Ability$Token
diff --git a/forge-gui/res/cardsfolder/u/unexpected_allies.txt b/forge-gui/res/cardsfolder/u/unexpected_allies.txt
index d949829e449..a7021af00fd 100644
--- a/forge-gui/res/cardsfolder/u/unexpected_allies.txt
+++ b/forge-gui/res/cardsfolder/u/unexpected_allies.txt
@@ -1,7 +1,7 @@
 Name:Unexpected Allies
 ManaCost:1 R
 Types:Sorcery
-A:SP$ Pump | ValidTgts$ Creature.YouCtrl+nonToken | TgtPrompt$ Select target nontoken creature you control | KW$ Double team | NumAtt$ 2 | SubAbility$ TrigEffect | SpellDescription$ Target nontoken creature you control gets +2/+0 and gains double team until end of turn. It also gains first strike until end of turn if it has the same name as another creature you control or a creature card in your graveyard.
+A:SP$ Pump | ValidTgts$ Creature.YouCtrl+!token | TgtPrompt$ Select target nontoken creature you control | KW$ Double team | NumAtt$ 2 | SubAbility$ TrigEffect | SpellDescription$ Target nontoken creature you control gets +2/+0 and gains double team until end of turn. It also gains first strike until end of turn if it has the same name as another creature you control or a creature card in your graveyard.
 SVar:TrigEffect:DB$ Pump | ConditionCheckSVar$ X | Defined$ Targeted | KW$ First Strike
 SVar:X:Count$Valid Creature.NotDefinedTargeted+YouCtrl+sharesNameWith Targeted/Plus.Y
 SVar:Y:Count$ValidGraveyard Creature.YouOwn+sharesNameWith Targeted
diff --git a/forge-gui/res/cardsfolder/u/unhallowed_pact.txt b/forge-gui/res/cardsfolder/u/unhallowed_pact.txt
index 9c87e9f8d9f..86c89867dd6 100644
--- a/forge-gui/res/cardsfolder/u/unhallowed_pact.txt
+++ b/forge-gui/res/cardsfolder/u/unhallowed_pact.txt
@@ -2,7 +2,7 @@ Name:Unhallowed Pact
 ManaCost:2 B
 Types:Enchantment Aura
 K:Enchant creature
-A:SP$ Attach | ValidTgts$ Creature | AITgts$ Creature.nonToken | AILogic$ Pump
+A:SP$ Attach | ValidTgts$ Creature | AITgts$ Creature.!token | AILogic$ Pump
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigChange | TriggerDescription$ When enchanted creature dies, return that card to the battlefield under your control.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Defined$ TriggeredNewCardLKICopy
 Oracle:Enchant creature\nWhen enchanted creature dies, return that card to the battlefield under your control.
diff --git a/forge-gui/res/cardsfolder/v/valentin_dean_of_the_vein_lisette_dean_of_the_root.txt b/forge-gui/res/cardsfolder/v/valentin_dean_of_the_vein_lisette_dean_of_the_root.txt
index 664b6636c64..d7c29528930 100644
--- a/forge-gui/res/cardsfolder/v/valentin_dean_of_the_vein_lisette_dean_of_the_root.txt
+++ b/forge-gui/res/cardsfolder/v/valentin_dean_of_the_vein_lisette_dean_of_the_root.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Vampire Warlock
 PT:1/1
 K:Menace
 K:Lifelink
-R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidLKI$ Card.Creature+nonToken+OppCtrl | ReplaceWith$ Exile | Description$ If a nontoken creature an opponent controls would die, exile it instead. When you do, you may pay {2}. If you do, create a 1/1 black and green Pest creature token with "When this creature dies, you gain 1 life."
+R:Event$ Moved | ActiveZones$ Battlefield | Origin$ Battlefield | Destination$ Graveyard | ValidLKI$ Card.Creature+!token+OppCtrl | ReplaceWith$ Exile | Description$ If a nontoken creature an opponent controls would die, exile it instead. When you do, you may pay {2}. If you do, create a 1/1 black and green Pest creature token with "When this creature dies, you gain 1 life."
 SVar:Exile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard | SubAbility$ DBImmediateTrigger
 SVar:DBImmediateTrigger:DB$ ImmediateTrigger | Execute$ TrigToken | TriggerDescription$ If a nontoken creature an opponent controls would die, exile it instead. When you do, you may pay {2}. If you do, create a 1/1 black and green Pest creature token with "When this creature dies, you gain 1 life."
 SVar:TrigToken:AB$ Token | Cost$ 2 | TokenAmount$ 1 | TokenScript$ bg_1_1_pest_lifegain | TokenOwner$ You
diff --git a/forge-gui/res/cardsfolder/v/valgavoth_terror_eater.txt b/forge-gui/res/cardsfolder/v/valgavoth_terror_eater.txt
index 8b98aa759de..94412457afd 100644
--- a/forge-gui/res/cardsfolder/v/valgavoth_terror_eater.txt
+++ b/forge-gui/res/cardsfolder/v/valgavoth_terror_eater.txt
@@ -5,7 +5,7 @@ PT:9/9
 K:Flying
 K:Lifelink
 K:Ward:Sac<3/Permanent.nonLand/nonland permanent>
-R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Graveyard | ValidLKI$ Card.nonToken+YouDontCtrl+OppOwn | ReplaceWith$ Exile | Description$ If a card you didn't control would be put into an opponent's graveyard from anywhere, exile it instead.
+R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Graveyard | ValidLKI$ Card.!token+YouDontCtrl+OppOwn | ReplaceWith$ Exile | Description$ If a card you didn't control would be put into an opponent's graveyard from anywhere, exile it instead.
 SVar:Exile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard
 S:Mode$ Continuous | Condition$ PlayerTurn | MayPlay$ True | Affected$ Card.ExiledWithSource | AffectedZone$ Exile | MayPlayAltManaCost$ PayLife<ConvertedManaCost> | Description$ During your turn, you may play cards exiled with NICKNAME. If you cast a spell this way, pay life equal to its mana value rather than pay its mana cost.
 Oracle:Flying, lifelink\nWard—Sacrifice three nonland permanents.\nIf a card you didn't control would be put into an opponent's graveyard from anywhere, exile it instead.\nDuring your turn, you may play cards exiled with Valgavoth. If you cast a spell this way, pay life equal to its mana value rather than pay its mana cost.
diff --git a/forge-gui/res/cardsfolder/v/valkyries_call.txt b/forge-gui/res/cardsfolder/v/valkyries_call.txt
index 52d36c7f925..d6205f2282e 100644
--- a/forge-gui/res/cardsfolder/v/valkyries_call.txt
+++ b/forge-gui/res/cardsfolder/v/valkyries_call.txt
@@ -1,7 +1,7 @@
 Name:Valkyrie's Call
 ManaCost:3 W W
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonToken+nonAngel+YouCtrl | TriggerZones$ Battlefield | Execute$ DBChangeZone | TriggerDescription$ Whenever a nontoken, non-Angel creature you control dies, return that card to the battlefield under its owner's control with a +1/+1 counter on it. It has flying and is an Angel in addition to its other types.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.!token+nonAngel+YouCtrl | TriggerZones$ Battlefield | Execute$ DBChangeZone | TriggerDescription$ Whenever a nontoken, non-Angel creature you control dies, return that card to the battlefield under its owner's control with a +1/+1 counter on it. It has flying and is an Angel in addition to its other types.
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ TriggeredCard | WithCountersType$ P1P1 | StaticEffect$ Animate
 SVar:Animate:Mode$ Continuous | Affected$ Card.IsRemembered | AddType$ Angel | AddKeyword$ Flying
 Oracle:Whenever a nontoken, non-Angel creature you control dies, return that card to the battlefield under its owner's control with a +1/+1 counter on it. It has flying and is an Angel in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/v/verdant_succession.txt b/forge-gui/res/cardsfolder/v/verdant_succession.txt
index b53d096ba65..556688878be 100644
--- a/forge-gui/res/cardsfolder/v/verdant_succession.txt
+++ b/forge-gui/res/cardsfolder/v/verdant_succession.txt
@@ -1,7 +1,7 @@
 Name:Verdant Succession
 ManaCost:4 G
 Types:Enchantment
-T:Mode$ ChangesZone | ValidCard$ Creature.Green+nonToken | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigSearch | TriggerDescription$ Whenever a green nontoken creature dies, that creature's controller may search their library for a card with the same name as that creature, put it onto the battlefield, then shuffle.
+T:Mode$ ChangesZone | ValidCard$ Creature.Green+!token | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ TrigSearch | TriggerDescription$ Whenever a green nontoken creature dies, that creature's controller may search their library for a card with the same name as that creature, put it onto the battlefield, then shuffle.
 SVar:TrigSearch:DB$ ChangeZone | DefinedPlayer$ TriggeredCardController | ChangeType$ Triggered.sameName | ChangeNum$ 1 | Origin$ Library | Destination$ Battlefield | Optional$ You | ShuffleNonMandatory$ True
 AI:RemoveDeck:Random
 Oracle:Whenever a green nontoken creature dies, that creature's controller may search their library for a card with the same name as that creature, put it onto the battlefield, then shuffle.
diff --git a/forge-gui/res/cardsfolder/v/vesuvan_mist.txt b/forge-gui/res/cardsfolder/v/vesuvan_mist.txt
index e6b64462df0..6b8f8485395 100644
--- a/forge-gui/res/cardsfolder/v/vesuvan_mist.txt
+++ b/forge-gui/res/cardsfolder/v/vesuvan_mist.txt
@@ -2,7 +2,7 @@ Name:Vesuvan Mist
 ManaCost:1 U
 Types:Instant
 K:Kicker:1 B
-A:SP$ ChangeZone | ValidTgts$ Permanent.nonLand+nonToken | TgtPrompt$ Select target nontoken, nonland permanent | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBConjure | SpellDescription$ Return target nontoken, nonland permanent to its owner's hand.
+A:SP$ ChangeZone | ValidTgts$ Permanent.nonLand+!token | TgtPrompt$ Select target nontoken, nonland permanent | Origin$ Battlefield | Destination$ Hand | SubAbility$ DBConjure | SpellDescription$ Return target nontoken, nonland permanent to its owner's hand.
 SVar:DBConjure:DB$ MakeCard | Condition$ Kicked | Conjure$ True | DefinedName$ Targeted | Zone$ Hand | RememberMade$ True | SubAbility$ DBAnimate | StackDescription$ SpellDescription | SpellDescription$ If this spell was kicked, conjure a duplicate of that card into your hand.
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ SpendAnyMana | Duration$ Perpetual | SubAbility$ DBCleanup | StackDescription$ SpellDescription | SpellDescription$ It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
 SVar:SpendAnyMana:Mode$ ManaConvert | EffectZone$ Stack | ValidPlayer$ You | ValidCard$ Card.Self | ValidSA$ Spell | ManaConversion$ AnyType->AnyColor | Description$ You may spend mana as though it were mana of any color to cast this spell.
diff --git a/forge-gui/res/cardsfolder/v/vile_mutilator.txt b/forge-gui/res/cardsfolder/v/vile_mutilator.txt
index e649c0cee9b..a27e5a99cef 100644
--- a/forge-gui/res/cardsfolder/v/vile_mutilator.txt
+++ b/forge-gui/res/cardsfolder/v/vile_mutilator.txt
@@ -6,6 +6,6 @@ A:SP$ PermanentCreature | Cost$ 5 B B Sac<1/Creature;Enchantment/creature or enc
 K:Flying
 K:Trample
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacrifice | TriggerDescription$ When CARDNAME enters, each opponent sacrifices a nontoken enchantment, then sacrifices a nontoken creature.
-SVar:TrigSacrifice:DB$ Sacrifice | Defined$ Opponent | SacValid$ Enchantment.nonToken | SacMessage$ nontoken enchantment | SubAbility$ DBSacrifice
-SVar:DBSacrifice:DB$ Sacrifice | Defined$ Opponent | SacValid$ Creature.nonToken | SacMessage$ nontoken creature
+SVar:TrigSacrifice:DB$ Sacrifice | Defined$ Opponent | SacValid$ Enchantment.!token | SacMessage$ nontoken enchantment | SubAbility$ DBSacrifice
+SVar:DBSacrifice:DB$ Sacrifice | Defined$ Opponent | SacValid$ Creature.!token | SacMessage$ nontoken creature
 Oracle:As an additional cost to cast this spell, sacrifice a creature or enchantment.\nFlying, trample\nWhen Vile Mutilator enters, each opponent sacrifices a nontoken enchantment, then sacrifices a nontoken creature.
diff --git a/forge-gui/res/cardsfolder/v/vile_redeemer.txt b/forge-gui/res/cardsfolder/v/vile_redeemer.txt
index 510ec7fe2a8..0f641eeea35 100644
--- a/forge-gui/res/cardsfolder/v/vile_redeemer.txt
+++ b/forge-gui/res/cardsfolder/v/vile_redeemer.txt
@@ -6,7 +6,7 @@ K:Devoid
 K:Flash
 T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When you cast this spell, you may pay {C}. If you do, create a 1/1 colorless Eldrazi Scion creature token for each nontoken creature that died under your control this turn. Those tokens have "Sacrifice this creature: Add {C}."
 SVar:TrigToken:AB$ Token | Cost$ C | TokenAmount$ X | TokenScript$ c_1_1_eldrazi_scion_sac | TokenOwner$ You
-SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.nonToken+YouCtrl
+SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.!token+YouCtrl
 DeckHints:Ability$Mana.Colorless
 DeckHas:Ability$Token
 Oracle:Devoid (This card has no color.)\nFlash\nWhen you cast this spell, you may pay {C}. If you do, create a 1/1 colorless Eldrazi Scion creature token for each nontoken creature that died under your control this turn. Those tokens have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/v/viviens_talent.txt b/forge-gui/res/cardsfolder/v/viviens_talent.txt
index bd06169d854..ab0c4ab6385 100644
--- a/forge-gui/res/cardsfolder/v/viviens_talent.txt
+++ b/forge-gui/res/cardsfolder/v/viviens_talent.txt
@@ -5,7 +5,7 @@ K:Enchant planeswalker
 A:SP$ Attach | AILogic$ Pump | ValidTgts$ Planeswalker
 S:Mode$ Continuous | Affected$ Planeswalker.EnchantedBy | AddAbility$ VivienPlus | Description$ Enchanted planeswalker has "[+1]: Look at the top four cards of your library. You may reveal a creature or land card from among them and put it into your hand. Put the rest on the bottom of your library in a random order."
 SVar:VivienPlus:AB$ Dig | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | DigNum$ 4 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Creature,Land | ForceRevealToController$ True | RestRandomOrder$ True | StackDescription$ SpellDescription | SpellDescription$ Look at the top four cards of your library. You may reveal a creature or land card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a nontoken creature you control enters, put a loyalty counter on enchanted planeswalker.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.!token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a nontoken creature you control enters, put a loyalty counter on enchanted planeswalker.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Enchanted | CounterType$ LOYALTY | CounterNum$ 1
 SVar:BuffedBy:Creature
 DeckNeeds:Type$Planeswalker
diff --git a/forge-gui/res/cardsfolder/v/vodalian_tide_mage.txt b/forge-gui/res/cardsfolder/v/vodalian_tide_mage.txt
index b5539d72978..adeb4472d34 100644
--- a/forge-gui/res/cardsfolder/v/vodalian_tide_mage.txt
+++ b/forge-gui/res/cardsfolder/v/vodalian_tide_mage.txt
@@ -2,7 +2,7 @@ Name:Vodalian Tide Mage
 ManaCost:1 G U
 Types:Creature Merfolk Wizard
 PT:3/3
-T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl+nonToken+Other | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ Whenever one or more other nontoken creatures you control deal combat damage to a player, choose one of those creatures. Conjure a duplicate of the chosen creature into your hand.
+T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl+!token+Other | ValidTarget$ Player | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ Whenever one or more other nontoken creatures you control deal combat damage to a player, choose one of those creatures. Conjure a duplicate of the chosen creature into your hand.
 SVar:TrigChoose:DB$ ChooseCard | DefinedCards$ TriggeredSources | Mandatory$ True | SubAbility$ DBConjure
 SVar:DBConjure:DB$ MakeCard | Conjure$ True | DefinedName$ ChosenCard | Zone$ Hand | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
diff --git a/forge-gui/res/cardsfolder/v/voldaren_bloodcaster_bloodbat_summoner.txt b/forge-gui/res/cardsfolder/v/voldaren_bloodcaster_bloodbat_summoner.txt
index 5aa2eb52e17..b743fc71beb 100644
--- a/forge-gui/res/cardsfolder/v/voldaren_bloodcaster_bloodbat_summoner.txt
+++ b/forge-gui/res/cardsfolder/v/voldaren_bloodcaster_bloodbat_summoner.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Vampire Wizard
 PT:2/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+nonToken+YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, create a Blood token. (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self,Creature.Other+!token+YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another nontoken creature you control dies, create a Blood token. (It's an artifact with "{1}, {T}, Discard a card, Sacrifice this artifact: Draw a card.")
 SVar:TrigToken:DB$ Token | TokenScript$ c_a_blood_draw
 T:Mode$ TokenCreated | ValidPlayer$ You | ValidToken$ Blood | IsPresent$ Blood.token+YouCtrl | PresentCompare$ GE5 | Execute$ TrigTransform | TriggerZones$ Battlefield | TriggerDescription$ Whenever you create a Blood token, if you control five or more Blood tokens, transform CARDNAME.
 SVar:TrigTransform:DB$ SetState | Defined$ Self | Mode$ Transform
diff --git a/forge-gui/res/cardsfolder/v/vona_de_iedo_the_antifex.txt b/forge-gui/res/cardsfolder/v/vona_de_iedo_the_antifex.txt
index d4c2683ec99..8f3f5e5083c 100644
--- a/forge-gui/res/cardsfolder/v/vona_de_iedo_the_antifex.txt
+++ b/forge-gui/res/cardsfolder/v/vona_de_iedo_the_antifex.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Vampire Cleric Knight
 PT:4/2
 K:Menace
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy target nonland, nontoken permanent an opponent controls. Then you may discard a card. If you do, conjure a duplicate of that permanent into your hand, and the duplicate perpetually gains "Mana of any type can be spent to cast this spell."
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Permanent.OppCtrl+nonland+nonToken | TgtPrompt$ Select target nonland, nontoken permanent an opponent controls | RememberTargets$ True | SubAbility$ DBConjure
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Permanent.OppCtrl+nonland+!token | TgtPrompt$ Select target nonland, nontoken permanent an opponent controls | RememberTargets$ True | SubAbility$ DBConjure
 SVar:DBConjure:DB$ MakeCard | UnlessCost$ Discard<1/Card> | UnlessPayer$ You | UnlessSwitched$ True | Conjure$ True | DefinedName$ Remembered | Zone$ Hand | Amount$ 1 | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ SpendAnyMana | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:SpendAnyMana:Mode$ ManaConvert | EffectZone$ Stack | ValidPlayer$ You | ValidCard$ Card.Self | ValidSA$ Spell | ManaConversion$ AnyType->AnyType | Description$ Mana of any type can be spent to cast this spell.
diff --git a/forge-gui/res/cardsfolder/v/vraska_the_silencer.txt b/forge-gui/res/cardsfolder/v/vraska_the_silencer.txt
index 98951bc98f6..bed202183fd 100644
--- a/forge-gui/res/cardsfolder/v/vraska_the_silencer.txt
+++ b/forge-gui/res/cardsfolder/v/vraska_the_silencer.txt
@@ -3,7 +3,7 @@ ManaCost:1 B G
 Types:Legendary Creature Gorgon Assassin
 PT:3/3
 K:Deathtouch
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ Whenever a nontoken creature an opponent controls dies, you may pay {1}. If you do, return that card to the battlefield tapped under your control. It's a Treasure artifact with "{T}, Sacrifice this artifact: Add one mana of any color," and it loses all other card types.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl+!token | TriggerZones$ Battlefield | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ Whenever a nontoken creature an opponent controls dies, you may pay {1}. If you do, return that card to the battlefield tapped under your control. It's a Treasure artifact with "{T}, Sacrifice this artifact: Add one mana of any color," and it loses all other card types.
 SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 1 | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Tapped$ True | StaticEffect$ Animate
 SVar:Animate:Mode$ Continuous | Affected$ Card.IsRemembered | AddType$ Artifact & Treasure | RemoveCardTypes$ True | AddAbility$ TreasureSac
 SVar:TreasureSac:AB$ Mana | Cost$ T Sac<1/CARDNAME/this artifact> | Produced$ Any | SpellDescription$ Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/v/vulturous_zombie.txt b/forge-gui/res/cardsfolder/v/vulturous_zombie.txt
index 86501931898..7b169c85eca 100644
--- a/forge-gui/res/cardsfolder/v/vulturous_zombie.txt
+++ b/forge-gui/res/cardsfolder/v/vulturous_zombie.txt
@@ -3,6 +3,6 @@ ManaCost:3 B G
 Types:Creature Plant Zombie
 PT:3/3
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.nonToken+OppOwn | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a card is put into an opponent's graveyard from anywhere, put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Card.!token+OppOwn | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a card is put into an opponent's graveyard from anywhere, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Flying\nWhenever a card is put into an opponent's graveyard from anywhere, put a +1/+1 counter on Vulturous Zombie.
diff --git a/forge-gui/res/cardsfolder/w/walk_in_closet_forgotten_cellar.txt b/forge-gui/res/cardsfolder/w/walk_in_closet_forgotten_cellar.txt
index 64367fa7fcd..6ab9d6d0577 100644
--- a/forge-gui/res/cardsfolder/w/walk_in_closet_forgotten_cellar.txt
+++ b/forge-gui/res/cardsfolder/w/walk_in_closet_forgotten_cellar.txt
@@ -13,6 +13,6 @@ Types:Enchantment Room
 T:Mode$ UnlockDoor | ValidPlayer$ You | ValidCard$ Card.Self | ThisDoor$ True | Execute$ TrigPlay | TriggerDescription$ When you unlock this door, you may cast spells from your graveyard this turn, and if a card would be put into your graveyard from anywhere this turn, exile it instead.
 SVar:TrigPlay:DB$ Effect | ReplacementEffects$ GraveToExile | StaticAbilities$ STPlay | AILogic$ YawgmothsWill | AINoRecursiveCheck$ True
 SVar:STPlay:Mode$ Continuous | Affected$ Card.YouCtrl+nonLand | AffectedZone$ Graveyard | MayPlay$ True | Description$ You may cast spells from your graveyard this turn.
-SVar:GraveToExile:Event$ Moved | ActiveZones$ Command | Destination$ Graveyard | ValidCard$ Card.nonToken+YouOwn | ReplaceWith$ Exile | Description$ If a card would be put into your graveyard from anywhere, exile it instead.
+SVar:GraveToExile:Event$ Moved | ActiveZones$ Command | Destination$ Graveyard | ValidCard$ Card.!token+YouOwn | ReplaceWith$ Exile | Description$ If a card would be put into your graveyard from anywhere, exile it instead.
 SVar:Exile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard
 Oracle:(You may cast either half. That door unlocks on the battlefield. As a sorcery, you may pay the mana cost of a locked door to unlock it.)\nWhen you unlock this door, you may cast spells from your graveyard this turn, and if a card would be put into your graveyard from anywhere this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/w/warzone_duplicator.txt b/forge-gui/res/cardsfolder/w/warzone_duplicator.txt
index d85e52f323b..aacfc54e347 100644
--- a/forge-gui/res/cardsfolder/w/warzone_duplicator.txt
+++ b/forge-gui/res/cardsfolder/w/warzone_duplicator.txt
@@ -5,7 +5,7 @@ PT:6/6
 K:Prototype:3 U:3:3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters, return target creature an opponentcontrols with power less than CARDNAME's power to its owner's hand. If that creature wasn't a token, conjure a duplicate of it into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
 SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Creature.OppCtrl+powerLTTriggeredCard$CardPower | Origin$ Battlefield | Destination$ Hand | TgtPrompt$ Select target creature an opponent controls with power less than CARDNAME's power | SubAbility$ DBConjure
-SVar:DBConjure:DB$ MakeCard | Conjure$ True | ConditionDefined$ Targeted | ConditionPresent$ Card.nonToken | DefinedName$ Targeted | Zone$ Hand | RememberMade$ True | SubAbility$ DBAnimate
+SVar:DBConjure:DB$ MakeCard | Conjure$ True | ConditionDefined$ Targeted | ConditionPresent$ Card.!token | DefinedName$ Targeted | Zone$ Hand | RememberMade$ True | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ SpendAnyMana | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:SpendAnyMana:Mode$ ManaConvert | EffectZone$ Stack | ValidPlayer$ You | ValidCard$ Card.Self | ValidSA$ Spell | ManaConversion$ AnyType->AnyColor | Description$ You may spend mana as though it were mana of any color to cast this spell.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/w/wheel_of_sun_and_moon.txt b/forge-gui/res/cardsfolder/w/wheel_of_sun_and_moon.txt
index 62f5ffa6a4f..7c1a99a4a4e 100644
--- a/forge-gui/res/cardsfolder/w/wheel_of_sun_and_moon.txt
+++ b/forge-gui/res/cardsfolder/w/wheel_of_sun_and_moon.txt
@@ -3,7 +3,7 @@ ManaCost:GW GW
 Types:Enchantment Aura
 K:Enchant player
 A:SP$ Attach | ValidTgts$ Player
-R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Graveyard | ValidCard$ Card.nonToken+OwnedBy Player.EnchantedBy | ReplaceWith$ Reveal | Description$ If a card would be put into enchanted player's graveyard from anywhere, instead that card is revealed and put on the bottom of that player's library.
+R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Graveyard | ValidCard$ Card.!token+OwnedBy Player.EnchantedBy | ReplaceWith$ Reveal | Description$ If a card would be put into enchanted player's graveyard from anywhere, instead that card is revealed and put on the bottom of that player's library.
 SVar:Reveal:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Library | Defined$ ReplacedCard | LibraryPosition$ -1 | Reveal$ True
 AI:RemoveDeck:Random
 Oracle:Enchant player\nIf a card would be put into enchanted player's graveyard from anywhere, instead that card is revealed and put on the bottom of that player's library.
diff --git a/forge-gui/res/cardsfolder/w/whisperwood_elemental.txt b/forge-gui/res/cardsfolder/w/whisperwood_elemental.txt
index 104a2571e26..708efb0ee50 100644
--- a/forge-gui/res/cardsfolder/w/whisperwood_elemental.txt
+++ b/forge-gui/res/cardsfolder/w/whisperwood_elemental.txt
@@ -4,6 +4,6 @@ Types:Creature Elemental
 PT:4/4
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigManifest | TriggerDescription$ At the beginning of your end step, manifest the top card of your library. (Put it onto the battlefield face down as a 2/2 creature. Turn it face up any time for its mana cost if it's a creature card.)
 SVar:TrigManifest:DB$ Manifest
-A:AB$ AnimateAll | Cost$ Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl+nonToken+faceUp | Triggers$ Trig | SpellDescription$ Until end of turn, face-up, nontoken creatures you control gain "When this creature dies, manifest the top card of your library."
+A:AB$ AnimateAll | Cost$ Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl+!token+faceUp | Triggers$ Trig | SpellDescription$ Until end of turn, face-up, nontoken creatures you control gain "When this creature dies, manifest the top card of your library."
 SVar:Trig:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigManifest | TriggerDescription$ When this creature dies, manifest the top card of your library.
 Oracle:At the beginning of your end step, manifest the top card of your library. (Put it onto the battlefield face down as a 2/2 creature. Turn it face up any time for its mana cost if it's a creature card.)\nSacrifice Whisperwood Elemental: Until end of turn, face-up nontoken creatures you control gain "When this creature dies, manifest the top card of your library."
diff --git a/forge-gui/res/cardsfolder/w/whitemane_lion.txt b/forge-gui/res/cardsfolder/w/whitemane_lion.txt
index 5b5110dc508..026208f9288 100644
--- a/forge-gui/res/cardsfolder/w/whitemane_lion.txt
+++ b/forge-gui/res/cardsfolder/w/whitemane_lion.txt
@@ -5,5 +5,5 @@ PT:2/2
 K:Flash
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, return a creature you control to its owner's hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Creature.YouCtrl | ChangeNum$ 1 | AILogic$ NeverBounceItself
-SVar:NeedsToPlay:Creature.YouCtrl+nonToken
+SVar:NeedsToPlay:Creature.YouCtrl+!token
 Oracle:Flash\nWhen Whitemane Lion enters, return a creature you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/w/wirewood_hivemaster.txt b/forge-gui/res/cardsfolder/w/wirewood_hivemaster.txt
index 8b5c54ec468..06b2474bf4b 100644
--- a/forge-gui/res/cardsfolder/w/wirewood_hivemaster.txt
+++ b/forge-gui/res/cardsfolder/w/wirewood_hivemaster.txt
@@ -2,6 +2,6 @@ Name:Wirewood Hivemaster
 ManaCost:1 G
 Types:Creature Elf
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Elf.nonToken+Other | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigMakeToken | TriggerDescription$ Whenever another nontoken Elf enters, you may create a 1/1 green Insect creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Elf.!token+Other | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigMakeToken | TriggerDescription$ Whenever another nontoken Elf enters, you may create a 1/1 green Insect creature token.
 SVar:TrigMakeToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_1_1_insect | TokenOwner$ You
 Oracle:Whenever another nontoken Elf enters, you may create a 1/1 green Insect creature token.
diff --git a/forge-gui/res/cardsfolder/y/yaroks_wavecrasher.txt b/forge-gui/res/cardsfolder/y/yaroks_wavecrasher.txt
index a667e762f0a..7f67800f2e9 100644
--- a/forge-gui/res/cardsfolder/y/yaroks_wavecrasher.txt
+++ b/forge-gui/res/cardsfolder/y/yaroks_wavecrasher.txt
@@ -4,5 +4,5 @@ Types:Creature Elemental
 PT:4/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, return another creature you control to its owner's hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Creature.Other+YouCtrl
-SVar:NeedsToPlay:Creature.YouCtrl+nonToken
+SVar:NeedsToPlay:Creature.YouCtrl+!token
 Oracle:When Yarok's Wavecrasher enters, return another creature you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/y/yawgmoths_agenda.txt b/forge-gui/res/cardsfolder/y/yawgmoths_agenda.txt
index d3d6de3205e..f002a568b68 100644
--- a/forge-gui/res/cardsfolder/y/yawgmoths_agenda.txt
+++ b/forge-gui/res/cardsfolder/y/yawgmoths_agenda.txt
@@ -3,7 +3,7 @@ ManaCost:3 B B
 Types:Enchantment
 S:Mode$ CantBeCast | ValidCard$ Card | Caster$ You | NumLimitEachTurn$ 1 | Description$ You can't cast more than one spell each turn.
 S:Mode$ Continuous | Affected$ Card.YouCtrl | AffectedZone$ Graveyard | MayPlay$ True | Description$ You may play lands and cast spells from your graveyard.
-R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Graveyard | ValidCard$ Card.nonToken+YouOwn | ReplaceWith$ Exile | Description$ If a card would be put into your graveyard from anywhere, exile it instead.
+R:Event$ Moved | ActiveZones$ Battlefield | Destination$ Graveyard | ValidCard$ Card.!token+YouOwn | ReplaceWith$ Exile | Description$ If a card would be put into your graveyard from anywhere, exile it instead.
 SVar:Exile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/y/yawgmoths_testament.txt b/forge-gui/res/cardsfolder/y/yawgmoths_testament.txt
index 78d73b42fd6..36afef0a6c9 100644
--- a/forge-gui/res/cardsfolder/y/yawgmoths_testament.txt
+++ b/forge-gui/res/cardsfolder/y/yawgmoths_testament.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Sorcery
 A:SP$ Effect | ReplacementEffects$ GraveExileToLibrary | StaticAbilities$ STPlay | AINoRecursiveCheck$ True | SpellDescription$ Until end of turn, you may play face-up cards you own from exile. If a card would be put into your graveyard or exile from anywhere this turn, put it on the bottom of your library instead.
 SVar:STPlay:Mode$ Continuous | Affected$ Card.YouOwn+faceUp | AffectedZone$ Exile | MayPlay$ True | Description$ You may play face-up cards you own from exile.
-SVar:GraveExileToLibrary:Event$ Moved | ActiveZones$ Command | Destination$ Graveyard,Exile | ValidCard$ Card.nonToken+YouOwn | ReplaceWith$ PutLibrary | Description$ If a card would be put into your graveyard or exile from anywhere this turn, put it on the bottom of your library instead.
+SVar:GraveExileToLibrary:Event$ Moved | ActiveZones$ Command | Destination$ Graveyard,Exile | ValidCard$ Card.!token+YouOwn | ReplaceWith$ PutLibrary | Description$ If a card would be put into your graveyard or exile from anywhere this turn, put it on the bottom of your library instead.
 SVar:PutLibrary:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Library | Defined$ ReplacedCard | LibraryPosition$ -1 | Reveal$ True
 SVar:PlayMain1:ALWAYS
 Oracle:Until end of turn, you may play face-up cards you own from exile.\nIf a card would be put into your graveyard or exile from anywhere this turn, put it on the bottom of your library instead.
diff --git a/forge-gui/res/cardsfolder/y/yawgmoths_will.txt b/forge-gui/res/cardsfolder/y/yawgmoths_will.txt
index 135ea3ba8d0..77cfd83f6be 100644
--- a/forge-gui/res/cardsfolder/y/yawgmoths_will.txt
+++ b/forge-gui/res/cardsfolder/y/yawgmoths_will.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Sorcery
 A:SP$ Effect | ReplacementEffects$ GraveToExile | StaticAbilities$ STPlay | AILogic$ YawgmothsWill | AINoRecursiveCheck$ True | SpellDescription$ Until end of turn, you may play lands and cast spells from your graveyard. If a card would be put into your graveyard from anywhere this turn, exile that card instead.
 SVar:STPlay:Mode$ Continuous | Affected$ Card.YouCtrl | AffectedZone$ Graveyard | MayPlay$ True | Description$ You may play cards from your graveyard.
-SVar:GraveToExile:Event$ Moved | ActiveZones$ Command | Destination$ Graveyard | ValidCard$ Card.nonToken+YouOwn | ReplaceWith$ Exile | Description$ If a card would be put into your graveyard from anywhere, exile it instead.
+SVar:GraveToExile:Event$ Moved | ActiveZones$ Command | Destination$ Graveyard | ValidCard$ Card.!token+YouOwn | ReplaceWith$ Exile | Description$ If a card would be put into your graveyard from anywhere, exile it instead.
 SVar:Exile:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Exile | Defined$ ReplacedCard
 SVar:PlayMain1:ALWAYS
 Oracle:Until end of turn, you may play lands and cast spells from your graveyard.\nIf a card would be put into your graveyard from anywhere this turn, exile that card instead.
diff --git a/forge-gui/res/cardsfolder/y/yedora_grave_gardener.txt b/forge-gui/res/cardsfolder/y/yedora_grave_gardener.txt
index 9d3e2c3c70b..e8428bb9efa 100644
--- a/forge-gui/res/cardsfolder/y/yedora_grave_gardener.txt
+++ b/forge-gui/res/cardsfolder/y/yedora_grave_gardener.txt
@@ -2,6 +2,6 @@ Name:Yedora, Grave Gardener
 ManaCost:4 G
 Types:Legendary Creature Treefolk Druid
 PT:5/5
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+nonToken+Other | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever another nontoken creature you control dies, you may return it to the battlefield face down under its owner's control. It's a Forest land. (It has no other types or abilities.)
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+!token+Other | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever another nontoken creature you control dies, you may return it to the battlefield face down under its owner's control. It's a Forest land. (It has no other types or abilities.)
 SVar:TrigReturn:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Battlefield | FaceDown$ True | FaceDownSetType$ Land & Forest
 Oracle:Whenever another nontoken creature you control dies, you may return it to the battlefield face down under its owner's control. It's a Forest land. (It has no other types or abilities.)
diff --git a/forge-gui/res/cardsfolder/y/yuma_proud_protector.txt b/forge-gui/res/cardsfolder/y/yuma_proud_protector.txt
index d5e8a7a54d2..b5fe23d9d9e 100644
--- a/forge-gui/res/cardsfolder/y/yuma_proud_protector.txt
+++ b/forge-gui/res/cardsfolder/y/yuma_proud_protector.txt
@@ -6,7 +6,7 @@ S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ Count$TypeInYo
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME enters or attacks, you may sacrifice a land. If you do, draw a card.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDraw | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, you may sacrifice a land. If you do, draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ Sac<1/Land>
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Desert.nonToken+YouOwn | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a Desert card is put into your graveyard from anywhere, create a 4/2 green Plant Warrior creature token with reach.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Desert.!token+YouOwn | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a Desert card is put into your graveyard from anywhere, create a 4/2 green Plant Warrior creature token with reach.
 SVar:TrigToken:DB$ Token | TokenScript$ g_4_2_plant_warrior_reach
 DeckHas:Ability$Sacrifice|Token & Type$Plant|Warrior
 DeckHints:Ability$Discard|Sacrifice
diff --git a/forge-gui/res/tokenscripts/b_1_1_nightmare_exile_counter.txt b/forge-gui/res/tokenscripts/b_1_1_nightmare_exile_counter.txt
index a98afa8276a..41639ca8c88 100644
--- a/forge-gui/res/tokenscripts/b_1_1_nightmare_exile_counter.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_nightmare_exile_counter.txt
@@ -5,5 +5,5 @@ Types:Creature Nightmare
 PT:1/1
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of combat on your turn, if a card was put into exile this turn, put a +1/+1 counter on this creature.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:X:Count$ThisTurnEntered_Exile_Card.nonToken
+SVar:X:Count$ThisTurnEntered_Exile_Card.!token
 Oracle:At the beginning of combat on your turn, if a card was put into exile this turn, put a +1/+1 counter on this creature.