diff --git a/forge-gui/res/cardsfolder/c/cabaretti_courtyard.txt b/forge-gui/res/cardsfolder/c/cabaretti_courtyard.txt
index 3c254d781ce..151bbed9c44 100644
--- a/forge-gui/res/cardsfolder/c/cabaretti_courtyard.txt
+++ b/forge-gui/res/cardsfolder/c/cabaretti_courtyard.txt
@@ -1,11 +1,11 @@
 Name:Cabaretti Courtyard
 ManaCost:no cost
 Types:Land
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSacrifice | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it. When you do, search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSacrifice | TriggerDescription$ When CARDNAME enters, sacrifice it. When you do, search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
 SVar:DBSacrifice:DB$ Sacrifice | RememberSacrificed$ True | SubAbility$ DBImmediateTrigger
 SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | Execute$ DBChangeZone | SubAbility$ DBCleanup | TriggerDescription$ Search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Mountain+Basic,Land.Forest+Basic,Land.Plains+Basic | ChangeNum$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Sacrifice|LifeGain
-Oracle:When Cabaretti Courtyard enters the battlefield, sacrifice it. When you do, search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
+Oracle:When Cabaretti Courtyard enters, sacrifice it. When you do, search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/c/cackling_fiend.txt b/forge-gui/res/cardsfolder/c/cackling_fiend.txt
index 11b2011adcc..359466cb0c6 100644
--- a/forge-gui/res/cardsfolder/c/cackling_fiend.txt
+++ b/forge-gui/res/cardsfolder/c/cackling_fiend.txt
@@ -2,6 +2,6 @@ Name:Cackling Fiend
 ManaCost:2 B B
 Types:Creature Zombie
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, each opponent discards a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, each opponent discards a card.
 SVar:TrigDiscard:DB$ Discard | Defined$ Opponent | Mode$ TgtChoose
-Oracle:When Cackling Fiend enters the battlefield, each opponent discards a card.
+Oracle:When Cackling Fiend enters, each opponent discards a card.
diff --git a/forge-gui/res/cardsfolder/c/cackling_observer.txt b/forge-gui/res/cardsfolder/c/cackling_observer.txt
index 3bf8782971b..57c8495a132 100644
--- a/forge-gui/res/cardsfolder/c/cackling_observer.txt
+++ b/forge-gui/res/cardsfolder/c/cackling_observer.txt
@@ -3,7 +3,7 @@ ManaCost:1 B B
 Types:Creature Imp
 PT:3/1
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigReveal | TriggerDescription$ When CARDNAME enters the battlefield, target opponent reveals each nonland card in their hand. You choose one of those cards and exile it.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigReveal | TriggerDescription$ When CARDNAME enters, target opponent reveals each nonland card in their hand. You choose one of those cards and exile it.
 SVar:TrigReveal:DB$ Reveal | ValidTgts$ Opponent | RevealAllValid$ Card.nonLand+TargetedPlayerCtrl | RememberRevealed$ True | SubAbility$ DBExile
 SVar:DBExile:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | DefinedPlayer$ Targeted | Chooser$ You | ChangeType$ Card.nonLand+nonCreature | Imprint$ True | Mandatory$ True | SubAbility$ DBClearRemembered
 SVar:DBClearRemembered:DB$ Cleanup | ClearRemembered$ True
@@ -11,4 +11,4 @@ T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$
 SVar:TrigSeek:DB$ Seek | Defined$ ImprintedController | Type$ Card.cmcLTX | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
 SVar:X:Imprinted$CardManaCost
-Oracle:Flying\nWhen Cackling Observer enters the battlefield, target opponent reveals each nonland card in their hand. You choose one of those cards and exile it.\nWhen Cackling Observer leaves the battlefield, the exiled card's owner seeks a nonland card with lesser mana value than the exiled card.
+Oracle:Flying\nWhen Cackling Observer enters, target opponent reveals each nonland card in their hand. You choose one of those cards and exile it.\nWhen Cackling Observer leaves the battlefield, the exiled card's owner seeks a nonland card with lesser mana value than the exiled card.
diff --git a/forge-gui/res/cardsfolder/c/cacophony_unleashed.txt b/forge-gui/res/cardsfolder/c/cacophony_unleashed.txt
index d8f16824a4a..26ff6d2f603 100644
--- a/forge-gui/res/cardsfolder/c/cacophony_unleashed.txt
+++ b/forge-gui/res/cardsfolder/c/cacophony_unleashed.txt
@@ -1,11 +1,11 @@
 Name:Cacophony Unleashed
 ManaCost:5 B B
 Types:Enchantment
-T:Mode$ ChangesZone | ValidCard$ Card.Self+wasCastByYou | Destination$ Battlefield | Execute$ TrigDestroyAll | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it, destroy all nonenchantment creatures.
+T:Mode$ ChangesZone | ValidCard$ Card.Self+wasCastByYou | Destination$ Battlefield | Execute$ TrigDestroyAll | TriggerDescription$ When CARDNAME enters, if you cast it, destroy all nonenchantment creatures.
 SVar:TrigDestroyAll:DB$ DestroyAll | ValidCards$ Creature.nonEnchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Enchantment.Other+YouCtrl | Execute$ TrigAnimate | TriggerDescription$ Whenever CARDNAME or another enchantment enters the battlefield under your control, until end of turn, CARDNAME becomes a legendary 6/6 Nightmare God creature with menace and deathtouch. It's still an enchantment.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Enchantment.Other+YouCtrl | Execute$ TrigAnimate | TriggerDescription$ Whenever CARDNAME or another enchantment you control enters, until end of turn, CARDNAME becomes a legendary 6/6 Nightmare God creature with menace and deathtouch. It's still an enchantment.
 SVar:TrigAnimate:DB$ Animate | Defined$ Self | Power$ 6 | Toughness$ 6 | Types$ Legendary,Creature,Nightmare,God | Keywords$ Menace & Deathtouch
 SVar:PlayMain1:ALWAYS
 DeckHints:Type$Enchantment
 DeckHas:Type$Nightmare|God
-Oracle:When Cacophony Unleashed enters the battlefield, if you cast it, destroy all nonenchantment creatures.\nWhenever Cacophony Unleashed or another enchantment enters the battlefield under your control, until end of turn, Cacophony Unleashed becomes a legendary 6/6 Nightmare God creature with menace and deathtouch. It's still an enchantment.
+Oracle:When Cacophony Unleashed enters, if you cast it, destroy all nonenchantment creatures.\nWhenever Cacophony Unleashed or another enchantment you control enters, until end of turn, Cacophony Unleashed becomes a legendary 6/6 Nightmare God creature with menace and deathtouch. It's still an enchantment.
diff --git a/forge-gui/res/cardsfolder/c/cactus_preserve.txt b/forge-gui/res/cardsfolder/c/cactus_preserve.txt
index ef0df82dbe0..f09a72065c9 100644
--- a/forge-gui/res/cardsfolder/c/cactus_preserve.txt
+++ b/forge-gui/res/cardsfolder/c/cactus_preserve.txt
@@ -1,9 +1,10 @@
 Name:Cactus Preserve
 Types:Land Desert
 ManaCost:no cost
-K:CARDNAME enters the battlefield tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ ManaReflected | Cost$ T | ColorOrType$ Type | Valid$ Land.YouCtrl | ReflectProperty$ Produce | SpellDescription$ Add one mana of any type that a land you control could produce.
 A:AB$ Animate | Cost$ 3 | Defined$ Self | Power$ X | Toughness$ X | Colors$ Green | OverwriteColors$ True | Types$ Creature,Plant | Keywords$ Reach | SpellDescription$ Until end of turn, CARDNAME becomes an X/X green Plant creature with reach, where X is the greatest mana value among your commanders. It's still a land.
 SVar:X:Count$ValidAll Card.IsCommander+YouOwn$GreatestCMC
 AI:RemoveDeck:NonCommander
-Oracle:Cactus Preserve enters the battlefield tapped.\n{T}: Add one mana of any type that a land you control could produce.\n{3}: Until end of turn, Cactus Preserve becomes an X/X green Plant creature with reach, where X is the greatest mana value among your commanders. It's still a land.
+Oracle:Cactus Preserve enters tapped.\n{T}: Add one mana of any type that a land you control could produce.\n{3}: Until end of turn, Cactus Preserve becomes an X/X green Plant creature with reach, where X is the greatest mana value among your commanders. It's still a land.
diff --git a/forge-gui/res/cardsfolder/c/cadaver_imp.txt b/forge-gui/res/cardsfolder/c/cadaver_imp.txt
index 2c61f674d89..9f66f9f3dce 100644
--- a/forge-gui/res/cardsfolder/c/cadaver_imp.txt
+++ b/forge-gui/res/cardsfolder/c/cadaver_imp.txt
@@ -3,6 +3,6 @@ ManaCost:1 B B
 Types:Creature Imp
 PT:1/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target creature card from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may return target creature card from your graveyard to your hand.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl
-Oracle:Flying\nWhen Cadaver Imp enters the battlefield, you may return target creature card from your graveyard to your hand.
+Oracle:Flying\nWhen Cadaver Imp enters, you may return target creature card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/c/cadric_soul_kindler.txt b/forge-gui/res/cardsfolder/c/cadric_soul_kindler.txt
index 263bc3f3dd3..20784782b8b 100644
--- a/forge-gui/res/cardsfolder/c/cadric_soul_kindler.txt
+++ b/forge-gui/res/cardsfolder/c/cadric_soul_kindler.txt
@@ -3,9 +3,9 @@ ManaCost:2 R W
 Types:Legendary Creature Dwarf Wizard
 PT:4/3
 S:Mode$ IgnoreLegendRule | ValidCard$ Permanent.token+YouCtrl | Description$ The "legend rule" doesn't apply to tokens you control.
-T:Mode$ ChangesZone | ValidCard$ Permanent.nonToken+Legendary+Other+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever another nontoken legendary permanent enters the battlefield under your control, you may pay {1}. If you do, create a token that's a copy of it. That token gains haste. Sacrifice it at the beginning of the next end step.
+T:Mode$ ChangesZone | ValidCard$ Permanent.nonToken+Legendary+Other+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever another nontoken legendary permanent you control enters, you may pay {1}. If you do, create a token that's a copy of it. That token gains haste. Sacrifice it at the beginning of the next end step.
 SVar:TrigCopy:AB$ CopyPermanent | Cost$ 1 | Defined$ TriggeredCardLKICopy | PumpKeywords$ Haste | AtEOT$ Sacrifice
 SVar:BuffedBy:Legendary
 DeckHas:Ability$Token
 DeckNeeds:Type$Legendary
-Oracle:The "legend rule" doesn't apply to tokens you control.\nWhenever another nontoken legendary permanent enters the battlefield under your control, you may pay {1}. If you do, create a token that's a copy of it. That token gains haste. Sacrifice it at the beginning of the next end step.
+Oracle:The "legend rule" doesn't apply to tokens you control.\nWhenever another nontoken legendary permanent you control enters, you may pay {1}. If you do, create a token that's a copy of it. That token gains haste. Sacrifice it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/c/caged_sun.txt b/forge-gui/res/cardsfolder/c/caged_sun.txt
index 5fa9bbd79db..d844c8fe9b5 100644
--- a/forge-gui/res/cardsfolder/c/caged_sun.txt
+++ b/forge-gui/res/cardsfolder/c/caged_sun.txt
@@ -2,9 +2,9 @@ Name:Caged Sun
 ManaCost:6
 Types:Artifact
 K:ETBReplacement:Other:ChooseColor
-SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
+SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters, choose a color.
 S:Mode$ Continuous | Affected$ Creature.ChosenColor+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control of the chosen color get +1/+1.
 T:Mode$ ManaAdded | ValidSource$ Land | ValidSA$ SpellAbility.ManaAbility | Produced$ ChosenColor | Player$ You | Execute$ TrigMana | TriggerZones$ Battlefield | Static$ True | TriggerDescription$ Whenever a land's ability causes you to add one or more mana of the chosen color, add one additional mana of that color.
 T:Mode$ ManaAdded | ValidSource$ Land | ValidSA$ SpellAbility.nonManaAbility | Produced$ ChosenColor | Player$ You | Execute$ TrigMana | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever a land's ability causes you to add one or more mana of the chosen color, add one additional mana of that color.
 SVar:TrigMana:DB$ Mana | Produced$ Chosen | Amount$ 1
-Oracle:As Caged Sun enters the battlefield, choose a color.\nCreatures you control of the chosen color get +1/+1.\nWhenever a land's ability causes you to add one or more mana of the chosen color, add one additional mana of that color.
+Oracle:As Caged Sun enters, choose a color.\nCreatures you control of the chosen color get +1/+1.\nWhenever a land's ability causes you to add one or more mana of the chosen color, add one additional mana of that color.
diff --git a/forge-gui/res/cardsfolder/c/calciderm.txt b/forge-gui/res/cardsfolder/c/calciderm.txt
index 619b0f17a96..219a36a86e1 100644
--- a/forge-gui/res/cardsfolder/c/calciderm.txt
+++ b/forge-gui/res/cardsfolder/c/calciderm.txt
@@ -4,4 +4,4 @@ Types:Creature Beast
 PT:5/5
 K:Vanishing:4
 K:Shroud
-Oracle:Shroud (This creature can't be the target of spells or abilities.)\nVanishing 4 (This creature enters the battlefield with four time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)
+Oracle:Shroud (This creature can't be the target of spells or abilities.)\nVanishing 4 (This creature enters with four time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)
diff --git a/forge-gui/res/cardsfolder/c/calcite_snapper.txt b/forge-gui/res/cardsfolder/c/calcite_snapper.txt
index 79cc70d0801..e1806af4eb6 100644
--- a/forge-gui/res/cardsfolder/c/calcite_snapper.txt
+++ b/forge-gui/res/cardsfolder/c/calcite_snapper.txt
@@ -3,7 +3,7 @@ ManaCost:1 U U
 Types:Creature Turtle
 PT:1/4
 K:Shroud
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, you may switch CARDNAME power and toughness until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Landfall — Whenever a land you control enters, you may switch CARDNAME power and toughness until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ HIDDEN CARDNAME's power and toughness are switched
 AI:RemoveDeck:All
-Oracle:Shroud (This creature can't be the target of spells or abilities.)\nLandfall — Whenever a land enters the battlefield under your control, you may switch Calcite Snapper's power and toughness until end of turn.
+Oracle:Shroud (This creature can't be the target of spells or abilities.)\nLandfall — Whenever a land you control enters, you may switch Calcite Snapper's power and toughness until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/caldaia_strongarm.txt b/forge-gui/res/cardsfolder/c/caldaia_strongarm.txt
index b427c153573..410f881ce36 100644
--- a/forge-gui/res/cardsfolder/c/caldaia_strongarm.txt
+++ b/forge-gui/res/cardsfolder/c/caldaia_strongarm.txt
@@ -2,9 +2,9 @@ Name:Caldaia Strongarm
 ManaCost:4 G
 Types:Creature Human Warrior
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put two +1/+1 counters on target creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters, put two +1/+1 counters on target creature.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 2
 K:Blitz:3 G
 SVar:PlayMain1:TRUE
 DeckHas:Ability$Counters|Sacrifice
-Oracle:When Caldaia Strongarm enters the battlefield, put two +1/+1 counters on target creature.\nBlitz {3}{G} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
+Oracle:When Caldaia Strongarm enters, put two +1/+1 counters on target creature.\nBlitz {3}{G} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/c/caldera_breaker.txt b/forge-gui/res/cardsfolder/c/caldera_breaker.txt
index 39a849ead9e..7de6b872084 100644
--- a/forge-gui/res/cardsfolder/c/caldera_breaker.txt
+++ b/forge-gui/res/cardsfolder/c/caldera_breaker.txt
@@ -3,7 +3,7 @@ ManaCost:3 R R R
 Types:Artifact Creature Golem
 PT:6/6
 K:Trample
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, exile all Mountain cards from your library. When you do, CARDNAME deals that much damage to target creature or planeswalker an opponent controls.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, exile all Mountain cards from your library. When you do, CARDNAME deals that much damage to target creature or planeswalker an opponent controls.
 SVar:TrigChangeZone:DB$ ChangeZoneAll | Origin$ Library | Destination$ Exile | ChangeType$ Mountain.YouOwn | RememberChanged$ True | SubAbility$ DBImmediateTrig
 SVar:DBImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | Execute$ TrigDamage | RememberObjects$ Remembered | SubAbility$ DBCleanup | TriggerDescription$ When you do, CARDNAME deals that much damage to target creature or planeswalker an opponent controls.
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl,Planeswalker.OppCtrl | TgtPrompt$ Select a creature or planeswalker an opponent controls | NumDmg$ X
@@ -12,4 +12,4 @@ T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Destination$
 SVar:TrigChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Card.ExiledWithSource | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBConjure
 SVar:DBConjure:DB$ MakeCard | Conjure$ True | Name$ Volcanic Geyser | Zone$ Library | Amount$ 4
 SVar:X:TriggerRemembered$Amount
-Oracle:Trample\nWhen Caldera Breaker enters the battlefield, exile all Mountain cards from your library. When you do, Caldera Breaker deals that much damage to target creature or planeswalker an opponent controls.\nWhen Caldera Breaker dies, put all cards exiled with it onto the battlefield under their owner's control. Conjure four cards named Volcanic Geyser into your library, then shuffle.
+Oracle:Trample\nWhen Caldera Breaker enters, exile all Mountain cards from your library. When you do, Caldera Breaker deals that much damage to target creature or planeswalker an opponent controls.\nWhen Caldera Breaker dies, put all cards exiled with it onto the battlefield under their owner's control. Conjure four cards named Volcanic Geyser into your library, then shuffle.
diff --git a/forge-gui/res/cardsfolder/c/caldera_hellion.txt b/forge-gui/res/cardsfolder/c/caldera_hellion.txt
index 7a1c708b721..b3355fde239 100644
--- a/forge-gui/res/cardsfolder/c/caldera_hellion.txt
+++ b/forge-gui/res/cardsfolder/c/caldera_hellion.txt
@@ -3,7 +3,7 @@ ManaCost:3 R R
 Types:Creature Hellion
 PT:3/3
 K:Devour:1
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 3 damage to each creature.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters, it deals 3 damage to each creature.
 SVar:TrigDamage:DB$ DamageAll | ValidCards$ Creature | ValidDescription$ each creature. | NumDmg$ 3
 AI:RemoveDeck:All
-Oracle:Devour 1 (As this enters the battlefield, you may sacrifice any number of creatures. This creature enters the battlefield with that many +1/+1 counters on it.)\nWhen Caldera Hellion enters the battlefield, it deals 3 damage to each creature.
+Oracle:Devour 1 (As this enters, you may sacrifice any number of creatures. This creature enters with that many +1/+1 counters on it.)\nWhen Caldera Hellion enters, it deals 3 damage to each creature.
diff --git a/forge-gui/res/cardsfolder/c/caldera_lake.txt b/forge-gui/res/cardsfolder/c/caldera_lake.txt
index 9f33d27d560..1e109b9fc1c 100644
--- a/forge-gui/res/cardsfolder/c/caldera_lake.txt
+++ b/forge-gui/res/cardsfolder/c/caldera_lake.txt
@@ -1,8 +1,9 @@
 Name:Caldera Lake
 ManaCost:no cost
 Types:Land
-K:CARDNAME enters the battlefield tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ T | Produced$ Combo U R | SubAbility$ DBPain | SpellDescription$ Add {U} or {R}. CARDNAME deals 1 damage to you.
 SVar:DBPain:DB$ DealDamage | NumDmg$ 1 | Defined$ You
-Oracle:Caldera Lake enters the battlefield tapped.\n{T}: Add {C}.\n{T}: Add {U} or {R}. Caldera Lake deals 1 damage to you.
+Oracle:Caldera Lake enters tapped.\n{T}: Add {C}.\n{T}: Add {U} or {R}. Caldera Lake deals 1 damage to you.
diff --git a/forge-gui/res/cardsfolder/c/caligo_skin_witch.txt b/forge-gui/res/cardsfolder/c/caligo_skin_witch.txt
index a666238bd2d..c72a94da8b8 100644
--- a/forge-gui/res/cardsfolder/c/caligo_skin_witch.txt
+++ b/forge-gui/res/cardsfolder/c/caligo_skin_witch.txt
@@ -3,8 +3,8 @@ ManaCost:1 B
 Types:Creature Human Wizard
 PT:1/3
 K:Kicker:3 B
-T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked | Origin$ Any | Destination$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, each opponent discards two cards.
+T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked | Origin$ Any | Destination$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, if it was kicked, each opponent discards two cards.
 SVar:TrigDiscard:DB$ Discard | Defined$ Player.Opponent | NumCards$ 2 | Mode$ TgtChoose
 SVar:NeedsToPlayKickedVar:Z GE1
 SVar:Z:Count$ValidHand Card.OppOwn
-Oracle:Kicker {3}{B} (You may pay an additional {3}{B} as you cast this spell.)\nWhen Caligo Skin-Witch enters the battlefield, if it was kicked, each opponent discards two cards.
+Oracle:Kicker {3}{B} (You may pay an additional {3}{B} as you cast this spell.)\nWhen Caligo Skin-Witch enters, if it was kicked, each opponent discards two cards.
diff --git a/forge-gui/res/cardsfolder/c/calix_guided_by_fate.txt b/forge-gui/res/cardsfolder/c/calix_guided_by_fate.txt
index 13e0c57eee8..3a96bdf424a 100644
--- a/forge-gui/res/cardsfolder/c/calix_guided_by_fate.txt
+++ b/forge-gui/res/cardsfolder/c/calix_guided_by_fate.txt
@@ -2,10 +2,10 @@ Name:Calix, Guided by Fate
 ManaCost:1 G W
 Types:Legendary Enchantment Creature Human Druid
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Enchantment.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Constellation — Whenever CARDNAME or another enchantment enters the battlefield under your control, put a +1/+1 counter on target creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Enchantment.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Constellation — Whenever CARDNAME or another enchantment you control enters, put a +1/+1 counter on target creature.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ 1
 T:Mode$ DamageDone | TriggerZones$ Battlefield | ValidSource$ Card.Self,Creature.enchanted+YouCtrl | OptionalDecider$ You | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigToken | ResolvedLimit$ 1 | TriggerDescription$ Whenever NICKNAME or an enchanted creature you control deals combat damage to a player, you may create a token that's a copy of a nonlegendary enchantment you control. Do this only once each turn.
 SVar:TrigToken:DB$ CopyPermanent | Choices$ Enchantment.nonLegendary+YouCtrl | NumCopies$ 1 | ChoiceTitle$ Choose a nonlegendary enchantment you control
 DeckHas:Ability$Token
 DeckNeeds:Type$Enchantment
-Oracle:Constellation — Whenever Calix, Guided by Fate or another enchantment enters the battlefield under your control, put a +1/+1 counter on target creature.\nWhenever Calix or an enchanted creature you control deals combat damage to a player, you may create a token that's a copy of a nonlegendary enchantment you control. Do this only once each turn.
+Oracle:Constellation — Whenever Calix, Guided by Fate or another enchantment you control enters, put a +1/+1 counter on target creature.\nWhenever Calix or an enchanted creature you control deals combat damage to a player, you may create a token that's a copy of a nonlegendary enchantment you control. Do this only once each turn.
diff --git a/forge-gui/res/cardsfolder/c/call_to_arms.txt b/forge-gui/res/cardsfolder/c/call_to_arms.txt
index 8888262ee7d..5d65e29f3dd 100644
--- a/forge-gui/res/cardsfolder/c/call_to_arms.txt
+++ b/forge-gui/res/cardsfolder/c/call_to_arms.txt
@@ -2,7 +2,7 @@ Name:Call to Arms
 ManaCost:1 W
 Types:Enchantment
 K:ETBReplacement:Other:ChooseColor
-SVar:ChooseColor:DB$ ChooseColor | AILogic$ MostProminentHumanControls | Defined$ You | SubAbility$ ChooseOpp | SpellDescription$ As CARDNAME enters the battlefield, choose a color and an opponent.
+SVar:ChooseColor:DB$ ChooseColor | AILogic$ MostProminentHumanControls | Defined$ You | SubAbility$ ChooseOpp | SpellDescription$ As CARDNAME enters, choose a color and an opponent.
 SVar:ChooseOpp:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | AILogic$ Curse
 SVar:X:Count$Valid Permanent.nonToken+ChosenColor+ChosenCtrl
 SVar:Y:Count$SecondMostProminentColor Permanent.nonToken+ChosenCtrl
@@ -10,4 +10,4 @@ S:Mode$ Continuous | Affected$ Creature.White | AddPower$ 1 | AddToughness$ 1 |
 T:Mode$ Always | CheckSVar$ X | SVarCompare$ LEY | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When the chosen color isn't the most common color among nontoken permanents the chosen player controls or is tied for most common, sacrifice CARDNAME.
 SVar:TrigSac:DB$ Sacrifice | SacValid$ Self
 AI:RemoveDeck:Random
-Oracle:As Call to Arms enters the battlefield, choose a color and an opponent.\nWhite creatures get +1/+1 as long as the chosen color is the most common color among nontoken permanents the chosen player controls but isn't tied for most common.\nWhen the chosen color isn't the most common color among nontoken permanents the chosen player controls or is tied for most common, sacrifice Call to Arms.
+Oracle:As Call to Arms enters, choose a color and an opponent.\nWhite creatures get +1/+1 as long as the chosen color is the most common color among nontoken permanents the chosen player controls but isn't tied for most common.\nWhen the chosen color isn't the most common color among nontoken permanents the chosen player controls or is tied for most common, sacrifice Call to Arms.
diff --git a/forge-gui/res/cardsfolder/c/caller_of_the_claw.txt b/forge-gui/res/cardsfolder/c/caller_of_the_claw.txt
index 52f17fb1371..ef7b6928dde 100644
--- a/forge-gui/res/cardsfolder/c/caller_of_the_claw.txt
+++ b/forge-gui/res/cardsfolder/c/caller_of_the_claw.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Elf
 PT:2/2
 K:Flash
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 2/2 green Bear creature token for each nontoken creature put into your graveyard from the battlefield this turn.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 2/2 green Bear creature token for each nontoken creature put into your graveyard from the battlefield this turn.
 SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenOwner$ You | TokenScript$ g_2_2_bear
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.nonToken+YouOwn
-Oracle:Flash\nWhen Caller of the Claw enters the battlefield, create a 2/2 green Bear creature token for each nontoken creature put into your graveyard from the battlefield this turn.
+Oracle:Flash\nWhen Caller of the Claw enters, create a 2/2 green Bear creature token for each nontoken creature put into your graveyard from the battlefield this turn.
diff --git a/forge-gui/res/cardsfolder/c/callidus_assassin.txt b/forge-gui/res/cardsfolder/c/callidus_assassin.txt
index 4d2e16fd0d3..8bde66c8ee1 100644
--- a/forge-gui/res/cardsfolder/c/callidus_assassin.txt
+++ b/forge-gui/res/cardsfolder/c/callidus_assassin.txt
@@ -4,7 +4,7 @@ Types:Creature Human Shapeshifter Assassin
 PT:3/3
 K:Flash
 K:ETBReplacement:Copy:DBCopy:Optional
-SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | IntoPlayTapped$ True | AddTriggers$ ETBDestroy | AddSVars$ TrigDestroy | SpellDescription$ Polymorphine — You may have CARDNAME enter the battlefield tapped as a copy of any creature on the battlefield, except it has "When this creature enters the battlefield, destroy up to one other target creature with the same name as this creature."
-SVar:ETBDestroy:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigDestroy | TriggerDescription$ When this creature enters the battlefield, destroy up to one other target creature with the same name as this creature.
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | IntoPlayTapped$ True | AddTriggers$ ETBDestroy | AddSVars$ TrigDestroy | SpellDescription$ Polymorphine — You may have CARDNAME enter tapped as a copy of any creature on the battlefield, except it has "When this creature enters, destroy up to one other target creature with the same name as this creature."
+SVar:ETBDestroy:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigDestroy | TriggerDescription$ When this creature enters, destroy up to one other target creature with the same name as this creature.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Creature.Other+sameName | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one other target creature with the same name as this creature
-Oracle:Flash\nPolymorphine — You may have Callidus Assassin enter the battlefield tapped as a copy of any creature on the battlefield, except it has "When this creature enters the battlefield, destroy up to one other target creature with the same name as this creature."
+Oracle:Flash\nPolymorphine — You may have Callidus Assassin enter tapped as a copy of any creature on the battlefield, except it has "When this creature enters, destroy up to one other target creature with the same name as this creature."
diff --git a/forge-gui/res/cardsfolder/c/callous_bloodmage.txt b/forge-gui/res/cardsfolder/c/callous_bloodmage.txt
index 58cd5ba7614..367e8fe19e8 100644
--- a/forge-gui/res/cardsfolder/c/callous_bloodmage.txt
+++ b/forge-gui/res/cardsfolder/c/callous_bloodmage.txt
@@ -2,11 +2,11 @@ Name:Callous Bloodmage
 ManaCost:2 B
 Types:Creature Vampire Warlock
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters, ABILITY
 SVar:TrigCharm:DB$ Charm | Choices$ DBToken,DBDraw,DBExileYard
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ bg_1_1_pest_lifegain | TokenOwner$ You | SpellDescription$ Create a 1/1 black and green Pest creature token with "When this creature dies, you gain 1 life."
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife | SpellDescription$ You draw a card and you lose 1 life.
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
 SVar:DBExileYard:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Player | TgtPrompt$ Select target player | ChangeType$ Card | SpellDescription$ Exile target player's graveyard.
 DeckHas:Ability$Token|LifeGain
-Oracle:When Callous Bloodmage enters the battlefield, choose one —\n• Create a 1/1 black and green Pest creature token with "When this creature dies, you gain 1 life."\n• You draw a card and you lose 1 life.\n• Exile target player's graveyard.
+Oracle:When Callous Bloodmage enters, choose one —\n• Create a 1/1 black and green Pest creature token with "When this creature dies, you gain 1 life."\n• You draw a card and you lose 1 life.\n• Exile target player's graveyard.
diff --git a/forge-gui/res/cardsfolder/c/callous_oppressor.txt b/forge-gui/res/cardsfolder/c/callous_oppressor.txt
index 1be9c8da168..cb612fb5a2f 100644
--- a/forge-gui/res/cardsfolder/c/callous_oppressor.txt
+++ b/forge-gui/res/cardsfolder/c/callous_oppressor.txt
@@ -4,8 +4,8 @@ Types:Creature Octopus
 PT:1/2
 K:You may choose not to untap CARDNAME during your untap step.
 K:ETBReplacement:Other:DBChooseOpp
-SVar:DBChooseOpp:DB$ ChoosePlayer | ChoiceTitle$ Choose an opponent | Choices$ Player.Opponent | AILogic$ Curse | SpellDescription$ As CARDNAME enters the battlefield, an opponent chooses a creature type. | SubAbility$ DBChooseType
+SVar:DBChooseOpp:DB$ ChoosePlayer | ChoiceTitle$ Choose an opponent | Choices$ Player.Opponent | AILogic$ Curse | SpellDescription$ As CARDNAME enters, an opponent chooses a creature type. | SubAbility$ DBChooseType
 SVar:DBChooseType:DB$ ChooseType | Defined$ Player.Chosen | Type$ Creature | AILogic$ MostProminentComputerControls
 A:AB$ GainControl | Cost$ T | ValidTgts$ Creature.IsNotChosenType | TgtPrompt$ Select target creature that isn't of the chosen type | LoseControl$ Untap,LeavesPlay | SpellDescription$ Gain control of target creature that isn't of the chosen type for as long as CARDNAME remains tapped.
 AI:RemoveDeck:All
-Oracle:You may choose not to untap Callous Oppressor during your untap step.\nAs Callous Oppressor enters the battlefield, an opponent chooses a creature type.\n{T}: Gain control of target creature that isn't of the chosen type for as long as Callous Oppressor remains tapped.
+Oracle:You may choose not to untap Callous Oppressor during your untap step.\nAs Callous Oppressor enters, an opponent chooses a creature type.\n{T}: Gain control of target creature that isn't of the chosen type for as long as Callous Oppressor remains tapped.
diff --git a/forge-gui/res/cardsfolder/c/callous_sell_sword_burn_together.txt b/forge-gui/res/cardsfolder/c/callous_sell_sword_burn_together.txt
index 515c410db76..26e15c57458 100644
--- a/forge-gui/res/cardsfolder/c/callous_sell_sword_burn_together.txt
+++ b/forge-gui/res/cardsfolder/c/callous_sell_sword_burn_together.txt
@@ -2,12 +2,12 @@ Name:Callous Sell-Sword
 ManaCost:1 B
 Types:Creature Human Soldier
 PT:2/2
-K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with a +1/+1 counter on it for each creature that died under your control this turn.
+K:etbCounter:P1P1:X:no Condition:CARDNAME enters with a +1/+1 counter on it for each creature that died under your control this turn.
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl
 DeckHints:Ability$Graveyard
 DeckHas:Ability$Counters|Sacrifice
 AlternateMode:Adventure
-Oracle:Callous Sell-Sword enters the battlefield with a +1/+1 counter on it for each creature that died under your control this turn.
+Oracle:Callous Sell-Sword enters with a +1/+1 counter on it for each creature that died under your control this turn.
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/c/camato_scout.txt b/forge-gui/res/cardsfolder/c/camato_scout.txt
index e1c8aec2f6b..2df018498b7 100644
--- a/forge-gui/res/cardsfolder/c/camato_scout.txt
+++ b/forge-gui/res/cardsfolder/c/camato_scout.txt
@@ -3,6 +3,6 @@ ManaCost:1 U U
 Types:Creature Merfolk
 PT:2/3
 K:ETBReplacement:Other:ChooseLT
-SVar:ChooseLT:DB$ ChooseType | Defined$ You | AtRandom$ True | Type$ Basic Land | SpellDescription$ As CARDNAME enters the battlefield, choose a land type.
+SVar:ChooseLT:DB$ ChooseType | Defined$ You | AtRandom$ True | Type$ Basic Land | SpellDescription$ As CARDNAME enters, choose a land type.
 S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Landwalk:ChosenType | Description$ CARDNAME has landwalk of the chosen type.
-Oracle:As Camato Scout enters the battlefield, choose a basic land type at random. Camato Scout has landwalk of the chosen type.
+Oracle:As Camato Scout enters, choose a basic land type at random. Camato Scout has landwalk of the chosen type.
diff --git a/forge-gui/res/cardsfolder/c/campus_guide.txt b/forge-gui/res/cardsfolder/c/campus_guide.txt
index b05e7ecbaad..40079635200 100644
--- a/forge-gui/res/cardsfolder/c/campus_guide.txt
+++ b/forge-gui/res/cardsfolder/c/campus_guide.txt
@@ -2,6 +2,6 @@ Name:Campus Guide
 ManaCost:2
 Types:Artifact Creature Golem
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Land.Basic | ChangeNum$ 1 | ShuffleNonMandatory$ True
-Oracle:When Campus Guide enters the battlefield, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.
+Oracle:When Campus Guide enters, you may search your library for a basic land card, reveal it, then shuffle and put that card on top.
diff --git a/forge-gui/res/cardsfolder/c/canal_courier.txt b/forge-gui/res/cardsfolder/c/canal_courier.txt
index 3772f96fd97..3aae04fbee7 100644
--- a/forge-gui/res/cardsfolder/c/canal_courier.txt
+++ b/forge-gui/res/cardsfolder/c/canal_courier.txt
@@ -2,9 +2,9 @@ Name:Canal Courier
 ManaCost:5 U
 Types:Creature Human Rogue
 PT:3/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters, you become the monarch.
 SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigEffect | AttackDifferentPlayers$ True | TriggerDescription$ Whenever CARDNAME and another creature attack different players, CARDNAME can't be blocked this combat.
 SVar:TrigEffect:DB$ Effect | RememberObjects$ Self | StaticAbilities$ STUnblockable | Duration$ UntilEndOfCombat | ExileOnMoved$ Battlefield
 SVar:STUnblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ EFFECTSOURCE can't be blocked this combat.
-Oracle:When Canal Courier enters the battlefield, you become the monarch.\nWhenever Canal Courier and another creature attack different players, Canal Courier can't be blocked this combat.
+Oracle:When Canal Courier enters, you become the monarch.\nWhenever Canal Courier and another creature attack different players, Canal Courier can't be blocked this combat.
diff --git a/forge-gui/res/cardsfolder/c/candy_trail.txt b/forge-gui/res/cardsfolder/c/candy_trail.txt
index c76adde78b0..a98d88906fc 100644
--- a/forge-gui/res/cardsfolder/c/candy_trail.txt
+++ b/forge-gui/res/cardsfolder/c/candy_trail.txt
@@ -1,9 +1,9 @@
 Name:Candy Trail
 ManaCost:1
 Types:Artifact Food Clue
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 2.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters, scry 2.
 SVar:TrigScry:DB$ Scry | ScryNum$ 2
 A:AB$ GainLife | Cost$ 2 T Sac<1/CARDNAME> | LifeAmount$ 3 | SubAbility$ DBDraw | SpellDescription$ You gain 3 life and draw a card.
 SVar:DBDraw:DB$ Draw
 DeckHas:Ability$LifeGain|Sacrifice
-Oracle:When Candy Trail enters the battlefield, scry 2.\n{2}, {T}, Sacrifice Candy Trail: You gain 3 life and draw a card.
+Oracle:When Candy Trail enters, scry 2.\n{2}, {T}, Sacrifice Candy Trail: You gain 3 life and draw a card.
diff --git a/forge-gui/res/cardsfolder/c/canker_abomination.txt b/forge-gui/res/cardsfolder/c/canker_abomination.txt
index a5618fc21e4..1400f774d8f 100644
--- a/forge-gui/res/cardsfolder/c/canker_abomination.txt
+++ b/forge-gui/res/cardsfolder/c/canker_abomination.txt
@@ -2,10 +2,10 @@ Name:Canker Abomination
 ManaCost:2 BG BG
 Types:Creature Treefolk Horror
 PT:6/6
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ ChooseP | ReplacementResult$ Updated | Description$ As CARDNAME enters the battlefield, choose an opponent. CARDNAME enters the battlefield with a -1/-1 counter on it for each creature that player controls.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ ChooseP | ReplacementResult$ Updated | Description$ As CARDNAME enters, choose an opponent. CARDNAME enters with a -1/-1 counter on it for each creature that player controls.
 SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | AILogic$ LeastCreatures | SubAbility$ DBCounters
 SVar:DBCounters:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ M1M1 | CounterNum$ X
 SVar:X:Count$Valid Creature.ChosenCtrl
 SVar:Y:PlayerCountOpponents$LowestValid Creature.YouCtrl
 SVar:NeedsToPlayVar:Y LE4
-Oracle:As Canker Abomination enters the battlefield, choose an opponent. Canker Abomination enters the battlefield with a -1/-1 counter on it for each creature that player controls.
+Oracle:As Canker Abomination enters, choose an opponent. Canker Abomination enters with a -1/-1 counter on it for each creature that player controls.
diff --git a/forge-gui/res/cardsfolder/c/canoptek_scarab_swarm.txt b/forge-gui/res/cardsfolder/c/canoptek_scarab_swarm.txt
index 3a1303c89cc..68e4abe691c 100644
--- a/forge-gui/res/cardsfolder/c/canoptek_scarab_swarm.txt
+++ b/forge-gui/res/cardsfolder/c/canoptek_scarab_swarm.txt
@@ -3,10 +3,10 @@ ManaCost:4
 Types:Artifact Creature Insect
 PT:1/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ Feeder Mandibles — When CARDNAME enters the battlefield, exile target player's graveyard. For each artifact or land card exiled this way, create a 1/1 colorless Insect artifact creature token with flying.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ Feeder Mandibles — When CARDNAME enters, exile target player's graveyard. For each artifact or land card exiled this way, create a 1/1 colorless Insect artifact creature token with flying.
 SVar:TrigExile:DB$ ChangeZoneAll | ValidTgts$ Player | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | SubAbility$ DBToken | RememberChanged$ True
 SVar:DBToken:DB$ Token | TokenAmount$ X | TokenScript$ c_1_1_a_insect_flying | TokenOwner$ You | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Valid Land,Artifact
 DeckHas:Ability$Token
-Oracle:Flying\nFeeder Mandibles — When Canoptek Scarab Swarm enters the battlefield, exile target player's graveyard. For each artifact or land card exiled this way, create a 1/1 colorless Insect artifact creature token with flying.
+Oracle:Flying\nFeeder Mandibles — When Canoptek Scarab Swarm enters, exile target player's graveyard. For each artifact or land card exiled this way, create a 1/1 colorless Insect artifact creature token with flying.
diff --git a/forge-gui/res/cardsfolder/c/canoptek_spyder.txt b/forge-gui/res/cardsfolder/c/canoptek_spyder.txt
index 30606bace5c..153132b97a9 100644
--- a/forge-gui/res/cardsfolder/c/canoptek_spyder.txt
+++ b/forge-gui/res/cardsfolder/c/canoptek_spyder.txt
@@ -3,7 +3,7 @@ ManaCost:5
 Types:Artifact Creature Spider
 PT:4/4
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Creature.Artifact+YouCtrl+Other+nonToken,Vehicle.YouCtrl+Other+nonToken | Origin$ Any | Destination$ Battlefield | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Fabricator Claw Array — Whenever another nontoken artifact creature or Vehicle enters the battlefield under your control, draw a card.
+T:Mode$ ChangesZone | ValidCard$ Creature.Artifact+YouCtrl+Other+nonToken,Vehicle.YouCtrl+Other+nonToken | Origin$ Any | Destination$ Battlefield | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Fabricator Claw Array — Whenever another nontoken artifact creature or Vehicle you control enters, draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
 DeckHints:Type$Artifact|Vehicle
-Oracle:Flying\nFabricator Claw Array — Whenever another nontoken artifact creature or Vehicle enters the battlefield under your control, draw a card.
+Oracle:Flying\nFabricator Claw Array — Whenever another nontoken artifact creature or Vehicle you control enters, draw a card.
diff --git a/forge-gui/res/cardsfolder/c/canoptek_tomb_sentinel.txt b/forge-gui/res/cardsfolder/c/canoptek_tomb_sentinel.txt
index 2c987577822..5eed702743b 100644
--- a/forge-gui/res/cardsfolder/c/canoptek_tomb_sentinel.txt
+++ b/forge-gui/res/cardsfolder/c/canoptek_tomb_sentinel.txt
@@ -3,8 +3,8 @@ ManaCost:4
 Types:Artifact Creature Insect
 PT:4/3
 K:Vigilance
-T:Mode$ ChangesZone | Origin$ Graveyard | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Card.Self | Execute$ DBChangeZone | TriggerDescription$ Exile Cannon — When CARDNAME enters the battlefield from a graveyard, exile up to one target nonland permanent.
+T:Mode$ ChangesZone | Origin$ Graveyard | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Card.Self | Execute$ DBChangeZone | TriggerDescription$ Exile Cannon — When CARDNAME enters from a graveyard, exile up to one target nonland permanent.
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand | TargetMin$ 0 | TargetMax$ 1
 K:Unearth:7
 DeckHas:Ability$Graveyard
-Oracle:Vigilance\nExile Cannon — When Canoptek Tomb Sentinel enters the battlefield from a graveyard, exile up to one target nonland permanent.\nUnearth {7} ({7}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
+Oracle:Vigilance\nExile Cannon — When Canoptek Tomb Sentinel enters from a graveyard, exile up to one target nonland permanent.\nUnearth {7} ({7}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/c/canopy_baloth.txt b/forge-gui/res/cardsfolder/c/canopy_baloth.txt
index 54e61a4b0f3..aeae830838c 100644
--- a/forge-gui/res/cardsfolder/c/canopy_baloth.txt
+++ b/forge-gui/res/cardsfolder/c/canopy_baloth.txt
@@ -2,7 +2,7 @@ Name:Canopy Baloth
 ManaCost:3 G
 Types:Creature Beast
 PT:4/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, CARDNAME gets +2/+2 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Landfall — Whenever a land you control enters, CARDNAME gets +2/+2 until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2 | NumDef$ +2
 SVar:BuffedBy:Land
-Oracle:Landfall — Whenever a land enters the battlefield under your control, Canopy Baloth gets +2/+2 until end of turn.
+Oracle:Landfall — Whenever a land you control enters, Canopy Baloth gets +2/+2 until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/canopy_crawler.txt b/forge-gui/res/cardsfolder/c/canopy_crawler.txt
index 78c7b9d74bd..e927794834b 100644
--- a/forge-gui/res/cardsfolder/c/canopy_crawler.txt
+++ b/forge-gui/res/cardsfolder/c/canopy_crawler.txt
@@ -5,4 +5,4 @@ PT:2/2
 K:Amplify:1:Beast
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ X | NumDef$ X | SpellDescription$ Target creature gets +1/+1 until end of turn for each +1/+1 counter on CARDNAME.
 SVar:X:Count$CardCounters.P1P1
-Oracle:Amplify 1 (As this creature enters the battlefield, put a +1/+1 counter on it for each Beast card you reveal in your hand.)\n{T}: Target creature gets +1/+1 until end of turn for each +1/+1 counter on Canopy Crawler.
+Oracle:Amplify 1 (As this creature enters, put a +1/+1 counter on it for each Beast card you reveal in your hand.)\n{T}: Target creature gets +1/+1 until end of turn for each +1/+1 counter on Canopy Crawler.
diff --git a/forge-gui/res/cardsfolder/c/canopy_vista.txt b/forge-gui/res/cardsfolder/c/canopy_vista.txt
index aab94cfd105..70f2990b463 100644
--- a/forge-gui/res/cardsfolder/c/canopy_vista.txt
+++ b/forge-gui/res/cardsfolder/c/canopy_vista.txt
@@ -1,6 +1,6 @@
 Name:Canopy Vista
 ManaCost:no cost
 Types:Land Forest Plains
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters the battlefield tapped unless you control two or more basic lands.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you control two or more basic lands.
 SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Land.Basic+YouCtrl | ConditionCompare$ LE1
-Oracle:({T}: Add {G} or {W}.)\nCanopy Vista enters the battlefield tapped unless you control two or more basic lands.
+Oracle:({T}: Add {G} or {W}.)\nCanopy Vista enters tapped unless you control two or more basic lands.
diff --git a/forge-gui/res/cardsfolder/c/canyon_jerboa.txt b/forge-gui/res/cardsfolder/c/canyon_jerboa.txt
index 01a59242c64..f2c88d7872c 100644
--- a/forge-gui/res/cardsfolder/c/canyon_jerboa.txt
+++ b/forge-gui/res/cardsfolder/c/canyon_jerboa.txt
@@ -2,7 +2,7 @@ Name:Canyon Jerboa
 ManaCost:2 W
 Types:Creature Mouse
 PT:1/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ DBPumpAll | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, creatures you control get +1/+1 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ DBPumpAll | TriggerDescription$ Landfall — Whenever a land you control enters, creatures you control get +1/+1 until end of turn.
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1
 SVar:BuffedBy:Land
-Oracle:Landfall — Whenever a land enters the battlefield under your control, creatures you control get +1/+1 until end of turn.
+Oracle:Landfall — Whenever a land you control enters, creatures you control get +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/canyon_slough.txt b/forge-gui/res/cardsfolder/c/canyon_slough.txt
index 0c99e4539b7..628f9855591 100644
--- a/forge-gui/res/cardsfolder/c/canyon_slough.txt
+++ b/forge-gui/res/cardsfolder/c/canyon_slough.txt
@@ -1,6 +1,7 @@
 Name:Canyon Slough
 ManaCost:no cost
 Types:Land Swamp Mountain
-K:CARDNAME enters the battlefield tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 K:Cycling:2
-Oracle:({T}: Add {B} or {R}.)\nCanyon Slough enters the battlefield tapped.\nCycling {2} ({2}, Discard this card: Draw a card.)
+Oracle:({T}: Add {B} or {R}.)\nCanyon Slough enters tapped.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/c/cao_ren_wei_commander.txt b/forge-gui/res/cardsfolder/c/cao_ren_wei_commander.txt
index bff88a27dbc..d715b1ea442 100644
--- a/forge-gui/res/cardsfolder/c/cao_ren_wei_commander.txt
+++ b/forge-gui/res/cardsfolder/c/cao_ren_wei_commander.txt
@@ -3,6 +3,6 @@ ManaCost:2 B B
 Types:Legendary Creature Human Soldier Warrior
 PT:3/3
 K:Horsemanship
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME enters the battlefield, you lose 3 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME enters, you lose 3 life.
 SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 3
-Oracle:Horsemanship (This creature can't be blocked except by creatures with horsemanship.)\nWhen Cao Ren, Wei Commander enters the battlefield, you lose 3 life.
+Oracle:Horsemanship (This creature can't be blocked except by creatures with horsemanship.)\nWhen Cao Ren, Wei Commander enters, you lose 3 life.
diff --git a/forge-gui/res/cardsfolder/c/caprichrome.txt b/forge-gui/res/cardsfolder/c/caprichrome.txt
index 0009b0b167a..9d21b03b110 100644
--- a/forge-gui/res/cardsfolder/c/caprichrome.txt
+++ b/forge-gui/res/cardsfolder/c/caprichrome.txt
@@ -7,4 +7,4 @@ K:Vigilance
 K:Devour artifact:1
 DeckHas:Ability$Counters
 DeckNeeds:Type$Artifact
-Oracle:Flash\nVigilance\nDevour artifact 1 (As this enters the battlefield, you may sacrifice any number of artifacts. This creature enters the battlefield with that many +1/+1 counters on it.)
+Oracle:Flash\nVigilance\nDevour artifact 1 (As this enters, you may sacrifice any number of artifacts. This creature enters with that many +1/+1 counters on it.)
diff --git a/forge-gui/res/cardsfolder/c/capricious_hellraiser.txt b/forge-gui/res/cardsfolder/c/capricious_hellraiser.txt
index 08990c1f514..16742265821 100644
--- a/forge-gui/res/cardsfolder/c/capricious_hellraiser.txt
+++ b/forge-gui/res/cardsfolder/c/capricious_hellraiser.txt
@@ -4,11 +4,11 @@ Types:Creature Phyrexian Dragon
 PT:4/4
 K:Flying
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 3 | EffectZone$ All | IsPresent$ Card.YouOwn | PresentZone$ Graveyard | PresentCompare$ GE9 | Description$ This spell costs {3} less to cast if you have nine or more cards in your graveyard.
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile three cards at random from your graveyard. Choose a noncreature, nonland card from among them and copy it. You may cast the copy without paying its mana cost.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile three cards at random from your graveyard. Choose a noncreature, nonland card from among them and copy it. You may cast the copy without paying its mana cost.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | AtRandom$ True | Hidden$ True | ChangeType$ Card.YouOwn | ChangeNum$ 3 | RememberChanged$ True | SubAbility$ DBChoose
 SVar:DBChoose:DB$ ChooseCard | ChoiceZone$ Exile | Amount$ 1 | Choices$ Card.IsRemembered+nonLand+nonCreature | ChoiceTitle$ Choose a noncreature, nonland card | SubAbility$ DBPlay
 SVar:DBPlay:DB$ Play | Defined$ ChosenCard | ValidSA$ Spell | Controller$ You | CopyCard$ True | WithoutManaCost$ True | Optional$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Graveyard
 DeckHints:Ability$Mill
-Oracle:This spell costs {3} less to cast if you have nine or more cards in your graveyard.\nFlying\nWhen Capricious Hellraiser enters the battlefield, exile three cards at random from your graveyard. Choose a noncreature, nonland card from among them and copy it. You may cast the copy without paying its mana cost.
+Oracle:This spell costs {3} less to cast if you have nine or more cards in your graveyard.\nFlying\nWhen Capricious Hellraiser enters, exile three cards at random from your graveyard. Choose a noncreature, nonland card from among them and copy it. You may cast the copy without paying its mana cost.
diff --git a/forge-gui/res/cardsfolder/c/capricopian.txt b/forge-gui/res/cardsfolder/c/capricopian.txt
index 7f0e16812cf..ce27f992bde 100644
--- a/forge-gui/res/cardsfolder/c/capricopian.txt
+++ b/forge-gui/res/cardsfolder/c/capricopian.txt
@@ -7,4 +7,4 @@ SVar:X:Count$xPaid
 A:AB$ PutCounter | Cost$ 2 | Activator$ Player | IsPresent$ Card.Self+attackingYou | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBReselect | ActivationPhases$ Declare Attackers | AILogic$ AlwaysWithNoTgt | SpellDescription$ Put a +1/+1 counter on CARDNAME, then you may reselect which player CARDNAME is attacking. Only the player CARDNAME is attacking may activate this ability and only during the declare attackers step. (It can't attack its controller.)
 SVar:DBReselect:DB$ ChangeCombatants | Defined$ Self | AILogic$ WeakestOppExceptCtrl | Attacking$ Player.OpponentOf CardController
 DeckHas:Ability$Counters
-Oracle:Capricopian enters the battlefield with X +1/+1 counters on it.\n{2}: Put a +1/+1 counter on Capricopian, then you may reselect which player Capricopian is attacking. Only the player Capricopian is attacking may activate this ability and only during the declare attackers step. (It can't attack its controller.)
+Oracle:Capricopian enters with X +1/+1 counters on it.\n{2}: Put a +1/+1 counter on Capricopian, then you may reselect which player Capricopian is attacking. Only the player Capricopian is attacking may activate this ability and only during the declare attackers step. (It can't attack its controller.)
diff --git a/forge-gui/res/cardsfolder/c/captain_of_the_mists.txt b/forge-gui/res/cardsfolder/c/captain_of_the_mists.txt
index 0206f06efe8..b1b64184847 100644
--- a/forge-gui/res/cardsfolder/c/captain_of_the_mists.txt
+++ b/forge-gui/res/cardsfolder/c/captain_of_the_mists.txt
@@ -2,9 +2,9 @@ Name:Captain of the Mists
 ManaCost:2 U
 Types:Creature Human Wizard
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Human.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever another Human enters the battlefield under your control, untap CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Human.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever another Human you control enters, untap CARDNAME.
 SVar:TrigUntap:DB$ Untap | Defined$ Self
 A:AB$ TapOrUntap | Cost$ 1 U T | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SpellDescription$ You may tap or untap target permanent.
 AI:RemoveDeck:All
 SVar:NonCombatPriority:7
-Oracle:Whenever another Human enters the battlefield under your control, untap Captain of the Mists.\n{1}{U}, {T}: You may tap or untap target permanent.
+Oracle:Whenever another Human you control enters, untap Captain of the Mists.\n{1}{U}, {T}: You may tap or untap target permanent.
diff --git a/forge-gui/res/cardsfolder/c/captain_of_the_watch.txt b/forge-gui/res/cardsfolder/c/captain_of_the_watch.txt
index 6801e794217..74db6b8c7f8 100644
--- a/forge-gui/res/cardsfolder/c/captain_of_the_watch.txt
+++ b/forge-gui/res/cardsfolder/c/captain_of_the_watch.txt
@@ -4,8 +4,8 @@ Types:Creature Human Soldier
 PT:3/3
 K:Vigilance
 S:Mode$ Continuous | Affected$ Creature.Soldier+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Vigilance | Description$ Other Soldier creatures you control get +1/+1 and have vigilance.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create three 1/1 white Soldier creature tokens.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create three 1/1 white Soldier creature tokens.
 SVar:TrigToken:DB$ Token | TokenAmount$ 3 | TokenScript$ w_1_1_soldier | TokenOwner$ You
 SVar:PlayMain1:TRUE
 DeckHints:Type$Soldier
-Oracle:Vigilance (Attacking doesn't cause this creature to tap.)\nOther Soldier creatures you control get +1/+1 and have vigilance.\nWhen Captain of the Watch enters the battlefield, create three 1/1 white Soldier creature tokens.
+Oracle:Vigilance (Attacking doesn't cause this creature to tap.)\nOther Soldier creatures you control get +1/+1 and have vigilance.\nWhen Captain of the Watch enters, create three 1/1 white Soldier creature tokens.
diff --git a/forge-gui/res/cardsfolder/c/captain_storm_cosmium_raider.txt b/forge-gui/res/cardsfolder/c/captain_storm_cosmium_raider.txt
index 29aef5a39ab..cc379caaa90 100644
--- a/forge-gui/res/cardsfolder/c/captain_storm_cosmium_raider.txt
+++ b/forge-gui/res/cardsfolder/c/captain_storm_cosmium_raider.txt
@@ -2,8 +2,8 @@ Name:Captain Storm, Cosmium Raider
 ManaCost:U R
 Types:Legendary Creature Human Pirate
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an artifact enters the battlefield under your control, put a +1/+1 counter on target Pirate you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an artifact you control enters, put a +1/+1 counter on target Pirate you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Pirate.YouCtrl | TgtPrompt$ Select target Pirate you control | CounterType$ P1P1 | CounterNum$ 1
 DeckHints:Type$Artifact|Pirate
 DeckHas:Ability$Counters
-Oracle:Whenever an artifact enters the battlefield under your control, put a +1/+1 counter on target Pirate you control.
+Oracle:Whenever an artifact you control enters, put a +1/+1 counter on target Pirate you control.
diff --git a/forge-gui/res/cardsfolder/c/captivating_crossroads.txt b/forge-gui/res/cardsfolder/c/captivating_crossroads.txt
index a605c493d19..0f6eed729fe 100644
--- a/forge-gui/res/cardsfolder/c/captivating_crossroads.txt
+++ b/forge-gui/res/cardsfolder/c/captivating_crossroads.txt
@@ -1,11 +1,11 @@
 Name:Captivating Crossroads
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ Y | ConditionSVarCompare$ LT3 | SpellDescription$ During your first three turns of the game, CARDNAME enters the battlefield tapped if you were the starting player.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ During your first three turns of the game, CARDNAME enters tapped if you were the starting player.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ Y | ConditionSVarCompare$ LT3
 SVar:Y:Count$YourTurns/Plus.X
 SVar:X:Count$StartingPlayer.0.3
 K:ETBReplacement:Other:ChooseColor
-SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
+SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters, choose a color.
 A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color.
-Oracle:During your first three turns of the game, Captivating Crossroads enters the battlefield tapped if you were the starting player.\nAs Captivating Crossroads enters the battlefield, choose a color.\n{T}: Add one mana of the chosen color.
+Oracle:During your first three turns of the game, Captivating Crossroads enters tapped if you were the starting player.\nAs Captivating Crossroads enters, choose a color.\n{T}: Add one mana of the chosen color.
diff --git a/forge-gui/res/cardsfolder/c/captivating_unicorn.txt b/forge-gui/res/cardsfolder/c/captivating_unicorn.txt
index cd9c04f4533..1e759a3b1cb 100644
--- a/forge-gui/res/cardsfolder/c/captivating_unicorn.txt
+++ b/forge-gui/res/cardsfolder/c/captivating_unicorn.txt
@@ -2,8 +2,8 @@ Name:Captivating Unicorn
 ManaCost:4 W
 Types:Creature Unicorn
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Constellation — Whenever an enchantment enters the battlefield under your control, tap target creature an opponent controls.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Constellation — Whenever an enchantment you control enters, tap target creature an opponent controls.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls.
 SVar:BuffedBy:Enchantment
 DeckNeeds:Type$Enchantment
-Oracle:Constellation — Whenever an enchantment enters the battlefield under your control, tap target creature an opponent controls.
+Oracle:Constellation — Whenever an enchantment you control enters, tap target creature an opponent controls.
diff --git a/forge-gui/res/cardsfolder/c/captive_audience.txt b/forge-gui/res/cardsfolder/c/captive_audience.txt
index be9a2e63648..919de55e4d3 100644
--- a/forge-gui/res/cardsfolder/c/captive_audience.txt
+++ b/forge-gui/res/cardsfolder/c/captive_audience.txt
@@ -1,7 +1,7 @@
 Name:Captive Audience
 ManaCost:5 B R
 Types:Enchantment
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ DBChooseOpp | Layer$ Control | Description$ CARDNAME enters the battlefield under the control of an opponent of your choice.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ DBChooseOpp | Layer$ Control | Description$ CARDNAME enters under the control of an opponent of your choice.
 SVar:DBChooseOpp:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | ChoiceTitle$ Choose an opponent to give control to | AILogic$ Curse | SubAbility$ MoveToPlay
 SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | GainControl$ ChosenPlayer
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigCharm | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, ABILITY
@@ -12,4 +12,4 @@ SVar:MakeZombies:DB$ Token | TokenAmount$ 5 | TokenScript$ b_2_2_zombie | TokenO
 SVar:SacMe:6
 AI:RemoveDeck:Random
 DeckHas:Ability$Token
-Oracle:Captive Audience enters the battlefield under the control of an opponent of your choice.\nAt the beginning of your upkeep, choose one that hasn't been chosen —\n• Your life total becomes 4.\n• Discard your hand.\n• Each opponent creates five 2/2 black Zombie creature tokens.
+Oracle:Captive Audience enters under the control of an opponent of your choice.\nAt the beginning of your upkeep, choose one that hasn't been chosen —\n• Your life total becomes 4.\n• Discard your hand.\n• Each opponent creates five 2/2 black Zombie creature tokens.
diff --git a/forge-gui/res/cardsfolder/c/capture_sphere.txt b/forge-gui/res/cardsfolder/c/capture_sphere.txt
index 36cff8c05c9..01f2457b265 100644
--- a/forge-gui/res/cardsfolder/c/capture_sphere.txt
+++ b/forge-gui/res/cardsfolder/c/capture_sphere.txt
@@ -5,6 +5,6 @@ K:Flash
 K:Enchant creature
 A:SP$ Attach | Cost$ 3 U | ValidTgts$ Creature | AILogic$ KeepTapped
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap enchanted creature.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
-Oracle:Flash (You may cast this spell any time you could cast an instant.)\nEnchant creature\nWhen Capture Sphere enters the battlefield, tap enchanted creature.\nEnchanted creature doesn't untap during its controller's untap step.
+Oracle:Flash (You may cast this spell any time you could cast an instant.)\nEnchant creature\nWhen Capture Sphere enters, tap enchanted creature.\nEnchanted creature doesn't untap during its controller's untap step.
diff --git a/forge-gui/res/cardsfolder/c/captured_by_lagacs.txt b/forge-gui/res/cardsfolder/c/captured_by_lagacs.txt
index d94a4fd6da4..ad50dcd3eb7 100644
--- a/forge-gui/res/cardsfolder/c/captured_by_lagacs.txt
+++ b/forge-gui/res/cardsfolder/c/captured_by_lagacs.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 G W | ValidTgts$ Creature | AILogic$ Curse
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block. | Description$ Enchanted creature can't attack or block.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPut | TriggerDescription$ When CARDNAME enters the battlefield, support 2. (Put a +1/+1 counter on each of up to two target creatures.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPut | TriggerDescription$ When CARDNAME enters, support 2. (Put a +1/+1 counter on each of up to two target creatures.)
 SVar:TrigPut:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select up to two target creatures | TargetMin$ 0 | TargetMax$ 2 | CounterType$ P1P1 | CounterNum$ 1
-Oracle:Enchant creature\nEnchanted creature can't attack or block.\nWhen Captured by Lagacs enters the battlefield, support 2. (Put a +1/+1 counter on each of up to two target creatures.)
+Oracle:Enchant creature\nEnchanted creature can't attack or block.\nWhen Captured by Lagacs enters, support 2. (Put a +1/+1 counter on each of up to two target creatures.)
diff --git a/forge-gui/res/cardsfolder/c/carnage_interpreter.txt b/forge-gui/res/cardsfolder/c/carnage_interpreter.txt
index a5e37238123..df4fd51072b 100644
--- a/forge-gui/res/cardsfolder/c/carnage_interpreter.txt
+++ b/forge-gui/res/cardsfolder/c/carnage_interpreter.txt
@@ -2,11 +2,11 @@ Name:Carnage Interpreter
 ManaCost:1 BR BR
 Types:Creature Devil Detective
 PT:3/3
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, discard your hand, then investigate four times. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, discard your hand, then investigate four times. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
 SVar:TrigDiscard:DB$ Discard | Mode$ Hand | SubAbility$ DBInvestigate
 SVar:DBInvestigate:DB$ Investigate | Num$ 4
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Menace | CheckSVar$ X | SVarCompare$ LE1 | Description$ As long as you have one or fewer cards in hand, CARDNAME gets +2/+2 and has menace.
 SVar:X:Count$InYourHand
 DeckHas:Ability$Discard|Token & Type$Clue|Artifact
 DeckHints:Ability$Discard
-Oracle:When Carnage Interpreter enters the battlefield, discard your hand, then investigate four times. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\nAs long as you have one or fewer cards in hand, Carnage Interpreter gets +2/+2 and has menace.
+Oracle:When Carnage Interpreter enters, discard your hand, then investigate four times. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\nAs long as you have one or fewer cards in hand, Carnage Interpreter gets +2/+2 and has menace.
diff --git a/forge-gui/res/cardsfolder/c/carnage_wurm.txt b/forge-gui/res/cardsfolder/c/carnage_wurm.txt
index b30538279ef..fe2f0b587c3 100644
--- a/forge-gui/res/cardsfolder/c/carnage_wurm.txt
+++ b/forge-gui/res/cardsfolder/c/carnage_wurm.txt
@@ -4,4 +4,4 @@ Types:Creature Wurm
 PT:6/6
 K:Bloodthirst:3
 K:Trample
-Oracle:Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.)\nTrample (This creature can deal excess combat damage to the player or planeswalker it's attacking.)
+Oracle:Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters with three +1/+1 counters on it.)\nTrample (This creature can deal excess combat damage to the player or planeswalker it's attacking.)
diff --git a/forge-gui/res/cardsfolder/c/carnifex_demon.txt b/forge-gui/res/cardsfolder/c/carnifex_demon.txt
index 35082840660..c25d451d86b 100644
--- a/forge-gui/res/cardsfolder/c/carnifex_demon.txt
+++ b/forge-gui/res/cardsfolder/c/carnifex_demon.txt
@@ -5,4 +5,4 @@ PT:6/6
 K:Flying
 K:etbCounter:M1M1:2
 A:AB$ PutCounterAll | Cost$ B SubCounter<1/M1M1> | ValidCards$ Creature.StrictlyOther | CounterType$ M1M1 | CounterNum$ 1 | IsCurse$ True | SpellDescription$ Put a -1/-1 counter on each other creature.
-Oracle:Flying\nCarnifex Demon enters the battlefield with two -1/-1 counters on it.\n{B}, Remove a -1/-1 counter from Carnifex Demon: Put a -1/-1 counter on each other creature.
+Oracle:Flying\nCarnifex Demon enters with two -1/-1 counters on it.\n{B}, Remove a -1/-1 counter from Carnifex Demon: Put a -1/-1 counter on each other creature.
diff --git a/forge-gui/res/cardsfolder/c/carnival_hellsteed.txt b/forge-gui/res/cardsfolder/c/carnival_hellsteed.txt
index fb4700b721f..62c985400b5 100644
--- a/forge-gui/res/cardsfolder/c/carnival_hellsteed.txt
+++ b/forge-gui/res/cardsfolder/c/carnival_hellsteed.txt
@@ -5,4 +5,4 @@ PT:5/4
 K:First Strike
 K:Haste
 K:Unleash
-Oracle:First strike, haste\nUnleash (You may have this creature enter the battlefield with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.)
+Oracle:First strike, haste\nUnleash (You may have this creature enter with a +1/+1 counter on it. It can't block as long as it has a +1/+1 counter on it.)
diff --git a/forge-gui/res/cardsfolder/c/carnival_of_souls.txt b/forge-gui/res/cardsfolder/c/carnival_of_souls.txt
index dedc0680fff..9cfd72915e1 100644
--- a/forge-gui/res/cardsfolder/c/carnival_of_souls.txt
+++ b/forge-gui/res/cardsfolder/c/carnival_of_souls.txt
@@ -1,8 +1,8 @@
 Name:Carnival of Souls
 ManaCost:1 B
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature enters the battlefield, you lose 1 life and add {B}.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a creature enters, you lose 1 life and add {B}.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 1 | SubAbility$ DBMana
 SVar:DBMana:DB$ Mana | Produced$ B
 AI:RemoveDeck:Random
-Oracle:Whenever a creature enters the battlefield, you lose 1 life and add {B}.
+Oracle:Whenever a creature enters, you lose 1 life and add {B}.
diff --git a/forge-gui/res/cardsfolder/c/carrier_pigeons.txt b/forge-gui/res/cardsfolder/c/carrier_pigeons.txt
index a406aec1fae..ff7176aec6f 100644
--- a/forge-gui/res/cardsfolder/c/carrier_pigeons.txt
+++ b/forge-gui/res/cardsfolder/c/carrier_pigeons.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Creature Bird
 PT:1/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DelTrigSlowtrip | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DelTrigSlowtrip | TriggerDescription$ When CARDNAME enters, draw a card at the beginning of the next turn's upkeep.
 SVar:DelTrigSlowtrip:DB$ DelayedTrigger | NextTurn$ True | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$ Draw | NumCards$ 1 | Defined$ You
-Oracle:Flying\nWhen Carrier Pigeons enters the battlefield, draw a card at the beginning of the next turn's upkeep.
+Oracle:Flying\nWhen Carrier Pigeons enters, draw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/c/carrion_crow.txt b/forge-gui/res/cardsfolder/c/carrion_crow.txt
index 88c23ee83d8..660f2886690 100644
--- a/forge-gui/res/cardsfolder/c/carrion_crow.txt
+++ b/forge-gui/res/cardsfolder/c/carrion_crow.txt
@@ -3,5 +3,6 @@ ManaCost:2 B
 Types:Creature Zombie Bird
 PT:2/2
 K:Flying
-K:CARDNAME enters the battlefield tapped.
-Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nCarrion Crow enters the battlefield tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nCarrion Crow enters tapped.
diff --git a/forge-gui/res/cardsfolder/c/carrion_grub.txt b/forge-gui/res/cardsfolder/c/carrion_grub.txt
index 6c0c8e9f88d..c583c136580 100644
--- a/forge-gui/res/cardsfolder/c/carrion_grub.txt
+++ b/forge-gui/res/cardsfolder/c/carrion_grub.txt
@@ -4,7 +4,7 @@ Types:Creature Insect
 PT:0/5
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | Description$ CARDNAME gets +X/+0, where X is the greatest power among creature cards in your graveyard.
 SVar:X:Count$ValidGraveyard Creature.YouOwn$GreatestPower
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, mill four cards.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters, mill four cards.
 SVar:TrigMill:DB$ Mill | Defined$ You | NumCards$ 4
 DeckHas:Ability$Graveyard
-Oracle:Carrion Grub gets +X/+0, where X is the greatest power among creature cards in your graveyard.\nWhen Carrion Grub enters the battlefield, mill four cards. (Put the top four cards of your library into your graveyard.)
+Oracle:Carrion Grub gets +X/+0, where X is the greatest power among creature cards in your graveyard.\nWhen Carrion Grub enters, mill four cards. (Put the top four cards of your library into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/c/carrion_imp.txt b/forge-gui/res/cardsfolder/c/carrion_imp.txt
index f8a9a36419f..ab84afdbb47 100644
--- a/forge-gui/res/cardsfolder/c/carrion_imp.txt
+++ b/forge-gui/res/cardsfolder/c/carrion_imp.txt
@@ -3,10 +3,10 @@ ManaCost:3 B
 Types:Creature Imp
 PT:2/3
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may exile target creature card from a graveyard. If you do, you gain 2 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may exile target creature card from a graveyard. If you do, you gain 2 life.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Creature | SubAbility$ DBGainLife | RememberChanged$ True
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 DeckHas:Ability$LifeGain
-Oracle:Flying\nWhen Carrion Imp enters the battlefield, you may exile target creature card from a graveyard. If you do, you gain 2 life.
+Oracle:Flying\nWhen Carrion Imp enters, you may exile target creature card from a graveyard. If you do, you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/c/carrion_locust.txt b/forge-gui/res/cardsfolder/c/carrion_locust.txt
index 682545c7b03..11646256e48 100644
--- a/forge-gui/res/cardsfolder/c/carrion_locust.txt
+++ b/forge-gui/res/cardsfolder/c/carrion_locust.txt
@@ -3,9 +3,9 @@ ManaCost:2 B
 Types:Creature Insect Horror
 PT:2/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile target card from an opponent's graveyard. If it was a creature card, that player loses 1 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile target card from an opponent's graveyard. If it was a creature card, that player loses 1 life.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card.OppOwn | TgtPrompt$ Select target card from an opponent's graveyard | RememberChanged$ True | SubAbility$ DBDrain
 SVar:DBDrain:DB$ LoseLife | ConditionDefined$ Remembered | ConditionPresent$ Creature | Defined$ TargetedOwner | LifeAmount$ 1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Graveyard
-Oracle:Flying\nWhen Carrion Locust enters the battlefield, exile target card from an opponent's graveyard. If it was a creature card, that player loses 1 life.
+Oracle:Flying\nWhen Carrion Locust enters, exile target card from an opponent's graveyard. If it was a creature card, that player loses 1 life.
diff --git a/forge-gui/res/cardsfolder/c/carry_away.txt b/forge-gui/res/cardsfolder/c/carry_away.txt
index deb28227031..7577df1006c 100644
--- a/forge-gui/res/cardsfolder/c/carry_away.txt
+++ b/forge-gui/res/cardsfolder/c/carry_away.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant Equipment
 A:SP$ Attach | Cost$ U U | ValidTgts$ Equipment | AILogic$ GainControl
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | GainControl$ You | Description$ You control enchanted Equipment.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigUnattach | TriggerDescription$ When CARDNAME enters the battlefield, unattach enchanted Equipment.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigUnattach | TriggerDescription$ When CARDNAME enters, unattach enchanted Equipment.
 SVar:TrigUnattach:DB$ UnattachAll | Defined$ Valid Card.EquippedByEnchanted | UnattachValid$ Equipment.EnchantedBy
-Oracle:Enchant Equipment\nWhen Carry Away enters the battlefield, unattach enchanted Equipment.\nYou control enchanted Equipment.
+Oracle:Enchant Equipment\nWhen Carry Away enters, unattach enchanted Equipment.\nYou control enchanted Equipment.
diff --git a/forge-gui/res/cardsfolder/c/carth_the_lion.txt b/forge-gui/res/cardsfolder/c/carth_the_lion.txt
index 248ce8bb6b3..f934f3bed74 100644
--- a/forge-gui/res/cardsfolder/c/carth_the_lion.txt
+++ b/forge-gui/res/cardsfolder/c/carth_the_lion.txt
@@ -2,9 +2,9 @@ Name:Carth the Lion
 ManaCost:2 B G
 Types:Legendary Creature Human Warrior
 PT:3/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ Whenever CARDNAME enters the battlefield or a planeswalker you control dies, look at the top seven cards of your library. You may reveal a planeswalker 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$ Battlefield | Destination$ Graveyard | ValidCard$ Planeswalker.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDig | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or a planeswalker you control dies, look at the top seven cards of your library. You may reveal a planeswalker 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$ Card.Self | Execute$ TrigDig | TriggerDescription$ Whenever CARDNAME enters or a planeswalker you control dies, look at the top seven cards of your library. You may reveal a planeswalker 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$ Battlefield | Destination$ Graveyard | ValidCard$ Planeswalker.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDig | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or a planeswalker you control dies, look at the top seven cards of your library. You may reveal a planeswalker card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
 SVar:TrigDig:DB$ Dig | DigNum$ 7 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Planeswalker | RestRandomOrder$ True | ForceRevealToController$ True
 S:Mode$ RaiseCost | ValidCard$ Planeswalker.YouCtrl | ValidSpell$ Activated.Loyalty | Cost$ AddCounter<1/LOYALTY> | Description$ Planeswalkers' loyalty abilities you activate cost an additional [+1] to activate.
 DeckNeeds:Type$Planeswalker
-Oracle:Whenever Carth the Lion enters the battlefield or a planeswalker you control dies, look at the top seven cards of your library. You may reveal a planeswalker card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.\nPlaneswalkers' loyalty abilities you activate cost an additional [+1] to activate.
+Oracle:Whenever Carth the Lion enters or a planeswalker you control dies, look at the top seven cards of your library. You may reveal a planeswalker card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.\nPlaneswalkers' loyalty abilities you activate cost an additional [+1] to activate.
diff --git a/forge-gui/res/cardsfolder/c/cartographer.txt b/forge-gui/res/cardsfolder/c/cartographer.txt
index 153929cc2e4..3e704d25dd3 100644
--- a/forge-gui/res/cardsfolder/c/cartographer.txt
+++ b/forge-gui/res/cardsfolder/c/cartographer.txt
@@ -2,6 +2,6 @@ Name:Cartographer
 ManaCost:2 G
 Types:Creature Human
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return target land card from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may return target land card from your graveyard to your hand.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Land.YouCtrl
-Oracle:When Cartographer enters the battlefield, you may return target land card from your graveyard to your hand.
+Oracle:When Cartographer enters, you may return target land card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/c/cartographers_companion.txt b/forge-gui/res/cardsfolder/c/cartographers_companion.txt
index 4491c76a628..5d84f3befc4 100644
--- a/forge-gui/res/cardsfolder/c/cartographers_companion.txt
+++ b/forge-gui/res/cardsfolder/c/cartographers_companion.txt
@@ -2,7 +2,7 @@ Name:Cartographer's Companion
 ManaCost:3
 Types:Artifact Creature Gnome
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a Map token. (It's an artifact with "{1}, {T}, Sacrifice this artifact: Target creature you control explores. Activate only as a sorcery.")
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a Map token. (It's an artifact with "{1}, {T}, Sacrifice this artifact: Target creature you control explores. Activate only as a sorcery.")
 SVar:TrigToken:DB$ Token | TokenScript$ c_a_map_sac_explore
 DeckHas:Ability$Token|Counters|Sacrifice & Type$Artifact|Map
-Oracle:When Cartographer's Companion enters the battlefield, create a Map token. (It's an artifact with "{1}, {T}, Sacrifice this artifact: Target creature you control explores. Activate only as a sorcery.")
+Oracle:When Cartographer's Companion enters, create a Map token. (It's an artifact with "{1}, {T}, Sacrifice this artifact: Target creature you control explores. Activate only as a sorcery.")
diff --git a/forge-gui/res/cardsfolder/c/cartouche_of_ambition.txt b/forge-gui/res/cardsfolder/c/cartouche_of_ambition.txt
index 3c6df4f9a64..2827f14b6b7 100644
--- a/forge-gui/res/cardsfolder/c/cartouche_of_ambition.txt
+++ b/forge-gui/res/cardsfolder/c/cartouche_of_ambition.txt
@@ -3,8 +3,8 @@ ManaCost:2 B
 Types:Enchantment Aura Cartouche
 K:Enchant creature you control
 A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, you may put a -1/-1 counter on target creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters, you may put a -1/-1 counter on target creature.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ M1M1 | IsCurse$ True | CounterNum$ 1
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Lifelink | Description$ Enchanted creature gets +1/+1 and has lifelink.
 DeckHints:Name$Trial of Ambition
-Oracle:Enchant creature you control\nWhen Cartouche of Ambition enters the battlefield, you may put a -1/-1 counter on target creature.\nEnchanted creature gets +1/+1 and has lifelink.
+Oracle:Enchant creature you control\nWhen Cartouche of Ambition enters, you may put a -1/-1 counter on target creature.\nEnchanted creature gets +1/+1 and has lifelink.
diff --git a/forge-gui/res/cardsfolder/c/cartouche_of_knowledge.txt b/forge-gui/res/cardsfolder/c/cartouche_of_knowledge.txt
index 5a32f11d76a..a9a9c7b936b 100644
--- a/forge-gui/res/cardsfolder/c/cartouche_of_knowledge.txt
+++ b/forge-gui/res/cardsfolder/c/cartouche_of_knowledge.txt
@@ -3,8 +3,8 @@ ManaCost:1 U
 Types:Enchantment Aura Cartouche
 K:Enchant creature you control
 A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Flying | Description$ Enchanted creature gets +1/+1 and has flying.
 DeckHints:Name$Trial of Knowledge
-Oracle:Enchant creature you control\nWhen Cartouche of Knowledge enters the battlefield, draw a card.\nEnchanted creature gets +1/+1 and has flying.
+Oracle:Enchant creature you control\nWhen Cartouche of Knowledge enters, draw a card.\nEnchanted creature gets +1/+1 and has flying.
diff --git a/forge-gui/res/cardsfolder/c/cartouche_of_solidarity.txt b/forge-gui/res/cardsfolder/c/cartouche_of_solidarity.txt
index 681497960bc..88ac34a1008 100644
--- a/forge-gui/res/cardsfolder/c/cartouche_of_solidarity.txt
+++ b/forge-gui/res/cardsfolder/c/cartouche_of_solidarity.txt
@@ -3,8 +3,8 @@ ManaCost:W
 Types:Enchantment Aura Cartouche
 K:Enchant creature you control
 A:SP$ Attach | Cost$ W | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 white Warrior creature token with vigilance.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 white Warrior creature token with vigilance.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_warrior_vigilance | TokenOwner$ You
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ First Strike | Description$ Enchanted creature gets +1/+1 and has first strike.
 DeckHints:Name$Trial of Solidarity
-Oracle:Enchant creature you control\nWhen Cartouche of Solidarity enters the battlefield, create a 1/1 white Warrior creature token with vigilance.\nEnchanted creature gets +1/+1 and has first strike.
+Oracle:Enchant creature you control\nWhen Cartouche of Solidarity enters, create a 1/1 white Warrior creature token with vigilance.\nEnchanted creature gets +1/+1 and has first strike.
diff --git a/forge-gui/res/cardsfolder/c/cartouche_of_strength.txt b/forge-gui/res/cardsfolder/c/cartouche_of_strength.txt
index 8201643b82b..f3f443622e7 100644
--- a/forge-gui/res/cardsfolder/c/cartouche_of_strength.txt
+++ b/forge-gui/res/cardsfolder/c/cartouche_of_strength.txt
@@ -3,8 +3,8 @@ ManaCost:2 G
 Types:Enchantment Aura Cartouche
 K:Enchant creature you control
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigFight | TriggerDescription$ When CARDNAME enters the battlefield, you may have enchanted creature fight target creature an opponent controls. (Each deals damage equal to its power to the other.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigFight | TriggerDescription$ When CARDNAME enters, you may have enchanted creature fight target creature an opponent controls. (Each deals damage equal to its power to the other.)
 SVar:TrigFight:DB$ Fight | Defined$ Enchanted | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Trample | Description$ Enchanted creature gets +1/+1 and has trample.
 DeckHints:Name$Trial of Strength
-Oracle:Enchant creature you control\nWhen Cartouche of Strength enters the battlefield, you may have enchanted creature fight target creature an opponent controls. (Each deals damage equal to its power to the other.)\nEnchanted creature gets +1/+1 and has trample.
+Oracle:Enchant creature you control\nWhen Cartouche of Strength enters, you may have enchanted creature fight target creature an opponent controls. (Each deals damage equal to its power to the other.)\nEnchanted creature gets +1/+1 and has trample.
diff --git a/forge-gui/res/cardsfolder/c/cartouche_of_zeal.txt b/forge-gui/res/cardsfolder/c/cartouche_of_zeal.txt
index f9672660f87..d5d9f485a24 100644
--- a/forge-gui/res/cardsfolder/c/cartouche_of_zeal.txt
+++ b/forge-gui/res/cardsfolder/c/cartouche_of_zeal.txt
@@ -3,9 +3,10 @@ ManaCost:R
 Types:Enchantment Aura Cartouche
 K:Enchant creature you control
 A:SP$ Attach | Cost$ R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature can't block this turn.
-SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | IsCurse$ True | KW$ HIDDEN CARDNAME can't block. | TgtPrompt$ Select target creature
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature can't block this turn.
+SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | IsCurse$ True | KW$ HIDDEN CARDNAME can't block. | TgtPrompt$ Select target creature.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Haste | Description$ Enchanted creature gets +1/+1 and has haste.
 SVar:PlayMain1:TRUE
 DeckHints:Name$Trial of Zeal
-Oracle:Enchant creature you control\nWhen Cartouche of Zeal enters the battlefield, target creature can't block this turn.\nEnchanted creature gets +1/+1 and has haste.
+Oracle:Enchant creature you control\nWhen Cartouche of Zeal enters, target creature can't block this turn.\nEnchanted creature gets +1/+1 and has haste.
diff --git a/forge-gui/res/cardsfolder/c/carven_caryatid.txt b/forge-gui/res/cardsfolder/c/carven_caryatid.txt
index 60a302a20a9..669087406c0 100644
--- a/forge-gui/res/cardsfolder/c/carven_caryatid.txt
+++ b/forge-gui/res/cardsfolder/c/carven_caryatid.txt
@@ -3,6 +3,6 @@ ManaCost:1 G G
 Types:Creature Spirit
 PT:2/5
 K:Defender
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
-Oracle:Defender (This creature can't attack.)\nWhen Carven Caryatid enters the battlefield, draw a card.
+Oracle:Defender (This creature can't attack.)\nWhen Carven Caryatid enters, draw a card.
diff --git a/forge-gui/res/cardsfolder/c/cascade_seer.txt b/forge-gui/res/cardsfolder/c/cascade_seer.txt
index 9b959d735c9..9d135af7aea 100644
--- a/forge-gui/res/cardsfolder/c/cascade_seer.txt
+++ b/forge-gui/res/cardsfolder/c/cascade_seer.txt
@@ -2,9 +2,9 @@ Name:Cascade Seer
 ManaCost:3 U
 Types:Creature Merfolk Wizard
 PT:3/3
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry X, where X is the number of creatures in your party. (Your party consists of up to one each of Cleric, Rogue, Warrior, and Wizard.)
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters, scry X, where X is the number of creatures in your party. (Your party consists of up to one each of Cleric, Rogue, Warrior, and Wizard.)
 SVar:TrigScry:DB$ Scry | ScryNum$ X
 SVar:X:Count$Party
 DeckHas:Ability$Party
 DeckHints:Type$Cleric|Rogue|Warrior
-Oracle:When Cascade Seer enters the battlefield, scry X, where X is the number of creatures in your party. (Your party consists of up to one each of Cleric, Rogue, Warrior, and Wizard.)
+Oracle:When Cascade Seer enters, scry X, where X is the number of creatures in your party. (Your party consists of up to one each of Cleric, Rogue, Warrior, and Wizard.)
diff --git a/forge-gui/res/cardsfolder/c/case_file_auditor.txt b/forge-gui/res/cardsfolder/c/case_file_auditor.txt
index 28b32e0220f..169839b3e6e 100644
--- a/forge-gui/res/cardsfolder/c/case_file_auditor.txt
+++ b/forge-gui/res/cardsfolder/c/case_file_auditor.txt
@@ -2,10 +2,10 @@ Name:Case File Auditor
 ManaCost:2 W
 Types:Creature Human Detective
 PT:1/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield and whenever you solve a Case, look at the top six cards of your library. You may reveal an enchantment 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$ CaseSolved | ValidPlayer$ You | ValidCard$ Case | Execute$ TrigDig | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME enters the battlefield and whenever you solve a Case, look at the top six cards of your library. You may reveal an enchantment 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$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters and whenever you solve a Case, look at the top six cards of your library. You may reveal an enchantment 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$ CaseSolved | ValidPlayer$ You | ValidCard$ Case | Execute$ TrigDig | Secondary$ True | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME enters and whenever you solve a Case, look at the top six cards of your library. You may reveal an enchantment card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
 SVar:TrigDig:DB$ Dig | DigNum$ 6 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Enchantment | RestRandomOrder$ True
 S:Mode$ ManaConvert | ValidPlayer$ You | ValidCard$ Case.YouCtrl | ValidSA$ Spell | ManaConversion$ AnyType->AnyColor | Description$ You may spend mana as though it were mana of any color to cast Case spells.
 DeckNeeds:Type$Case
 DeckHints:Type$Enchantment
-Oracle:When Case File Auditor enters the battlefield and whenever you solve a Case, look at the top six cards of your library. You may reveal an enchantment card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.\nYou may spend mana as though it were mana of any color to cast Case spells.
+Oracle:When Case File Auditor enters and whenever you solve a Case, look at the top six cards of your library. You may reveal an enchantment card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.\nYou may spend mana as though it were mana of any color to cast Case spells.
diff --git a/forge-gui/res/cardsfolder/c/case_of_the_burning_masks.txt b/forge-gui/res/cardsfolder/c/case_of_the_burning_masks.txt
index f47c2da749a..dbb7a6a4fc8 100644
--- a/forge-gui/res/cardsfolder/c/case_of_the_burning_masks.txt
+++ b/forge-gui/res/cardsfolder/c/case_of_the_burning_masks.txt
@@ -1,7 +1,7 @@
 Name:Case of the Burning Masks
 ManaCost:1 R R
 Types:Enchantment Case
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When this Case enters the battlefield, it deals 3 damage to target creature an opponent controls.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When this Case enters, it deals 3 damage to target creature an opponent controls.
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumDmg$ 3
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | CheckSVar$ X | SVarCompare$ GE3 | IsPresent$ Card.Self+IsUnsolved | TriggerZones$ Battlefield | Execute$ TrigSolve | TriggerDescription$ To solve — Three or more sources you controlled dealt damage this turn. (If unsolved, solve at the beginning of your end step.)
 SVar:TrigSolve:DB$ AlterAttribute | Defined$ Self | Attributes$ Solved
@@ -12,4 +12,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | SubAbility$ DBPlayEffect
 SVar:DBPlayEffect:DB$ Effect | StaticAbilities$ STPlay | ExileOnMoved$ Exile | SubAbility$ DBClearChosen | StackDescription$ {p:You} may play that card this turn.
 SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.ChosenCard | AffectedZone$ Exile | Description$ You may play the chosen card this turn.
 SVar:DBClearChosen:DB$ Cleanup | ClearChosenCard$ True
-Oracle:When this Case enters the battlefield, it deals 3 damage to target creature an opponent controls.\nTo solve — Three or more sources you controlled dealt damage this turn. (If unsolved, solve at the beginning of your end step.)\nSolved — Sacrifice this Case: Exile the top three cards of your library. Choose one of them. You may play that card this turn.
+Oracle:When this Case enters, it deals 3 damage to target creature an opponent controls.\nTo solve — Three or more sources you controlled dealt damage this turn. (If unsolved, solve at the beginning of your end step.)\nSolved — Sacrifice this Case: Exile the top three cards of your library. Choose one of them. You may play that card this turn.
diff --git a/forge-gui/res/cardsfolder/c/case_of_the_crimson_pulse.txt b/forge-gui/res/cardsfolder/c/case_of_the_crimson_pulse.txt
index 93e57f11a5e..73db35ecd09 100644
--- a/forge-gui/res/cardsfolder/c/case_of_the_crimson_pulse.txt
+++ b/forge-gui/res/cardsfolder/c/case_of_the_crimson_pulse.txt
@@ -1,7 +1,7 @@
 Name:Case of the Crimson Pulse
 ManaCost:2 R
 Types:Enchantment Case
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoot | TriggerDescription$ When this Case enters the battlefield, discard a card, then draw two cards.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoot | TriggerDescription$ When this Case enters, discard a card, then draw two cards.
 SVar:TrigLoot:DB$ Discard | Mode$ TgtChoose | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 2
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Hellbent$ True | IsPresent$ Card.Self+IsUnsolved | TriggerZones$ Battlefield | Execute$ TrigSolve | TriggerDescription$ To solve — You have no cards in hand. (If unsolved, solve at the beginning of your end step.)
@@ -11,4 +11,4 @@ SVar:TrigDiscard:DB$ Discard | Mode$ Hand | Defined$ You | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 2
 DeckHas:Ability$Discard
 DeckHints:Ability$Discard
-Oracle:When this Case enters the battlefield, discard a card, then draw two cards.\nTo solve — You have no cards in hand. (If unsolved, solve at the beginning of your end step.)\nSolved — At the beginning of your upkeep, discard your hand, then draw two cards.
+Oracle:When this Case enters, discard a card, then draw two cards.\nTo solve — You have no cards in hand. (If unsolved, solve at the beginning of your end step.)\nSolved — At the beginning of your upkeep, discard your hand, then draw two cards.
diff --git a/forge-gui/res/cardsfolder/c/case_of_the_filched_falcon.txt b/forge-gui/res/cardsfolder/c/case_of_the_filched_falcon.txt
index 72c21afe436..76843ca58b1 100644
--- a/forge-gui/res/cardsfolder/c/case_of_the_filched_falcon.txt
+++ b/forge-gui/res/cardsfolder/c/case_of_the_filched_falcon.txt
@@ -1,11 +1,11 @@
 Name:Case of the Filched Falcon
 ManaCost:U
 Types:Enchantment Case
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When this Case enters the battlefield, investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When this Case enters, investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
 SVar:TrigInvestigate:DB$ Investigate
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Artifact.YouCtrl | PresentCompare$ GE3 | IsPresent2$ Card.Self+IsUnsolved | Execute$ SolveFalcon | TriggerDescription$ To solve — You control three or more artifacts. (If unsolved, solve at the beginning of your end step.)
 SVar:SolveFalcon:DB$ AlterAttribute | Defined$ Self | Attributes$ Solved
 A:AB$ PutCounter | Cost$ 2 U Sac<1/CARDNAME/this Case> | ValidTgts$ Artifact.nonCreature | TgtPrompt$ Select target noncreature artifact | Activation$ Solved | CounterType$ P1P1 | CounterNum$ 4 | SubAbility$ DBAnimate | PrecostDesc$ Solved — | SpellDescription$ Put four +1/+1 counters on target noncreature artifact. It becomes a 0/0 Bird creature with flying in addition to its other types.
 SVar:DBAnimate:DB$ Animate | Defined$ ParentTarget | Power$ 0 | Toughness$ 0 | Types$ Creature,Bird | Keywords$ Flying | Duration$ Permanent
 DeckNeeds:Type$Artifact
-Oracle:When this Case enters the battlefield, investigate. (Create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\nTo solve — You control three or more artifacts. (If unsolved, solve at the beginning of your end step.)\nSolved — {2}{U}, Sacrifice this Case: Put four +1/+1 counters on target noncreature artifact. It becomes a 0/0 Bird creature with flying in addition to its other types.
+Oracle:When this Case enters, investigate. (Create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\nTo solve — You control three or more artifacts. (If unsolved, solve at the beginning of your end step.)\nSolved — {2}{U}, Sacrifice this Case: Put four +1/+1 counters on target noncreature artifact. It becomes a 0/0 Bird creature with flying in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/c/case_of_the_gateway_express.txt b/forge-gui/res/cardsfolder/c/case_of_the_gateway_express.txt
index 1ff3158c0db..3ca7ae2f449 100644
--- a/forge-gui/res/cardsfolder/c/case_of_the_gateway_express.txt
+++ b/forge-gui/res/cardsfolder/c/case_of_the_gateway_express.txt
@@ -1,10 +1,10 @@
 Name:Case of the Gateway Express
 ManaCost:1 W
 Types:Enchantment Case
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamageEach | TriggerDescription$ When this Case enters the battlefield, choose target creature you don't control. Each creature you control deals 1 damage to that creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamageEach | TriggerDescription$ When this Case enters, choose target creature you don't control. Each creature you control deals 1 damage to that creature.
 SVar:TrigDamageEach:DB$ EachDamage | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | DefinedDamagers$ Valid Creature.YouCtrl | Defined$ Targeted | NumDmg$ 1
 T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE3 | ValidPlayer$ You | IsPresent$ Card.Self+IsUnsolved | TriggerZones$ Battlefield | Execute$ TrigSolve | TriggerDescription$ To solve — Three or more creatures attacked this turn. (If unsolved, solve at the beginning of your end step.)
 SVar:TrigSolve:DB$ AlterAttribute | Defined$ Self | Attributes$ Solved
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 1 | IsPresent$ Card.Self+IsSolved | Description$ Solved — Creatures you control get +1/+0.
 SVar:X:Count$AttackersDeclared
-Oracle:When this Case enters the battlefield, choose target creature you don't control. Each creature you control deals 1 damage to that creature.\nTo solve — Three or more creatures attacked this turn. (If unsolved, solve at the beginning of your end step.)\nSolved — Creatures you control get +1/+0.
+Oracle:When this Case enters, choose target creature you don't control. Each creature you control deals 1 damage to that creature.\nTo solve — Three or more creatures attacked this turn. (If unsolved, solve at the beginning of your end step.)\nSolved — Creatures you control get +1/+0.
diff --git a/forge-gui/res/cardsfolder/c/case_of_the_gorgons_kiss.txt b/forge-gui/res/cardsfolder/c/case_of_the_gorgons_kiss.txt
index 2bb4e5148b9..745f91f6519 100644
--- a/forge-gui/res/cardsfolder/c/case_of_the_gorgons_kiss.txt
+++ b/forge-gui/res/cardsfolder/c/case_of_the_gorgons_kiss.txt
@@ -1,11 +1,11 @@
 Name:Case of the Gorgon's Kiss
 ManaCost:B
 Types:Enchantment Case
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When this Case enters the battlefield, destroy up to one target creature that was dealt damage this turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When this Case enters, destroy up to one target creature that was dealt damage this turn.
 SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.wasDealtDamageThisTurn | TgtPrompt$ Select up to one target creature that was dealt damage this turn
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ Count$ThisTurnEntered_Graveyard_Creature.nonToken | SVarCompare$ GE3 | IsPresent$ Card.Self+IsUnsolved | Execute$ Solved | TriggerDescription$ To solve – Three or more creature cards were put into graveyards from anywhere this turn. (If unsolved, solve at the beginning of your end step.)
 SVar:Solved:DB$ AlterAttribute | Defined$ Self | Attributes$ Solved
 S:Mode$ Continuous | Affected$ Card.Self+IsSolved | AddType$ Creature & Gorgon | SetPower$ 4 | SetToughness$ 4 | AddKeyword$ Deathtouch & Lifelink | Description$ Solved – This Case is a 4/4 Gorgon creature with deathtouch and lifelink in addition to its other types.
 DeckHints:Ability$Sacrifice|Discard
 DeckHas:Ability$LifeGain
-Oracle:When this Case enters the battlefield, destroy up to one target creature that was dealt damage this turn.\nTo solve – Three or more creature cards were put into graveyards from anywhere this turn. (If unsolved, solve at the beginning of your end step.)\nSolved – This Case is a 4/4 Gorgon creature with deathtouch and lifelink in addition to its other types.
+Oracle:When this Case enters, destroy up to one target creature that was dealt damage this turn.\nTo solve – Three or more creature cards were put into graveyards from anywhere this turn. (If unsolved, solve at the beginning of your end step.)\nSolved – This Case is a 4/4 Gorgon creature with deathtouch and lifelink in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/c/case_of_the_lost_witness.txt b/forge-gui/res/cardsfolder/c/case_of_the_lost_witness.txt
index ab8d7145bdb..3181ddac2bb 100644
--- a/forge-gui/res/cardsfolder/c/case_of_the_lost_witness.txt
+++ b/forge-gui/res/cardsfolder/c/case_of_the_lost_witness.txt
@@ -1,11 +1,11 @@
 Name:Case of the Lost Witness
 ManaCost:1 U
 Types:Enchantment Case
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConjure | TriggerDescription$ When this Case enters the battlefield, conjure four cards named Fblthp, the Lost into your library, then shuffle. Draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConjure | TriggerDescription$ When this Case enters, conjure four cards named Fblthp, the Lost into your library, then shuffle. Draw a card.
 SVar:TrigConjure:DB$ MakeCard | Conjure$ True | Name$ Fblthp, the Lost | Zone$ Library | Amount$ 4 | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Homunculus.YouCtrl+Legendary | IsPresent2$ Card.Self+IsUnsolved | Execute$ TrigSolve | TriggerDescription$ To solve — You control a legendary Homunculus.
 SVar:TrigSolve:DB$ AlterAttribute | Defined$ Self | Attributes$ Solved
 S:Mode$ Continuous | Affected$ Card.TopLibrary+YouCtrl | IsPresent$ Card.Self+IsSolved | AffectedZone$ Library | MayLookAt$ You | MayPlay$ True | Description$ Solved — You may look at the top card of your library any time and you may play lands and cast spells from the top of your library.
 DeckHints:Type$Homunculus
-Oracle:When this Case enters the battlefield, conjure four cards named Fblthp, the Lost into your library, then shuffle. Draw a card.\nTo solve — You control a legendary Homunculus.\nSolved — You may look at the top card of your library any time and you may play lands and cast spells from the top of your library.
+Oracle:When this Case enters, conjure four cards named Fblthp, the Lost into your library, then shuffle. Draw a card.\nTo solve — You control a legendary Homunculus.\nSolved — You may look at the top card of your library any time and you may play lands and cast spells from the top of your library.
diff --git a/forge-gui/res/cardsfolder/c/case_of_the_market_melee.txt b/forge-gui/res/cardsfolder/c/case_of_the_market_melee.txt
index 42c82521015..796c37124d6 100644
--- a/forge-gui/res/cardsfolder/c/case_of_the_market_melee.txt
+++ b/forge-gui/res/cardsfolder/c/case_of_the_market_melee.txt
@@ -1,11 +1,11 @@
 Name:Case of the Market Melee
 ManaCost:1 R
 Types:Enchantment Case
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When this Case enters the battlefield, it deals 1 damage to any target.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When this Case enters, it deals 1 damage to any target.
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 1
 S:Mode$ NoCleanupDamage | ValidCard$ Creature | Description$ Damage isn't removed from creatures during cleanup steps.
 T:Mode$ Phase | Phase$ End of Turn | IsPresent$ Creature.isDamaged | PresentCompare$ GE3 | ValidPlayer$ You | IsPresent2$ Card.Self+IsUnsolved | TriggerZones$ Battlefield | Execute$ TrigSolve | TriggerDescription$ To solve — Three or more creatures are damaged.
 SVar:TrigSolve:DB$ AlterAttribute | Defined$ Self | Attributes$ Solved
 T:Mode$ AttackersDeclared | IsPresent$ Card.Self+IsSolved | ValidAttackers$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Solved — Whenever you attack with one or more creatures, this Case deals that much damage divided as you choose among any number of targets.
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Any | TgtPrompt$ Select any number of targets | DividedAsYouChoose$ TriggerObjectsAttackers$Amount | NumDmg$ TriggerObjectsAttackers$Amount | TargetMin$ 0 | TargetMax$ TriggerObjectsAttackers$Amount
-Oracle:When this Case enters the battlefield, it deals 1 damage to any target.\nDamage isn't removed from creatures during cleanup steps.\nTo solve — Three or more creatures are damaged.\nSolved — Whenever you attack with one or more creatures, this Case deals that much damage divided as you choose among any number of targets.
+Oracle:When this Case enters, it deals 1 damage to any target.\nDamage isn't removed from creatures during cleanup steps.\nTo solve — Three or more creatures are damaged.\nSolved — Whenever you attack with one or more creatures, this Case deals that much damage divided as you choose among any number of targets.
diff --git a/forge-gui/res/cardsfolder/c/case_of_the_pilfered_proof.txt b/forge-gui/res/cardsfolder/c/case_of_the_pilfered_proof.txt
index 56c3fec4f8e..8d86f85a8ef 100644
--- a/forge-gui/res/cardsfolder/c/case_of_the_pilfered_proof.txt
+++ b/forge-gui/res/cardsfolder/c/case_of_the_pilfered_proof.txt
@@ -1,8 +1,8 @@
 Name:Case of the Pilfered Proof
 ManaCost:1 W
 Types:Enchantment Case
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Detective.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a Detective enters the battlefield under your control and whenever a Detective you control is turned face up, put a +1/+1 counter on it.
-T:Mode$ TurnFaceUp | ValidCard$ Detective.YouCtrl | Execute$ TrigPutCounter | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever a Detective enters the battlefield under your control and whenever a Detective you control is turned face up, put a +1/+1 counter on it.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Detective.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a Detective you control enters and whenever a Detective you control is turned face up, put a +1/+1 counter on it.
+T:Mode$ TurnFaceUp | ValidCard$ Detective.YouCtrl | Execute$ TrigPutCounter | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever a Detective you control enters and whenever a Detective you control is turned face up, put a +1/+1 counter on it.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 1
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Detective.YouCtrl | PresentCompare$ GE3 | IsPresent2$ Card.Self+IsUnsolved | Execute$ Solved | TriggerDescription$ To solve – You control three or more Detectives. (If unsolved, solve at the beginning of your end step.)
 SVar:Solved:DB$ AlterAttribute | Defined$ Self | Attributes$ Solved
@@ -11,4 +11,4 @@ SVar:DBReplace:DB$ ReplaceToken | Type$ AddToken | Amount$ 1 | ValidCard$ Card.Y
 DeckNeeds:Type$Detective
 DeckHas:Ability$Counters|Token|Sacrifice & Type$Artifact|Clue
 DeckHints:Ability$Token
-Oracle:Whenever a Detective enters the battlefield under your control and whenever a Detective you control is turned face up, put a +1/+1 counter on it.\nTo solve – You control three or more Detectives. (If unsolved, solve at the beginning of your end step.)\nSolved – If one or more tokens would be created under your control, those tokens plus a Clue token are created instead. (It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
+Oracle:Whenever a Detective you control enters and whenever a Detective you control is turned face up, put a +1/+1 counter on it.\nTo solve – You control three or more Detectives. (If unsolved, solve at the beginning of your end step.)\nSolved – If one or more tokens would be created under your control, those tokens plus a Clue token are created instead. (It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
diff --git a/forge-gui/res/cardsfolder/c/case_of_the_shattered_pact.txt b/forge-gui/res/cardsfolder/c/case_of_the_shattered_pact.txt
index 2c7de0aa9bc..674c4f6247b 100644
--- a/forge-gui/res/cardsfolder/c/case_of_the_shattered_pact.txt
+++ b/forge-gui/res/cardsfolder/c/case_of_the_shattered_pact.txt
@@ -1,11 +1,11 @@
 Name:Case of the Shattered Pact
 ManaCost:2
 Types:Enchantment Case
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When this Case enters the battlefield, search your library for a basic land card, reveal it, put it into your hand, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When this Case enters, search your library for a basic land card, reveal it, put it into your hand, then shuffle.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | IsPresent$ Card.Self+IsUnsolved | CheckSVar$ X | SVarCompare$ GE5 | TriggerZones$ Battlefield | Execute$ TrigSolve | TriggerDescription$ To solve — There are five colors among permanents you control. (If unsolved, solve at the beginning of your end step.)
 SVar:TrigSolve:DB$ AlterAttribute | Defined$ Self | Attributes$ Solved
 T:Mode$ Phase | Phase$ BeginCombat | IsPresent$ Card.Self+IsSolved | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Solved — At the beginning of combat on your turn, target creature you control gains flying, double strike, and vigilance until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Flying & Double Strike & Vigilance
 SVar:X:Count$ColorsCtrl Permanent
-Oracle:When this Case enters the battlefield, search your library for a basic land card, reveal it, put it into your hand, then shuffle.\nTo solve — There are five colors among permanents you control. (If unsolved, solve at the beginning of your end step.)\nSolved — At the beginning of combat on your turn, target creature you control gains flying, double strike, and vigilance until end of turn.
+Oracle:When this Case enters, search your library for a basic land card, reveal it, put it into your hand, then shuffle.\nTo solve — There are five colors among permanents you control. (If unsolved, solve at the beginning of your end step.)\nSolved — At the beginning of combat on your turn, target creature you control gains flying, double strike, and vigilance until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/case_of_the_stashed_skeleton.txt b/forge-gui/res/cardsfolder/c/case_of_the_stashed_skeleton.txt
index a32b72b9a64..62a72fe4b83 100644
--- a/forge-gui/res/cardsfolder/c/case_of_the_stashed_skeleton.txt
+++ b/forge-gui/res/cardsfolder/c/case_of_the_stashed_skeleton.txt
@@ -1,7 +1,7 @@
 Name:Case of the Stashed Skeleton
 ManaCost:1 B
 Types:Enchantment Case
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this Case enters the battlefield, create a 2/1 black Skeleton creature token and suspect it. (It has menace and can't block.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this Case enters, create a 2/1 black Skeleton creature token and suspect it. (It has menace and can't block.)
 SVar:TrigToken:DB$ Token | TokenScript$ b_2_1_skeleton | RememberTokens$ True | SubAbility$ DBSuspect
 SVar:DBSuspect:DB$ AlterAttribute | Defined$ Remembered | Attributes$ Suspected | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
@@ -9,4 +9,4 @@ T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefiel
 SVar:TrigSolve:DB$ AlterAttribute | Defined$ Self | Attributes$ Solved
 A:AB$ ChangeZone | Cost$ 1 B Sac<1/CARDNAME/this Case> | Activation$ Solved | Origin$ Library | Destination$ Hand | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | SorcerySpeed$ True | NoReveal$ True | PrecostDesc$ Solved — | SpellDescription$ Search your library for a card, put it into your hand, then shuffle. Activate only as a sorcery.
 DeckHas:Ability$Token & Type$Skeleton
-Oracle:When this Case enters the battlefield, create a 2/1 black Skeleton creature token and suspect it. (It has menace and can't block.)\nTo solve — You control no suspected Skeletons. (If unsolved, solve at the beginning of your end step.)\nSolved — {1}{B}, Sacrifice this Case: Search your library for a card, put it into your hand, then shuffle. Activate only as a sorcery.
+Oracle:When this Case enters, create a 2/1 black Skeleton creature token and suspect it. (It has menace and can't block.)\nTo solve — You control no suspected Skeletons. (If unsolved, solve at the beginning of your end step.)\nSolved — {1}{B}, Sacrifice this Case: Search your library for a card, put it into your hand, then shuffle. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/c/case_of_the_trampled_garden.txt b/forge-gui/res/cardsfolder/c/case_of_the_trampled_garden.txt
index 9c7b46dc6e8..8a9dd73dc06 100644
--- a/forge-gui/res/cardsfolder/c/case_of_the_trampled_garden.txt
+++ b/forge-gui/res/cardsfolder/c/case_of_the_trampled_garden.txt
@@ -1,7 +1,7 @@
 Name:Case of the Trampled Garden
 ManaCost:2 G
 Types:Enchantment Case
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When this Case enters the battlefield, distribute two +1/+1 counters among one or two target creatures you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When this Case enters, distribute two +1/+1 counters among one or two target creatures you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select one or two target creatures you control | CounterType$ P1P1 | CounterNum$ 2 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2
 T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ X | SVarCompare$ GE8 | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Card.Self+IsUnsolved | Execute$ TrigSolve | TriggerDescription$ To solve — Creatures you control have total power 8 or greater. (If unsolved, solve at the beginning of your end step.)
 SVar:TrigSolve:DB$ AlterAttribute | Defined$ Self | Attributes$ Solved
@@ -10,4 +10,4 @@ SVar:TrigCounterAttacker:DB$ PutCounter | ValidTgts$ Creature.attacking | TgtPro
 SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Trample
 SVar:X:Count$SumPower_Creature.YouCtrl
 DeckHas:Ability$Counters
-Oracle:When this Case enters the battlefield, distribute two +1/+1 counters among one or two target creatures you control.\nTo solve — Creatures you control have total power 8 or greater. (If unsolved, solve at the beginning of your end step.)\nSolved — Whenever you attack, put a +1/+1 counter on target attacking creature. It gains trample until end of turn.
+Oracle:When this Case enters, distribute two +1/+1 counters among one or two target creatures you control.\nTo solve — Creatures you control have total power 8 or greater. (If unsolved, solve at the beginning of your end step.)\nSolved — Whenever you attack, put a +1/+1 counter on target attacking creature. It gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/case_of_the_uneaten_feast.txt b/forge-gui/res/cardsfolder/c/case_of_the_uneaten_feast.txt
index 888260988b4..1b8690164a7 100644
--- a/forge-gui/res/cardsfolder/c/case_of_the_uneaten_feast.txt
+++ b/forge-gui/res/cardsfolder/c/case_of_the_uneaten_feast.txt
@@ -1,7 +1,7 @@
 Name:Case of the Uneaten Feast
 ManaCost:W
 Types:Enchantment Case
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature enters the battlefield under your control, you gain 1 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature you control enters, you gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | IsPresent$ Card.Self+IsUnsolved | CheckSVar$ X | SVarCompare$ GE5 | TriggerZones$ Battlefield | Execute$ TrigSolve | TriggerDescription$ To solve — You've gained 5 or more life this turn. (If unsolved, solve at the beginning of your end step.)
 SVar:TrigSolve:DB$ AlterAttribute | Defined$ Self | Attributes$ Solved
@@ -10,4 +10,4 @@ A:AB$ Animate | Cost$ Sac<1/CARDNAME> | PrecostDesc$ Solved — | Activation$ So
 SVar:Play:Mode$ Continuous | Affected$ Card.Self+nonLand | AffectedZone$ Graveyard | EffectZone$ Graveyard | MayPlay$ True | Description$ You may play this card from your graveyard.
 DeckHas:Ability$LifeGain|Graveyard
 DeckHints:Ability$LifeGain|Graveyard
-Oracle:Whenever a creature enters the battlefield under your control, you gain 1 life.\nTo solve — You've gained 5 or more life this turn. (If unsolved, solve at the beginning of your end step.)\nSolved — Sacrifice this Case: Creature cards in your graveyard gain "You may cast this card from your graveyard" until end of turn.
+Oracle:Whenever a creature you control enters, you gain 1 life.\nTo solve — You've gained 5 or more life this turn. (If unsolved, solve at the beginning of your end step.)\nSolved — Sacrifice this Case: Creature cards in your graveyard gain "You may cast this card from your graveyard" until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/cast_out.txt b/forge-gui/res/cardsfolder/c/cast_out.txt
index ddff71a35fe..adcdffed1f2 100644
--- a/forge-gui/res/cardsfolder/c/cast_out.txt
+++ b/forge-gui/res/cardsfolder/c/cast_out.txt
@@ -2,8 +2,8 @@ Name:Cast Out
 ManaCost:3 W
 Types:Enchantment
 K:Flash
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile target nonland permanent an opponent controls until CARDNAME leaves the battlefield.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile target nonland permanent an opponent controls until CARDNAME leaves the battlefield.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls | Duration$ UntilHostLeavesPlay
 K:Cycling:W
 SVar:OblivionRing:TRUE
-Oracle:Flash\nWhen Cast Out enters the battlefield, exile target nonland permanent an opponent controls until Cast Out leaves the battlefield.\nCycling {W} ({W}, Discard this card: Draw a card.)
+Oracle:Flash\nWhen Cast Out enters, exile target nonland permanent an opponent controls until Cast Out leaves the battlefield.\nCycling {W} ({W}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/c/castaways_despair.txt b/forge-gui/res/cardsfolder/c/castaways_despair.txt
index 33a088b867a..7b4e4ae72bb 100644
--- a/forge-gui/res/cardsfolder/c/castaways_despair.txt
+++ b/forge-gui/res/cardsfolder/c/castaways_despair.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 3 U | ValidTgts$ Creature | AILogic$ KeepTapped
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Enchanted creature doesn't untap during its controller's untap step.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap enchanted creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap enchanted creature.
 SVar:TrigTap:DB$ Tap | Defined$ Enchanted
-Oracle:Enchant creature\nWhen Castaway's Despair enters the battlefield, tap enchanted creature.\nEnchanted creature doesn't untap during its controller's untap step.
+Oracle:Enchant creature\nWhen Castaway's Despair enters, tap enchanted creature.\nEnchanted creature doesn't untap during its controller's untap step.
diff --git a/forge-gui/res/cardsfolder/c/castle_ardenvale.txt b/forge-gui/res/cardsfolder/c/castle_ardenvale.txt
index 77c0be94c1c..33be41a55dd 100644
--- a/forge-gui/res/cardsfolder/c/castle_ardenvale.txt
+++ b/forge-gui/res/cardsfolder/c/castle_ardenvale.txt
@@ -1,10 +1,10 @@
 Name:Castle Ardenvale
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Plains.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a Plains.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you control a Plains.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Plains.YouCtrl | ConditionCompare$ EQ0
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
 A:AB$ Token | Cost$ 2 W W T | TokenAmount$ 1 | TokenScript$ w_1_1_human | TokenOwner$ You | SpellDescription$ Create a 1/1 white Human creature token.
 DeckHints:Type$Human
 DeckHas:Ability$Token
-Oracle:Castle Ardenvale enters the battlefield tapped unless you control a Plains.\n{T}: Add {W}.\n{2}{W}{W}, {T}: Create a 1/1 white Human creature token.
+Oracle:Castle Ardenvale enters tapped unless you control a Plains.\n{T}: Add {W}.\n{2}{W}{W}, {T}: Create a 1/1 white Human creature token.
diff --git a/forge-gui/res/cardsfolder/c/castle_embereth.txt b/forge-gui/res/cardsfolder/c/castle_embereth.txt
index 1a506611e16..9df055a0a33 100644
--- a/forge-gui/res/cardsfolder/c/castle_embereth.txt
+++ b/forge-gui/res/cardsfolder/c/castle_embereth.txt
@@ -1,9 +1,9 @@
 Name:Castle Embereth
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Mountain.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a Mountain.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you control a Mountain.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Mountain.YouCtrl | ConditionCompare$ EQ0
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 SVar:PlayMain1:TRUE
 A:AB$ PumpAll | Cost$ 1 R R T | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | SpellDescription$ Creatures you control get +1/+0 until end of turn.
-Oracle:Castle Embereth enters the battlefield tapped unless you control a Mountain.\n{T}: Add {R}.\n{1}{R}{R}, {T}: Creatures you control get +1/+0 until end of turn.
+Oracle:Castle Embereth enters tapped unless you control a Mountain.\n{T}: Add {R}.\n{1}{R}{R}, {T}: Creatures you control get +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/castle_garenbrig.txt b/forge-gui/res/cardsfolder/c/castle_garenbrig.txt
index a5c30da9dfd..615fdd60dec 100644
--- a/forge-gui/res/cardsfolder/c/castle_garenbrig.txt
+++ b/forge-gui/res/cardsfolder/c/castle_garenbrig.txt
@@ -1,8 +1,8 @@
 Name:Castle Garenbrig
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Forest.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a Forest.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you control a Forest.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Forest.YouCtrl | ConditionCompare$ EQ0
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Mana | Cost$ 2 G G T | Produced$ G | Amount$ 6 | RestrictValid$ Spell.Creature,Activated.Creature+inZoneBattlefield | SpellDescription$ Add six {G}. Spend this mana only to cast creature spells or activate abilities of creatures.
-Oracle:Castle Garenbrig enters the battlefield tapped unless you control a Forest.\n{T}: Add {G}.\n{2}{G}{G}, {T}: Add six {G}. Spend this mana only to cast creature spells or activate abilities of creatures.
+Oracle:Castle Garenbrig enters tapped unless you control a Forest.\n{T}: Add {G}.\n{2}{G}{G}, {T}: Add six {G}. Spend this mana only to cast creature spells or activate abilities of creatures.
diff --git a/forge-gui/res/cardsfolder/c/castle_locthwain.txt b/forge-gui/res/cardsfolder/c/castle_locthwain.txt
index 749b6fa7144..08e05feb56b 100644
--- a/forge-gui/res/cardsfolder/c/castle_locthwain.txt
+++ b/forge-gui/res/cardsfolder/c/castle_locthwain.txt
@@ -1,10 +1,10 @@
 Name:Castle Locthwain
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Swamp.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a Swamp.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you control a Swamp.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Swamp.YouCtrl | ConditionCompare$ EQ0
 A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}.
 A:AB$ Draw | Cost$ 1 B B T | NumCards$ 1 | SpellDescription$ Draw a card, then you lose life equal to the number of cards in your hand. | SubAbility$ DBLoseLife | StackDescription$ SpellDescription
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | StackDescription$ None
 SVar:X:Count$InYourHand
-Oracle:Castle Locthwain enters the battlefield tapped unless you control a Swamp.\n{T}: Add {B}.\n{1}{B}{B}, {T}: Draw a card, then you lose life equal to the number of cards in your hand.
+Oracle:Castle Locthwain enters tapped unless you control a Swamp.\n{T}: Add {B}.\n{1}{B}{B}, {T}: Draw a card, then you lose life equal to the number of cards in your hand.
diff --git a/forge-gui/res/cardsfolder/c/castle_vantress.txt b/forge-gui/res/cardsfolder/c/castle_vantress.txt
index 15be04c43b1..dd7c84e9b10 100644
--- a/forge-gui/res/cardsfolder/c/castle_vantress.txt
+++ b/forge-gui/res/cardsfolder/c/castle_vantress.txt
@@ -1,8 +1,8 @@
 Name:Castle Vantress
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Island.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control an Island.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you control an Island.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Island.YouCtrl | ConditionCompare$ EQ0
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Scry | Cost$ 2 U U T | ScryNum$ 2 | SpellDescription$ Scry 2.
-Oracle:Castle Vantress enters the battlefield tapped unless you control an Island.\n{T}: Add {U}.\n{2}{U}{U}, {T}: Scry 2.
+Oracle:Castle Vantress enters tapped unless you control an Island.\n{T}: Add {U}.\n{2}{U}{U}, {T}: Scry 2.
diff --git a/forge-gui/res/cardsfolder/c/cataclysmic_gearhulk.txt b/forge-gui/res/cardsfolder/c/cataclysmic_gearhulk.txt
index 9f349e986e9..b372dba6a64 100644
--- a/forge-gui/res/cardsfolder/c/cataclysmic_gearhulk.txt
+++ b/forge-gui/res/cardsfolder/c/cataclysmic_gearhulk.txt
@@ -3,10 +3,10 @@ ManaCost:3 W W
 Types:Artifact Creature Construct
 PT:4/5
 K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When CARDNAME enters the battlefield, each player chooses an artifact, a creature, an enchantment, and a planeswalker from among the nonland permanents they control, then sacrifices the rest.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When CARDNAME enters, each player chooses an artifact, a creature, an enchantment, and a planeswalker from among the nonland permanents they control, then sacrifices the rest.
 SVar:TrigChoose:DB$ ChooseCard | Defined$ Player | Choices$ Permanent.nonLand | ChooseEach$ Artifact & Creature & Enchantment & Planeswalker | ControlledByPlayer$ Chooser | Reveal$ True | Mandatory$ True | SubAbility$ SacAllOthers
 SVar:SacAllOthers:DB$ SacrificeAll | ValidCards$ Permanent.nonLand+nonChosenCard | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 AI:RemoveDeck:All
 DeckHas:Ability$Sacrifice
-Oracle:Vigilance\nWhen Cataclysmic Gearhulk enters the battlefield, each player chooses an artifact, a creature, an enchantment, and a planeswalker from among the nonland permanents they control, then sacrifices the rest.
+Oracle:Vigilance\nWhen Cataclysmic Gearhulk enters, each player chooses an artifact, a creature, an enchantment, and a planeswalker from among the nonland permanents they control, then sacrifices the rest.
diff --git a/forge-gui/res/cardsfolder/c/catacomb_sifter.txt b/forge-gui/res/cardsfolder/c/catacomb_sifter.txt
index e3a12aacede..f56b198fd9a 100644
--- a/forge-gui/res/cardsfolder/c/catacomb_sifter.txt
+++ b/forge-gui/res/cardsfolder/c/catacomb_sifter.txt
@@ -3,10 +3,10 @@ ManaCost:1 B G
 Types:Creature Eldrazi Drone
 PT:2/3
 K:Devoid
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_eldrazi_scion_sac | TokenOwner$ You
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigScry | TriggerDescription$ Whenever another creature you control dies, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless|Token
-Oracle:Devoid (This card has no color.)\nWhen Catacomb Sifter enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."\nWhenever another creature you control dies, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+Oracle:Devoid (This card has no color.)\nWhen Catacomb Sifter enters, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."\nWhenever another creature you control dies, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
diff --git a/forge-gui/res/cardsfolder/c/cathars_crusade.txt b/forge-gui/res/cardsfolder/c/cathars_crusade.txt
index eb78f7d7e11..55fc0f59c9a 100644
--- a/forge-gui/res/cardsfolder/c/cathars_crusade.txt
+++ b/forge-gui/res/cardsfolder/c/cathars_crusade.txt
@@ -1,7 +1,7 @@
 Name:Cathars' Crusade
 ManaCost:3 W W
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ CatharsCounters | TriggerDescription$ Whenever a creature enters the battlefield under your control, put a +1/+1 counter on each creature you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ CatharsCounters | TriggerDescription$ Whenever a creature you control enters, put a +1/+1 counter on each creature you control.
 SVar:CatharsCounters:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
 SVar:BuffedBy:Creature
-Oracle:Whenever a creature enters the battlefield under your control, put a +1/+1 counter on each creature you control.
+Oracle:Whenever a creature you control enters, put a +1/+1 counter on each creature you control.
diff --git a/forge-gui/res/cardsfolder/c/cathedral_acolyte.txt b/forge-gui/res/cardsfolder/c/cathedral_acolyte.txt
index e720605698e..7869c1c3851 100644
--- a/forge-gui/res/cardsfolder/c/cathedral_acolyte.txt
+++ b/forge-gui/res/cardsfolder/c/cathedral_acolyte.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Human Cleric
 PT:1/2
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+HasCounters | AddKeyword$ Ward:1 | Description$ Each creature you control with a counter on it has ward {1}. (Whenever it becomes the target of a spell or ability an opponent controls, counter it unless that player pays {1}.)
-A:AB$ PutCounter | Cost$ T | ValidTgts$ Creature.ThisTurnEntered | TgtPrompt$ Select target creature that entered the battlefield this turn | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature that entered the battlefield this turn.
+A:AB$ PutCounter | Cost$ T | ValidTgts$ Creature.ThisTurnEntered | TgtPrompt$ Select target creature that entered this turn | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature that entered this turn.
 DeckHas:Ability$Counters
 DeckHints:Ability$Counters
-Oracle:Each creature you control with a counter on it has ward {1}. (Whenever it becomes the target of a spell or ability an opponent controls, counter it unless that player pays {1}.)\n{T}: Put a +1/+1 counter on target creature that entered the battlefield this turn.
+Oracle:Each creature you control with a counter on it has ward {1}. (Whenever it becomes the target of a spell or ability an opponent controls, counter it unless that player pays {1}.)\n{T}: Put a +1/+1 counter on target creature that entered this turn.
diff --git a/forge-gui/res/cardsfolder/c/cathedral_of_war.txt b/forge-gui/res/cardsfolder/c/cathedral_of_war.txt
index deb6fb6fa54..5475f811a91 100644
--- a/forge-gui/res/cardsfolder/c/cathedral_of_war.txt
+++ b/forge-gui/res/cardsfolder/c/cathedral_of_war.txt
@@ -1,7 +1,8 @@
 Name:Cathedral of War
 ManaCost:no cost
 Types:Land
-K:CARDNAME enters the battlefield tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 K:Exalted
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-Oracle:Cathedral of War enters the battlefield tapped.\nExalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)\n{T}: Add {C}.
+Oracle:Cathedral of War enters tapped.\nExalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)\n{T}: Add {C}.
diff --git a/forge-gui/res/cardsfolder/c/cathedral_sanctifier.txt b/forge-gui/res/cardsfolder/c/cathedral_sanctifier.txt
index 30ab9315729..cd1935d83f8 100644
--- a/forge-gui/res/cardsfolder/c/cathedral_sanctifier.txt
+++ b/forge-gui/res/cardsfolder/c/cathedral_sanctifier.txt
@@ -2,7 +2,7 @@ Name:Cathedral Sanctifier
 ManaCost:W
 Types:Creature Human Cleric
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 3 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters, you gain 3 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3
 DeckHas:Ability$LifeGain
-Oracle:When Cathedral Sanctifier enters the battlefield, you gain 3 life.
+Oracle:When Cathedral Sanctifier enters, you gain 3 life.
diff --git a/forge-gui/res/cardsfolder/c/cauldron_familiar.txt b/forge-gui/res/cardsfolder/c/cauldron_familiar.txt
index 96628ad4ecd..8dec0f0c6dd 100644
--- a/forge-gui/res/cardsfolder/c/cauldron_familiar.txt
+++ b/forge-gui/res/cardsfolder/c/cauldron_familiar.txt
@@ -2,7 +2,7 @@ Name:Cauldron Familiar
 ManaCost:B
 Types:Creature Cat
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDrain | TriggerDescription$ When CARDNAME enters the battlefield, each opponent loses 1 life and you gain 1 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDrain | TriggerDescription$ When CARDNAME enters, each opponent loses 1 life and you gain 1 life.
 SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
 DeckHas:Ability$LifeGain
@@ -11,4 +11,4 @@ SVar:DiscardMe:2
 SVar:SacMe:1
 SVar:AIPreference:SacCost$Card.Food
 DeckHints:Ability$Food
-Oracle:When Cauldron Familiar enters the battlefield, each opponent loses 1 life and you gain 1 life.\nSacrifice a Food: Return Cauldron Familiar from your graveyard to the battlefield.
+Oracle:When Cauldron Familiar enters, each opponent loses 1 life and you gain 1 life.\nSacrifice a Food: Return Cauldron Familiar from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/c/caustic_crawler.txt b/forge-gui/res/cardsfolder/c/caustic_crawler.txt
index 7754f593bac..d4f04a2af75 100644
--- a/forge-gui/res/cardsfolder/c/caustic_crawler.txt
+++ b/forge-gui/res/cardsfolder/c/caustic_crawler.txt
@@ -2,6 +2,6 @@ Name:Caustic Crawler
 ManaCost:3 B B
 Types:Creature Insect
 PT:4/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, you may have target creature get -1/-1 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Landfall — Whenever a land you control enters, you may have target creature get -1/-1 until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True
-Oracle:Landfall — Whenever a land enters the battlefield under your control, you may have target creature get -1/-1 until end of turn.
+Oracle:Landfall — Whenever a land you control enters, you may have target creature get -1/-1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/cavalier_of_dawn.txt b/forge-gui/res/cardsfolder/c/cavalier_of_dawn.txt
index 73e6febe247..d1417002a35 100644
--- a/forge-gui/res/cardsfolder/c/cavalier_of_dawn.txt
+++ b/forge-gui/res/cardsfolder/c/cavalier_of_dawn.txt
@@ -3,9 +3,9 @@ ManaCost:2 W W W
 Types:Creature Elemental Knight
 PT:4/6
 K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy up to one target nonland permanent. Its controller creates a 3/3 colorless Golem artifact creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy up to one target nonland permanent. Its controller creates a 3/3 colorless Golem artifact creature token.
 SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_3_3_a_golem | TokenOwner$ TargetedController
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME dies, return target artifact or enchantment card from your graveyard to your hand.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Artifact.YouCtrl,Enchantment.YouCtrl
-Oracle:Vigilance\nWhen Cavalier of Dawn enters the battlefield, destroy up to one target nonland permanent. Its controller creates a 3/3 colorless Golem artifact creature token.\nWhen Cavalier of Dawn dies, return target artifact or enchantment card from your graveyard to your hand.
+Oracle:Vigilance\nWhen Cavalier of Dawn enters, destroy up to one target nonland permanent. Its controller creates a 3/3 colorless Golem artifact creature token.\nWhen Cavalier of Dawn dies, return target artifact or enchantment card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/c/cavalier_of_flame.txt b/forge-gui/res/cardsfolder/c/cavalier_of_flame.txt
index 7e571968f5a..7a07be9d12f 100644
--- a/forge-gui/res/cardsfolder/c/cavalier_of_flame.txt
+++ b/forge-gui/res/cardsfolder/c/cavalier_of_flame.txt
@@ -3,7 +3,7 @@ ManaCost:2 R R R
 Types:Creature Elemental Knight
 PT:6/5
 A:AB$ PumpAll | Cost$ 1 R | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | KW$ Haste | SpellDescription$ Creatures you control get +1/+0 and gain haste until end of turn.
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, discard any number of cards, then draw that many cards.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, discard any number of cards, then draw that many cards.
 SVar:TrigDiscard:DB$ Discard | AnyNumber$ True | Optional$ True | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ Y | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
@@ -11,4 +11,4 @@ SVar:Y:Remembered$Amount
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDamageAll | TriggerDescription$ When CARDNAME dies, it deals X damage to each opponent and each planeswalker they control, where X is the number of land cards in your graveyard.
 SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Player.Opponent | ValidCards$ Planeswalker.OppCtrl | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to each opponent and each planeswalker they control, where X is the number of land cards in your graveyard.
 SVar:X:Count$TypeInYourYard.Land
-Oracle:{1}{R}: Creatures you control get +1/+0 and gain haste until end of turn.\nWhen Cavalier of Flame enters the battlefield, discard any number of cards, then draw that many cards.\nWhen Cavalier of Flame dies, it deals X damage to each opponent and each planeswalker they control, where X is the number of land cards in your graveyard.
+Oracle:{1}{R}: Creatures you control get +1/+0 and gain haste until end of turn.\nWhen Cavalier of Flame enters, discard any number of cards, then draw that many cards.\nWhen Cavalier of Flame dies, it deals X damage to each opponent and each planeswalker they control, where X is the number of land cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/c/cavalier_of_gales.txt b/forge-gui/res/cardsfolder/c/cavalier_of_gales.txt
index c018dc7a5f2..9affc604e19 100644
--- a/forge-gui/res/cardsfolder/c/cavalier_of_gales.txt
+++ b/forge-gui/res/cardsfolder/c/cavalier_of_gales.txt
@@ -3,10 +3,10 @@ ManaCost:2 U U U
 Types:Creature Elemental Knight
 PT:5/5
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw three cards, then put two cards from your hand on top of your library in any order.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw three cards, then put two cards from your hand on top of your library in any order.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 3 | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Library | ChangeNum$ 2 | Mandatory$ True
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME dies, shuffle it into its owner's library, then scry 2.
 SVar:TrigChange:DB$ ChangeZone | Destination$ Library | Shuffle$ True | Defined$ TriggeredNewCardLKICopy | SubAbility$ DBScry
 SVar:DBScry:DB$ Scry | ScryNum$ 2
-Oracle:Flying\nWhen Cavalier of Gales enters the battlefield, draw three cards, then put two cards from your hand on top of your library in any order.\nWhen Cavalier of Gales dies, shuffle it into its owner's library, then scry 2.
+Oracle:Flying\nWhen Cavalier of Gales enters, draw three cards, then put two cards from your hand on top of your library in any order.\nWhen Cavalier of Gales dies, shuffle it into its owner's library, then scry 2.