diff --git a/forge-gui/res/cardsfolder/s/scattered_groves.txt b/forge-gui/res/cardsfolder/s/scattered_groves.txt
index 81fa6770402..243e034acb3 100644
--- a/forge-gui/res/cardsfolder/s/scattered_groves.txt
+++ b/forge-gui/res/cardsfolder/s/scattered_groves.txt
@@ -1,6 +1,7 @@
 Name:Scattered Groves
 ManaCost:no cost
 Types:Land Forest Plains
-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 {G} or {W}.)\nScattered Groves enters the battlefield tapped.\nCycling {2} ({2}, Discard this card: Draw a card.)
+Oracle:({T}: Add {G} or {W}.)\nScattered Groves enters tapped.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/s/scavenged_blade.txt b/forge-gui/res/cardsfolder/s/scavenged_blade.txt
index 522734bfa25..5f8ebb2e7d6 100644
--- a/forge-gui/res/cardsfolder/s/scavenged_blade.txt
+++ b/forge-gui/res/cardsfolder/s/scavenged_blade.txt
@@ -1,9 +1,9 @@
 Name:Scavenged Blade
 ManaCost:1 R
 Types:Artifact Equipment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAttach | TriggerDescription$ When CARDNAME enters the battlefield, attach it to target creature you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigAttach | TriggerDescription$ When CARDNAME enters, attach it to target creature you control.
 SVar:TrigAttach:DB$ Attach | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control
 SVar:NeedsToPlay:Creature.YouCtrl
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | Description$ Equipped creature gets +2/+0.
 K:Equip:2 R
-Oracle:When Scavenged Blade enters the battlefield, attach it to target creature you control.\nEquipped creature gets +2/+0.\nEquip {2}{R} ({2}{R}: Attach to target creature you control. Equip only as a sorcery.)
+Oracle:When Scavenged Blade enters, attach it to target creature you control.\nEquipped creature gets +2/+0.\nEquip {2}{R} ({2}{R}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/s/scavenged_weaponry.txt b/forge-gui/res/cardsfolder/s/scavenged_weaponry.txt
index 3251d86813b..8b3c991e6b7 100644
--- a/forge-gui/res/cardsfolder/s/scavenged_weaponry.txt
+++ b/forge-gui/res/cardsfolder/s/scavenged_weaponry.txt
@@ -4,6 +4,6 @@ Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Enchanted creature gets +1/+1.
-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:Enchant creature\nWhen Scavenged Weaponry enters the battlefield, draw a card.\nEnchanted creature gets +1/+1.
+Oracle:Enchant creature\nWhen Scavenged Weaponry enters, draw a card.\nEnchanted creature gets +1/+1.
diff --git a/forge-gui/res/cardsfolder/s/scavenging_harpy.txt b/forge-gui/res/cardsfolder/s/scavenging_harpy.txt
index 5d73c13f8e5..0a60f95c1fe 100644
--- a/forge-gui/res/cardsfolder/s/scavenging_harpy.txt
+++ b/forge-gui/res/cardsfolder/s/scavenging_harpy.txt
@@ -3,6 +3,6 @@ ManaCost:2 B
 Types:Creature Harpy
 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.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, exile target card from an opponent's graveyard.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in an opponent's graveyard | ValidTgts$ Card.OppOwn
-Oracle:Flying\nWhen Scavenging Harpy enters the battlefield, exile target card from an opponent's graveyard.
+Oracle:Flying\nWhen Scavenging Harpy enters, exile target card from an opponent's graveyard.
diff --git a/forge-gui/res/cardsfolder/s/scene_of_the_crime.txt b/forge-gui/res/cardsfolder/s/scene_of_the_crime.txt
index 8df056f10eb..18de7bc008c 100644
--- a/forge-gui/res/cardsfolder/s/scene_of_the_crime.txt
+++ b/forge-gui/res/cardsfolder/s/scene_of_the_crime.txt
@@ -1,10 +1,11 @@
 Name:Scene of the Crime
 ManaCost:no cost
 Types:Artifact Land Clue
-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 tapXType<1/Creature> | Produced$ Any | SpellDescription$ Add one mana of any color.
 A:AB$ Draw | Cost$ 2 Sac<1/CARDNAME> | SpellDescription$ Draw a card.
 DeckHas:Ability$Sacrifice
 DeckHints:Type$Clue
-Oracle:Scene of the Crime enters the battlefield tapped.\n{T}: Add {C}.\n{T}, Tap an untapped creature you control: Add one mana of any color.\n{2}, Sacrifice Scene of the Crime: Draw a card.
+Oracle:Scene of the Crime enters tapped.\n{T}: Add {C}.\n{T}, Tap an untapped creature you control: Add one mana of any color.\n{2}, Sacrifice Scene of the Crime: Draw a card.
diff --git a/forge-gui/res/cardsfolder/s/scheming_fence.txt b/forge-gui/res/cardsfolder/s/scheming_fence.txt
index fe75822663d..eb11c313ad5 100644
--- a/forge-gui/res/cardsfolder/s/scheming_fence.txt
+++ b/forge-gui/res/cardsfolder/s/scheming_fence.txt
@@ -3,9 +3,9 @@ ManaCost:W U
 Types:Creature Human Citizen
 PT:2/3
 K:ETBReplacement:Other:ChooseCard
-SVar:ChooseCard:DB$ ChooseCard | Choices$ Permanent.nonLand | MinAmount$ 0 | ChoiceTitle$ You may choose a nonland permanent | AILogic$ OppPreferred | SpellDescription$ As CARDNAME enters the battlefield, you may choose a nonland permanent.
+SVar:ChooseCard:DB$ ChooseCard | Choices$ Permanent.nonLand | MinAmount$ 0 | ChoiceTitle$ You may choose a nonland permanent | AILogic$ OppPreferred | SpellDescription$ As CARDNAME enters, you may choose a nonland permanent.
 S:Mode$ Continuous | Affected$ Card.ChosenCard | AddHiddenKeyword$ CARDNAME's activated abilities can't be activated. | Description$ Activated abilities of the chosen permanent can't be activated.
 S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOfDefined$ ChosenCard | GainsValidAbilities$ Activated.!Loyalty | ManaConversion$ AnyType->AnyColor | Description$ CARDNAME has all activated abilities of the chosen permanent except for loyalty abilities. You may spend mana as though it were mana of any color to activate those abilities.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Static$ True | ValidCard$ Card.ChosenCard | Execute$ TrigCleanup
 SVar:TrigCleanup:DB$ Cleanup | ClearChosenCard$ True
-Oracle:As Scheming Fence enters the battlefield, you may choose a nonland permanent.\nActivated abilities of the chosen permanent can't be activated.\nScheming Fence has all activated abilities of the chosen permanent except for loyalty abilities. You may spend mana as though it were mana of any color to activate those abilities.
+Oracle:As Scheming Fence enters, you may choose a nonland permanent.\nActivated abilities of the chosen permanent can't be activated.\nScheming Fence has all activated abilities of the chosen permanent except for loyalty abilities. You may spend mana as though it were mana of any color to activate those abilities.
diff --git a/forge-gui/res/cardsfolder/s/scholar_of_new_horizons.txt b/forge-gui/res/cardsfolder/s/scholar_of_new_horizons.txt
index cc302c7899e..a39d4bd4cc9 100644
--- a/forge-gui/res/cardsfolder/s/scholar_of_new_horizons.txt
+++ b/forge-gui/res/cardsfolder/s/scholar_of_new_horizons.txt
@@ -11,4 +11,4 @@ SVar:X:Count$Valid Land.YouCtrl
 SVar:Y:PlayerCountOpponents$HighestValid Land.YouCtrl
 DeckHints:Ability$Counters
 DeckHas:Ability$Counters
-Oracle:Scholar of New Horizons enters the battlefield with a +1/+1 counter on it.\n{T}, Remove a counter from a permanent you control: Search your library for a Plains card and reveal it. If an opponent controls more lands than you, you may put that card onto the battlefield tapped. If you don't put the card onto the battlefield, put it into your hand. Then shuffle.
+Oracle:Scholar of New Horizons enters with a +1/+1 counter on it.\n{T}, Remove a counter from a permanent you control: Search your library for a Plains card and reveal it. If an opponent controls more lands than you, you may put that card onto the battlefield tapped. If you don't put the card onto the battlefield, put it into your hand. Then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/scholar_of_stars.txt b/forge-gui/res/cardsfolder/s/scholar_of_stars.txt
index 39846e41a33..1c0c4924a02 100644
--- a/forge-gui/res/cardsfolder/s/scholar_of_stars.txt
+++ b/forge-gui/res/cardsfolder/s/scholar_of_stars.txt
@@ -2,7 +2,7 @@ Name:Scholar of Stars
 ManaCost:3 U
 Types:Creature Human Artificer
 PT:3/2
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, if you control an artifact, draw a card.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, if you control an artifact, draw a card.
 SVar:TrigDraw:DB$ Draw | ConditionPresent$ Artifact.YouCtrl | ConditionCompare$ GE1 | Defined$ You | NumCards$ 1
 DeckHints:Type$Artifact
-Oracle:When Scholar of Stars enters the battlefield, if you control an artifact, draw a card.
+Oracle:When Scholar of Stars enters, if you control an artifact, draw a card.
diff --git a/forge-gui/res/cardsfolder/s/scholar_of_the_ages.txt b/forge-gui/res/cardsfolder/s/scholar_of_the_ages.txt
index c03374d6354..830960abcc3 100644
--- a/forge-gui/res/cardsfolder/s/scholar_of_the_ages.txt
+++ b/forge-gui/res/cardsfolder/s/scholar_of_the_ages.txt
@@ -2,6 +2,6 @@ Name:Scholar of the Ages
 ManaCost:5 U U
 Types:Creature Human Wizard
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return up to two target instant and/or sorcery cards from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, return up to two target instant and/or sorcery cards from your graveyard to your hand.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn | TgtPrompt$ Select target instant or sorcery cards from your graveyard
-Oracle:When Scholar of the Ages enters the battlefield, return up to two target instant and/or sorcery cards from your graveyard to your hand.
+Oracle:When Scholar of the Ages enters, return up to two target instant and/or sorcery cards from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/s/scholar_of_the_lost_trove.txt b/forge-gui/res/cardsfolder/s/scholar_of_the_lost_trove.txt
index b2c5bbec03b..7c0d5b9d5cd 100644
--- a/forge-gui/res/cardsfolder/s/scholar_of_the_lost_trove.txt
+++ b/forge-gui/res/cardsfolder/s/scholar_of_the_lost_trove.txt
@@ -3,8 +3,8 @@ ManaCost:5 U U
 Types:Creature Sphinx
 PT:5/5
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPlay | TriggerDescription$ When CARDNAME enters the battlefield, you may cast target instant, sorcery, or artifact card from your graveyard without paying its mana cost. If an instant or sorcery spell cast this way would be put into your graveyard this turn, exile it instead.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPlay | TriggerDescription$ When CARDNAME enters, you may cast target instant, sorcery, or artifact card from your graveyard without paying its mana cost. If an instant or sorcery spell cast this way would be put into your graveyard this turn, exile it instead.
 SVar:TrigPlay:DB$ Play | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn,Artifact.YouOwn | TgtPrompt$ Select target instant, sorcery, or artifact card in your graveyard | TgtZone$ Graveyard | WithoutManaCost$ True | ValidSA$ Spell | Optional$ True | ReplaceGraveyard$ Exile | ReplaceGraveyardValid$ Instant,Sorcery | AILogic$ ReplaySpell
 DeckHints:Type$Instant|Sorcery|Artifact
 DeckHas:Ability$Graveyard
-Oracle:Flying\nWhen Scholar of the Lost Trove enters the battlefield, you may cast target instant, sorcery, or artifact card from your graveyard without paying its mana cost. If an instant or sorcery spell cast this way would be put into your graveyard this turn, exile it instead.
+Oracle:Flying\nWhen Scholar of the Lost Trove enters, you may cast target instant, sorcery, or artifact card from your graveyard without paying its mana cost. If an instant or sorcery spell cast this way would be put into your graveyard this turn, exile it instead.
diff --git a/forge-gui/res/cardsfolder/s/scholarship_sponsor.txt b/forge-gui/res/cardsfolder/s/scholarship_sponsor.txt
index 501e38520d7..bf9ad1d46a5 100644
--- a/forge-gui/res/cardsfolder/s/scholarship_sponsor.txt
+++ b/forge-gui/res/cardsfolder/s/scholarship_sponsor.txt
@@ -2,7 +2,7 @@ Name:Scholarship Sponsor
 ManaCost:3 W
 Types:Creature Human Advisor
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRepeatEach | TriggerDescription$ When CARDNAME enters the battlefield, each player who controls fewer lands than the player who controls the most lands searches their library for a number of basic land cards less than or equal to the difference, puts those cards onto the battlefield tapped, then shuffles.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRepeatEach | TriggerDescription$ When CARDNAME enters, each player who controls fewer lands than the player who controls the most lands searches their library for a number of basic land cards less than or equal to the difference, puts those cards onto the battlefield tapped, then shuffles.
 SVar:TrigRepeatEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | ConditionCheckSVar$ X | ConditionSVarCompare$ LTY | DefinedPlayer$ Remembered | Chooser$ Remembered | ChangeType$ Land.Basic | ChangeNum$ Z | Origin$ Library | Destination$ Battlefield | Tapped$ True
 SVar:X:Count$Valid Land.RememberedPlayerCtrl
@@ -11,4 +11,4 @@ SVar:Z:SVar$Y/Minus.X
 SVar:Check1:Count$Valid Land.YouCtrl
 SVar:Check2:SVar$Y/Minus.Check1
 SVar:NeedsToPlayVar:Check2 GE2
-Oracle:When Scholarship Sponsor enters the battlefield, each player who controls fewer lands than the player who controls the most lands searches their library for a number of basic land cards less than or equal to the difference, puts those cards onto the battlefield tapped, then shuffles.
+Oracle:When Scholarship Sponsor enters, each player who controls fewer lands than the player who controls the most lands searches their library for a number of basic land cards less than or equal to the difference, puts those cards onto the battlefield tapped, then shuffles.
diff --git a/forge-gui/res/cardsfolder/s/scion_of_stygia.txt b/forge-gui/res/cardsfolder/s/scion_of_stygia.txt
index c7a2e499475..e598ebca67a 100644
--- a/forge-gui/res/cardsfolder/s/scion_of_stygia.txt
+++ b/forge-gui/res/cardsfolder/s/scion_of_stygia.txt
@@ -3,10 +3,10 @@ ManaCost:2 U
 Types:Creature Tiefling Shaman
 PT:2/1
 K:Flash
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Cone of Cold — When CARDNAME enters the battlefield, ABILITY
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Cone of Cold — When CARDNAME enters, ABILITY
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | SubAbility$ DBRollDice | SpellDescription$ choose target creature an opponent controls,
 SVar:DBRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:DBTap,10-20:DBReallyTap | SpellDescription$ then roll a d20.
 SVar:DBTap:DB$ Tap | Defined$ Targeted | SpellDescription$ 1—9 VERT Tap that creature.
 SVar:DBReallyTap:DB$ Tap | Defined$ Targeted | SubAbility$ DBNoUntap | SpellDescription$ 10—20 VERT Tap that creature. It doesn't untap during its controller's next untap step.
 SVar:DBNoUntap:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Duration$ Permanent | IsCurse$ True
-Oracle:Flash\nCone of Cold — When Scion of Stygia enters the battlefield, choose target creature an opponent controls, then roll a d20.\n1—9 | Tap that creature.\n10—20 | Tap that creature. It doesn't untap during its controller's next untap step.
+Oracle:Flash\nCone of Cold — When Scion of Stygia enters, choose target creature an opponent controls, then roll a d20.\n1—9 | Tap that creature.\n10—20 | Tap that creature. It doesn't untap during its controller's next untap step.
diff --git a/forge-gui/res/cardsfolder/s/scion_of_vitu_ghazi.txt b/forge-gui/res/cardsfolder/s/scion_of_vitu_ghazi.txt
index fd0b05b15fd..e1b51883757 100644
--- a/forge-gui/res/cardsfolder/s/scion_of_vitu_ghazi.txt
+++ b/forge-gui/res/cardsfolder/s/scion_of_vitu_ghazi.txt
@@ -2,8 +2,8 @@ Name:Scion of Vitu-Ghazi
 ManaCost:3 W W
 Types:Creature Elemental
 PT:4/4
-T:Mode$ ChangesZone | ValidCard$ Card.wasCastFromYourHandByYou+Self | Destination$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it from your hand, create a 1/1 white Bird creature token with flying, then populate. (Create a token that's a copy of a creature token you control.)
+T:Mode$ ChangesZone | ValidCard$ Card.wasCastFromYourHandByYou+Self | Destination$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, if you cast it from your hand, create a 1/1 white Bird creature token with flying, then populate. (Create a token that's a copy of a creature token you control.)
 SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenAmount$ 1 | TokenScript$ w_1_1_bird_flying | SubAbility$ DBCopy
 SVar:DBCopy:DB$ CopyPermanent | Choices$ Creature.token+YouCtrl | NumCopies$ 1 | Populate$ True
 DeckHas:Ability$Token
-Oracle:When Scion of Vitu-Ghazi enters the battlefield, if you cast it from your hand, create a 1/1 white Bird creature token with flying, then populate. (Create a token that's a copy of a creature token you control.)
+Oracle:When Scion of Vitu-Ghazi enters, if you cast it from your hand, create a 1/1 white Bird creature token with flying, then populate. (Create a token that's a copy of a creature token you control.)
diff --git a/forge-gui/res/cardsfolder/s/scion_summoner.txt b/forge-gui/res/cardsfolder/s/scion_summoner.txt
index 1b8f1c6c126..c598b42e2e2 100644
--- a/forge-gui/res/cardsfolder/s/scion_summoner.txt
+++ b/forge-gui/res/cardsfolder/s/scion_summoner.txt
@@ -3,8 +3,8 @@ ManaCost:2 G
 Types:Creature Eldrazi Drone
 PT:2/2
 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}." ({C} represents colorless mana.)
+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}." ({C} represents colorless mana.)
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_eldrazi_scion_sac | TokenOwner$ You
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless|Token
-Oracle:Devoid (This card has no color.)\nWhen Scion Summoner enters the battlefield, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." ({C} represents colorless mana.)
+Oracle:Devoid (This card has no color.)\nWhen Scion Summoner enters, create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}." ({C} represents colorless mana.)
diff --git a/forge-gui/res/cardsfolder/s/scorch_rider.txt b/forge-gui/res/cardsfolder/s/scorch_rider.txt
index 71408af062e..3542dfcf7d2 100644
--- a/forge-gui/res/cardsfolder/s/scorch_rider.txt
+++ b/forge-gui/res/cardsfolder/s/scorch_rider.txt
@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Creature Human Warrior
 PT:4/3
 K:Kicker:1 R
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, it gains haste until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, if it was kicked, it gains haste until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Haste
 SVar:PlayMain1:TRUE
-Oracle:Kicker {1}{R} (You may pay an additional {1}{R} as you cast this spell.)\nWhen Scorch Rider enters the battlefield, if it was kicked, it gains haste until end of turn.
+Oracle:Kicker {1}{R} (You may pay an additional {1}{R} as you cast this spell.)\nWhen Scorch Rider enters, if it was kicked, it gains haste until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/scorched_ruins.txt b/forge-gui/res/cardsfolder/s/scorched_ruins.txt
index 53aa47875c9..34df8da0c3c 100644
--- a/forge-gui/res/cardsfolder/s/scorched_ruins.txt
+++ b/forge-gui/res/cardsfolder/s/scorched_ruins.txt
@@ -2,7 +2,7 @@ Name:Scorched Ruins
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 4 | SpellDescription$ Add {C}{C}{C}{C}.
-R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ PayBeforeETB | Description$ If CARDNAME would enter the battlefield, sacrifice two untapped lands instead. If you do, put CARDNAME onto the battlefield. If you don't, put it into its owner's graveyard.
+R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ PayBeforeETB | Description$ If CARDNAME would enter, sacrifice two untapped lands instead. If you do, put CARDNAME onto the battlefield. If you don't, put it into its owner's graveyard.
 SVar:PayBeforeETB:DB$ Sacrifice | SacValid$ Land.untapped | Defined$ You | RememberSacrificed$ True | Amount$ 2 | StrictAmount$ True | SubAbility$ MoveToGraveyard
 SVar:MoveToGraveyard:DB$ ChangeZone | Origin$ All | Destination$ Graveyard | Defined$ ReplacedCard | ConditionCheckSVar$ X | ConditionSVarCompare$ LT2 | SubAbility$ MoveToBattlefield
 SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | ConditionCheckSVar$ X | ConditionSVarCompare$ GE2 | SubAbility$ DBCleanup
@@ -11,4 +11,4 @@ SVar:X:Remembered$Amount
 SVar:NeedsToPlayVar:Y GE2
 SVar:Y:Count$Valid Land.YouCtrl+untapped
 AI:RemoveDeck:Random
-Oracle:If Scorched Ruins would enter the battlefield, sacrifice two untapped lands instead. If you do, put Scorched Ruins onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {C}{C}{C}{C}.
+Oracle:If Scorched Ruins would enter, sacrifice two untapped lands instead. If you do, put Scorched Ruins onto the battlefield. If you don't, put it into its owner's graveyard.\n{T}: Add {C}{C}{C}{C}.
diff --git a/forge-gui/res/cardsfolder/s/scorn_blade_berserker.txt b/forge-gui/res/cardsfolder/s/scorn_blade_berserker.txt
index 4aa53d4f743..a820c6ad039 100644
--- a/forge-gui/res/cardsfolder/s/scorn_blade_berserker.txt
+++ b/forge-gui/res/cardsfolder/s/scorn_blade_berserker.txt
@@ -7,4 +7,4 @@ SVar:BackupAbility:DB$ Animate | Abilities$ ABDraw
 SVar:ABDraw:AB$ Draw | Cost$ 1 Sac<1/CARDNAME/this creature> | SpellDescription$ Draw a card.
 A:AB$ Draw | Cost$ 1 Sac<1/CARDNAME/this creature> | SpellDescription$ Draw a card.
 DeckHas:Ability$Counters|Sacrifice
-Oracle:Backup 1 (When this creature enters the battlefield, put a +1/+1 counter on target creature. If that's another creature, it gains the following ability until end of turn.)\n{1}, Sacrifice this creature: Draw a card.
+Oracle:Backup 1 (When this creature enters, put a +1/+1 counter on target creature. If that's another creature, it gains the following ability until end of turn.)\n{1}, Sacrifice this creature: Draw a card.
diff --git a/forge-gui/res/cardsfolder/s/scour_the_scene.txt b/forge-gui/res/cardsfolder/s/scour_the_scene.txt
index 7b952f5c774..4580db1481d 100644
--- a/forge-gui/res/cardsfolder/s/scour_the_scene.txt
+++ b/forge-gui/res/cardsfolder/s/scour_the_scene.txt
@@ -1,7 +1,7 @@
 Name:Scour the Scene
 ManaCost:W U
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 2/2 white and blue Detective creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 2/2 white and blue Detective creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ wu_2_2_detective
 T:Mode$ Sacrificed | ValidCard$ Artifact | ValidPlayer$ You | Execute$ TrigChooseCard | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice an artifact, choose a creature card in your hand or a creature you control. It perpetually gets +1/+0.
 SVar:TrigChooseCard:DB$ ChooseCard | ChoiceZone$ Hand,Battlefield | ChoiceTitle$ Choose a creature card in your hand or a creature you control | Mandatory$ True | Choices$ Creature.YouCtrl | SubAbility$ DBPump
@@ -9,4 +9,4 @@ SVar:DBPump:DB$ Pump | PumpZone$ Hand,Battlefield | Defined$ ChosenCard | NumAtt
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 DeckHas:Ability$Token & Type$Detective
 DeckHints:Type$Artifact
-Oracle:When Scour the Scene enters the battlefield, create a 2/2 white and blue Detective creature token.\nWhenever you sacrifice an artifact, choose a creature card in your hand or a creature you control. It perpetually gets +1/+0.
+Oracle:When Scour the Scene enters, create a 2/2 white and blue Detective creature token.\nWhenever you sacrifice an artifact, choose a creature card in your hand or a creature you control. It perpetually gets +1/+0.
diff --git a/forge-gui/res/cardsfolder/s/scoured_barrens.txt b/forge-gui/res/cardsfolder/s/scoured_barrens.txt
index 8def9bcfc06..ef62da2a936 100644
--- a/forge-gui/res/cardsfolder/s/scoured_barrens.txt
+++ b/forge-gui/res/cardsfolder/s/scoured_barrens.txt
@@ -1,9 +1,10 @@
 Name:Scoured Barrens
 ManaCost:no cost
 Types:Land
-K:CARDNAME enters the battlefield tapped.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters, you gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1
 A:AB$ Mana | Cost$ T | Produced$ Combo W B | SpellDescription$ Add {W} or {B}.
 DeckHas:Ability$LifeGain
-Oracle:Scoured Barrens enters the battlefield tapped.\nWhen Scoured Barrens enters the battlefield, you gain 1 life.\n{T}: Add {W} or {B}.
+Oracle:Scoured Barrens enters tapped.\nWhen Scoured Barrens enters, you gain 1 life.\n{T}: Add {W} or {B}.
diff --git a/forge-gui/res/cardsfolder/s/scourge_devil.txt b/forge-gui/res/cardsfolder/s/scourge_devil.txt
index 7546035455d..9faf542b1f7 100644
--- a/forge-gui/res/cardsfolder/s/scourge_devil.txt
+++ b/forge-gui/res/cardsfolder/s/scourge_devil.txt
@@ -3,7 +3,7 @@ ManaCost:4 R
 Types:Creature Devil
 PT:3/3
 K:Unearth:2 R
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME enters the battlefield, creatures you control get +1/+0 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME enters, creatures you control get +1/+0 until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1
 SVar:PlayMain1:TRUE
-Oracle:When Scourge Devil enters the battlefield, creatures you control get +1/+0 until end of turn.\nUnearth {2}{R} ({2}{R}: 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:When Scourge Devil enters, creatures you control get +1/+0 until end of turn.\nUnearth {2}{R} ({2}{R}: 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/s/scourge_of_fleets.txt b/forge-gui/res/cardsfolder/s/scourge_of_fleets.txt
index 387f4d19ab2..81f5e9ec03d 100644
--- a/forge-gui/res/cardsfolder/s/scourge_of_fleets.txt
+++ b/forge-gui/res/cardsfolder/s/scourge_of_fleets.txt
@@ -2,7 +2,7 @@ Name:Scourge of Fleets
 ManaCost:5 U U
 Types:Creature Kraken
 PT:6/6
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZoneAll | TriggerDescription$ When CARDNAME enters the battlefield, return each creature your opponents control with toughness X or less to its owner's hand, where X is the number of Islands you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZoneAll | TriggerDescription$ When CARDNAME enters, return each creature your opponents control with toughness X or less to its owner's hand, where X is the number of Islands you control.
 SVar:TrigChangeZoneAll:DB$ ChangeZoneAll | Origin$ Battlefield | Destination$ Hand | ChangeType$ Creature.toughnessLEX+OppCtrl
 SVar:X:Count$Valid Island.YouCtrl
-Oracle:When Scourge of Fleets enters the battlefield, return each creature your opponents control with toughness X or less to its owner's hand, where X is the number of Islands you control.
+Oracle:When Scourge of Fleets enters, return each creature your opponents control with toughness X or less to its owner's hand, where X is the number of Islands you control.
diff --git a/forge-gui/res/cardsfolder/s/scourge_of_skola_vale.txt b/forge-gui/res/cardsfolder/s/scourge_of_skola_vale.txt
index 753dce986c5..6f707e330aa 100644
--- a/forge-gui/res/cardsfolder/s/scourge_of_skola_vale.txt
+++ b/forge-gui/res/cardsfolder/s/scourge_of_skola_vale.txt
@@ -7,4 +7,4 @@ K:Trample
 A:AB$ PutCounter | Cost$ T Sac<1/Creature.Other/another creature> | CounterType$ P1P1 | CounterNum$ X | SpellDescription$ Put a number of +1/+1 counters on CARDNAME equal to the sacrificed creature's toughness.
 SVar:X:Sacrificed$CardToughness
 AI:RemoveDeck:All
-Oracle:Trample\nScourge of Skola Vale enters the battlefield with two +1/+1 counters on it.\n{T}, Sacrifice another creature: Put a number of +1/+1 counters on Scourge of Skola Vale equal to the sacrificed creature's toughness.
+Oracle:Trample\nScourge of Skola Vale enters with two +1/+1 counters on it.\n{T}, Sacrifice another creature: Put a number of +1/+1 counters on Scourge of Skola Vale equal to the sacrificed creature's toughness.
diff --git a/forge-gui/res/cardsfolder/s/scourge_of_valkas.txt b/forge-gui/res/cardsfolder/s/scourge_of_valkas.txt
index 9b2e4bad8b1..4d2d18d61d5 100644
--- a/forge-gui/res/cardsfolder/s/scourge_of_valkas.txt
+++ b/forge-gui/res/cardsfolder/s/scourge_of_valkas.txt
@@ -3,10 +3,10 @@ ManaCost:2 R R R
 Types:Creature Dragon
 PT:4/4
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Dragon.Other+YouCtrl | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Dragon enters the battlefield under your control, it deals X damage to any target, where X is the number of Dragons you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Dragon.Other+YouCtrl | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Dragon you control enters, it deals X damage to any target, where X is the number of Dragons you control.
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ NumDragons | DamageSource$ TriggeredCard
 SVar:NumDragons:Count$Valid Dragon.YouCtrl
 A:AB$ Pump | Cost$ R | Defined$ Self | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Dragon
-Oracle:Flying\nWhenever Scourge of Valkas or another Dragon enters the battlefield under your control, it deals X damage to any target, where X is the number of Dragons you control.\n{R}: Scourge of Valkas gets +1/+0 until end of turn.
+Oracle:Flying\nWhenever Scourge of Valkas or another Dragon you control enters, it deals X damage to any target, where X is the number of Dragons you control.\n{R}: Scourge of Valkas gets +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/scourgemark.txt b/forge-gui/res/cardsfolder/s/scourgemark.txt
index 7d91b736f9b..cebde41d9c4 100644
--- a/forge-gui/res/cardsfolder/s/scourgemark.txt
+++ b/forge-gui/res/cardsfolder/s/scourgemark.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | 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 | Description$ Enchanted creature gets +1/+0.
-Oracle:Enchant creature\nWhen Scourgemark enters the battlefield, draw a card.\nEnchanted creature gets +1/+0.
+Oracle:Enchant creature\nWhen Scourgemark enters, draw a card.\nEnchanted creature gets +1/+0.
diff --git a/forge-gui/res/cardsfolder/s/scouting_hawk.txt b/forge-gui/res/cardsfolder/s/scouting_hawk.txt
index 8482a577cf7..517a2b8c21e 100644
--- a/forge-gui/res/cardsfolder/s/scouting_hawk.txt
+++ b/forge-gui/res/cardsfolder/s/scouting_hawk.txt
@@ -3,8 +3,8 @@ ManaCost:2 W
 Types:Creature Bird
 PT:1/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | CheckSVar$ Y | SVarCompare$ GTX | TriggerDescription$ Keen Sight — When CARDNAME enters the battlefield, if an opponent controls more lands than you, search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | CheckSVar$ Y | SVarCompare$ GTX | TriggerDescription$ Keen Sight — When CARDNAME enters, if an opponent controls more lands than you, search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Plains.Basic | ChangeNum$ 1
 SVar:X:Count$Valid Land.YouCtrl
 SVar:Y:PlayerCountOpponents$HighestValid Land.YouCtrl
-Oracle:Flying\nKeen Sight — When Scouting Hawk enters the battlefield, if an opponent controls more lands than you, search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle.
+Oracle:Flying\nKeen Sight — When Scouting Hawk enters, if an opponent controls more lands than you, search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/scrapper_champion.txt b/forge-gui/res/cardsfolder/s/scrapper_champion.txt
index 7a8370a33ce..cdef7b9af72 100644
--- a/forge-gui/res/cardsfolder/s/scrapper_champion.txt
+++ b/forge-gui/res/cardsfolder/s/scrapper_champion.txt
@@ -3,8 +3,8 @@ ManaCost:3 R
 Types:Creature Human Artificer
 PT:2/2
 K:Double Strike
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEnergy | TriggerDescription$ When CARDNAME enters the battlefield, you get {E}{E} (two energy counters).
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEnergy | TriggerDescription$ When CARDNAME enters, you get {E}{E} (two energy counters).
 SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 2
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME attacks, you may pay {E}{E}. If you do, put a +1/+1 counter on it.
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ PayEnergy<2> | CounterType$ P1P1 | CounterNum$ 1
-Oracle:Double strike (This creature deals both first-strike and regular combat damage.)\nWhen Scrapper Champion enters the battlefield, you get {E}{E} (two energy counters).\nWhenever Scrapper Champion attacks, you may pay {E}{E}. If you do, put a +1/+1 counter on it.
+Oracle:Double strike (This creature deals both first-strike and regular combat damage.)\nWhen Scrapper Champion enters, you get {E}{E} (two energy counters).\nWhenever Scrapper Champion attacks, you may pay {E}{E}. If you do, put a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/s/scrapwork_cohort.txt b/forge-gui/res/cardsfolder/s/scrapwork_cohort.txt
index 0ab05e37f05..8df6eb4804b 100644
--- a/forge-gui/res/cardsfolder/s/scrapwork_cohort.txt
+++ b/forge-gui/res/cardsfolder/s/scrapwork_cohort.txt
@@ -2,9 +2,9 @@ Name:Scrapwork Cohort
 ManaCost:4
 Types:Artifact Creature Soldier
 PT:3/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 colorless Soldier artifact creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 colorless Soldier artifact creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ c_1_1_a_soldier
 K:Unearth:2 W
 DeckHas:Ability$Token|Graveyard
 DeckHints:Color$White
-Oracle:When Scrapwork Cohort enters the battlefield, create a 1/1 colorless Soldier artifact creature token.\nUnearth {2}{W} ({2}{W}: 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:When Scrapwork Cohort enters, create a 1/1 colorless Soldier artifact creature token.\nUnearth {2}{W} ({2}{W}: 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/s/scrapwork_mutt.txt b/forge-gui/res/cardsfolder/s/scrapwork_mutt.txt
index 0731788ef30..b6501d0c511 100644
--- a/forge-gui/res/cardsfolder/s/scrapwork_mutt.txt
+++ b/forge-gui/res/cardsfolder/s/scrapwork_mutt.txt
@@ -2,9 +2,9 @@ Name:Scrapwork Mutt
 ManaCost:2
 Types:Artifact Creature Dog
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, you may discard a card. If you do, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, you may discard a card. If you do, draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ Discard<1/Card> | NumCards$ 1
 K:Unearth:1 R
 DeckHas:Ability$Graveyard|Discard
 DeckHints:Color$Red
-Oracle:When Scrapwork Mutt enters the battlefield, you may discard a card. If you do, draw a card.\nUnearth {1}{R} ({1}{R}: 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:When Scrapwork Mutt enters, you may discard a card. If you do, draw a card.\nUnearth {1}{R} ({1}{R}: 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/s/scrapwork_rager.txt b/forge-gui/res/cardsfolder/s/scrapwork_rager.txt
index 0ad48e266e0..6e72408221a 100644
--- a/forge-gui/res/cardsfolder/s/scrapwork_rager.txt
+++ b/forge-gui/res/cardsfolder/s/scrapwork_rager.txt
@@ -2,10 +2,10 @@ Name:Scrapwork Rager
 ManaCost:4
 Types:Artifact Creature Phyrexian Horror
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, you draw a card and you lose 1 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, you draw a card and you lose 1 life.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 1
 K:Unearth:3 B
 DeckHas:Ability$Graveyard
 DeckHints:Color$Black
-Oracle:When Scrapwork Rager enters the battlefield, you draw a card and you lose 1 life.\nUnearth {3}{B} ({3}{B}: 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:When Scrapwork Rager enters, you draw a card and you lose 1 life.\nUnearth {3}{B} ({3}{B}: 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/s/scrapyard_recombiner.txt b/forge-gui/res/cardsfolder/s/scrapyard_recombiner.txt
index abc8fb8e670..07e90ad5429 100644
--- a/forge-gui/res/cardsfolder/s/scrapyard_recombiner.txt
+++ b/forge-gui/res/cardsfolder/s/scrapyard_recombiner.txt
@@ -8,4 +8,4 @@ AI:RemoveDeck:Random
 SVar:AIPreference:SacCost$Artifact.token,Artifact.cmcEQ1
 DeckHas:Ability$Counters
 DeckHints:Type$Construct
-Oracle:Modular 2 (This creature enters the battlefield with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)\n{T}, Sacrifice an artifact: Search your library for a Construct card, reveal it, put it into your hand, then shuffle.
+Oracle:Modular 2 (This creature enters with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)\n{T}, Sacrifice an artifact: Search your library for a Construct card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/screaming_seahawk.txt b/forge-gui/res/cardsfolder/s/screaming_seahawk.txt
index 5a2451166de..abafd631df3 100644
--- a/forge-gui/res/cardsfolder/s/screaming_seahawk.txt
+++ b/forge-gui/res/cardsfolder/s/screaming_seahawk.txt
@@ -3,7 +3,7 @@ ManaCost:4 U
 Types:Creature Bird
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a card named Screaming Seahawk, reveal it, put it into your hand, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, you may search your library for a card named Screaming Seahawk, reveal it, put it into your hand, then shuffle.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedScreaming Seahawk | ChangeNum$ 1 | ShuffleNonMandatory$ True
 DeckHints:Name$Screaming Seahawk
-Oracle:Flying\nWhen Screaming Seahawk enters the battlefield, you may search your library for a card named Screaming Seahawk, reveal it, put it into your hand, then shuffle.
+Oracle:Flying\nWhen Screaming Seahawk enters, you may search your library for a card named Screaming Seahawk, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/screeching_drake.txt b/forge-gui/res/cardsfolder/s/screeching_drake.txt
index 9e96fbb8dc4..289d7dbccda 100644
--- a/forge-gui/res/cardsfolder/s/screeching_drake.txt
+++ b/forge-gui/res/cardsfolder/s/screeching_drake.txt
@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Creature Drake
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card, then discard a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card, then discard a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
-Oracle:Flying\nWhen Screeching Drake enters the battlefield, draw a card, then discard a card.
+Oracle:Flying\nWhen Screeching Drake enters, draw a card, then discard a card.
diff --git a/forge-gui/res/cardsfolder/s/screeching_skaab.txt b/forge-gui/res/cardsfolder/s/screeching_skaab.txt
index 0bab79e4ee9..604bdff2836 100644
--- a/forge-gui/res/cardsfolder/s/screeching_skaab.txt
+++ b/forge-gui/res/cardsfolder/s/screeching_skaab.txt
@@ -2,7 +2,7 @@ Name:Screeching Skaab
 ManaCost:1 U
 Types:Creature Zombie
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, mill two cards.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters, mill two cards.
 SVar:TrigMill:DB$ Mill | NumCards$ 2 | Defined$ You
 DeckHas:Ability$Graveyard
-Oracle:When Screeching Skaab enters the battlefield, mill two cards.
+Oracle:When Screeching Skaab enters, mill two cards.
diff --git a/forge-gui/res/cardsfolder/s/scrib_nibblers.txt b/forge-gui/res/cardsfolder/s/scrib_nibblers.txt
index f58446254bd..725e64f81a6 100644
--- a/forge-gui/res/cardsfolder/s/scrib_nibblers.txt
+++ b/forge-gui/res/cardsfolder/s/scrib_nibblers.txt
@@ -5,8 +5,8 @@ PT:1/1
 A:AB$ Dig | Cost$ T | DigNum$ 1 | ChangeNum$ All | ValidTgts$ Player | TgtPrompt$ Choose a player | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBGainLife | AILogic$ EndOfOppTurn | SpellDescription$ Exile the top card of target player's library. If it's a land card, you gain 1 life.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Land | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, you may untap CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Landfall — Whenever a land you control enters, you may untap CARDNAME.
 SVar:TrigUntap:DB$ Untap | Defined$ Self
 DeckHas:Ability$LifeGain
 SVar:BuffedBy:Land
-Oracle:{T}: Exile the top card of target player's library. If it's a land card, you gain 1 life.\nLandfall — Whenever a land enters the battlefield under your control, you may untap Scrib Nibblers.
+Oracle:{T}: Exile the top card of target player's library. If it's a land card, you gain 1 life.\nLandfall — Whenever a land you control enters, you may untap Scrib Nibblers.
diff --git a/forge-gui/res/cardsfolder/s/scrivener.txt b/forge-gui/res/cardsfolder/s/scrivener.txt
index 381c71bb1b9..ba77c61a229 100644
--- a/forge-gui/res/cardsfolder/s/scrivener.txt
+++ b/forge-gui/res/cardsfolder/s/scrivener.txt
@@ -2,6 +2,6 @@ Name:Scrivener
 ManaCost:4 U
 Types:Creature Human Wizard
 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 instant 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 instant card from your graveyard to your hand.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Instant.YouCtrl
-Oracle:When Scrivener enters the battlefield, you may return target instant card from your graveyard to your hand.
+Oracle:When Scrivener enters, you may return target instant card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/s/scrounging_bandar.txt b/forge-gui/res/cardsfolder/s/scrounging_bandar.txt
index fccb5ca2010..d27e0a7776b 100644
--- a/forge-gui/res/cardsfolder/s/scrounging_bandar.txt
+++ b/forge-gui/res/cardsfolder/s/scrounging_bandar.txt
@@ -8,4 +8,4 @@ SVar:TrigMoveCounter:DB$ MoveCounter | ValidTgts$ Creature.Other | TgtPrompt$ Se
 DeckNeeds:Ability$Counters
 DeckHas:Ability$Counters
 AI:RemoveDeck:All
-Oracle:Scrounging Bandar enters the battlefield with two +1/+1 counters on it.\nAt the beginning of your upkeep, you may move any number of +1/+1 counters from Scrounging Bandar onto another target creature.
+Oracle:Scrounging Bandar enters with two +1/+1 counters on it.\nAt the beginning of your upkeep, you may move any number of +1/+1 counters from Scrounging Bandar onto another target creature.
diff --git a/forge-gui/res/cardsfolder/s/scrutiny_of_the_guildpact.txt b/forge-gui/res/cardsfolder/s/scrutiny_of_the_guildpact.txt
index 9f2afb737d5..1131fafded5 100644
--- a/forge-gui/res/cardsfolder/s/scrutiny_of_the_guildpact.txt
+++ b/forge-gui/res/cardsfolder/s/scrutiny_of_the_guildpact.txt
@@ -1,7 +1,7 @@
 Name:Scrutiny of the Guildpact
 ManaCost:1 W
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When CARDNAME enters the battlefield, you may choose a creature card in your hand. If you do, that card perpetually incorporates {W} and gains "When you cast this spell, create a 2/2 white and blue Detective creature token."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When CARDNAME enters, you may choose a creature card in your hand. If you do, that card perpetually incorporates {W} and gains "When you cast this spell, create a 2/2 white and blue Detective creature token."
 SVar:TrigChoose:DB$ ChooseCard | ChoiceZone$ Hand | Choices$ Creature.YouOwn | ChoiceTitle$ You may choose a creature card in your hand | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ ChosenCard | Incorporate$ W | Triggers$ SpellCastTrig | Duration$ Perpetual
 SVar:SpellCastTrig:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When you cast this spell, create a 2/2 white and blue Detective creature token.
@@ -9,4 +9,4 @@ SVar:TrigToken:DB$ Token | TokenScript$ wu_2_2_detective
 S:Mode$ Continuous | Affected$ Creature.MultiColor+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Multicolored creatures you control get +1/+1.
 DeckHints:Type$Detective
 DeckHas:Ability$Token & Type$Detective & Color$Blue
-Oracle:When Scrutiny of the Guildpact enters the battlefield, you may choose a creature card in your hand. If you do, that card perpetually incorporates {W} and gains "When you cast this spell, create a 2/2 white and blue Detective creature token."\nMulticolored creatures you control get +1/+1.
+Oracle:When Scrutiny of the Guildpact enters, you may choose a creature card in your hand. If you do, that card perpetually incorporates {W} and gains "When you cast this spell, create a 2/2 white and blue Detective creature token."\nMulticolored creatures you control get +1/+1.
diff --git a/forge-gui/res/cardsfolder/s/sculpted_perfection.txt b/forge-gui/res/cardsfolder/s/sculpted_perfection.txt
index 74c73da1038..ef79db4314e 100644
--- a/forge-gui/res/cardsfolder/s/sculpted_perfection.txt
+++ b/forge-gui/res/cardsfolder/s/sculpted_perfection.txt
@@ -1,9 +1,9 @@
 Name:Sculpted Perfection
 ManaCost:2 W B
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigIncubate | TriggerDescription$ When CARDNAME enters the battlefield, incubate 2. (Create an Incubator token with two +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigIncubate | TriggerDescription$ When CARDNAME enters, incubate 2. (Create an Incubator token with two +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)
 SVar:TrigIncubate:DB$ Incubate | Amount$ 2
 S:Mode$ Continuous | Affected$ Phyrexian.YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Phyrexians you control get +1/+1.
 DeckHas:Ability$Token|Counters & Type$Artifact|Phyrexian
 DeckHints:Type$Phyrexian
-Oracle:When Sculpted Perfection enters the battlefield, incubate 2. (Create an Incubator token with two +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)\nPhyrexians you control get +1/+1.
+Oracle:When Sculpted Perfection enters, incubate 2. (Create an Incubator token with two +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)\nPhyrexians you control get +1/+1.
diff --git a/forge-gui/res/cardsfolder/s/sculpting_steel.txt b/forge-gui/res/cardsfolder/s/sculpting_steel.txt
index 004e187870e..1863839700b 100644
--- a/forge-gui/res/cardsfolder/s/sculpting_steel.txt
+++ b/forge-gui/res/cardsfolder/s/sculpting_steel.txt
@@ -2,6 +2,6 @@ Name:Sculpting Steel
 ManaCost:3
 Types:Artifact
 K:ETBReplacement:Copy:DBCopy:Optional
-SVar:DBCopy:DB$ Clone | Choices$ Artifact.Other | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any artifact on the battlefield.
+SVar:DBCopy:DB$ Clone | Choices$ Artifact.Other | SpellDescription$ You may have CARDNAME enter as a copy of any artifact on the battlefield.
 SVar:NeedsToPlay:Artifact.YouDontCtrl+notnamedSculpting Steel,Artifact.YouCtrl+nonLegendary+notnamedSculpting Steel
-Oracle:You may have Sculpting Steel enter the battlefield as a copy of any artifact on the battlefield.
+Oracle:You may have Sculpting Steel enter as a copy of any artifact on the battlefield.
diff --git a/forge-gui/res/cardsfolder/s/scurrilous_sentry.txt b/forge-gui/res/cardsfolder/s/scurrilous_sentry.txt
index 7bcf54f153e..0ca1928ce10 100644
--- a/forge-gui/res/cardsfolder/s/scurrilous_sentry.txt
+++ b/forge-gui/res/cardsfolder/s/scurrilous_sentry.txt
@@ -3,9 +3,9 @@ ManaCost:3 B
 Types:Creature Human Knight Rogue
 PT:2/3
 K:Menace
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, it connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, it connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerDescription$ Whenever CARDNAME enters or attacks, it connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, it connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
 SVar:TrigConnive:DB$ Connive
 DeckHas:Ability$Counters|Discard
 SVar:HasAttackEffect:True
-Oracle:Menace\nWhenever Scurrilous Sentry enters the battlefield or attacks, it connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
+Oracle:Menace\nWhenever Scurrilous Sentry enters or attacks, it connives. (Draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on this creature.)
diff --git a/forge-gui/res/cardsfolder/s/scurry_oak.txt b/forge-gui/res/cardsfolder/s/scurry_oak.txt
index 4b8b25c059c..08d4b385a59 100644
--- a/forge-gui/res/cardsfolder/s/scurry_oak.txt
+++ b/forge-gui/res/cardsfolder/s/scurry_oak.txt
@@ -7,4 +7,4 @@ T:Mode$ CounterAddedOnce | ValidCard$ Card.Self | TriggerZones$ Battlefield | Co
 SVar:TrigSquirrel:DB$ Token | TokenAmount$ 1 | TokenScript$ g_1_1_squirrel | TokenOwner$ You
 DeckHints:Ability$Counters
 DeckHas:Ability$Token|Counters
-Oracle:Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)\nWhenever one or more +1/+1 counters are put on Scurry Oak, you may create a 1/1 green Squirrel creature token.
+Oracle:Evolve (Whenever a creature you control enters, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)\nWhenever one or more +1/+1 counters are put on Scurry Oak, you may create a 1/1 green Squirrel creature token.
diff --git a/forge-gui/res/cardsfolder/s/scurry_of_gremlins.txt b/forge-gui/res/cardsfolder/s/scurry_of_gremlins.txt
index b5d91a78d2b..dec79876ed2 100644
--- a/forge-gui/res/cardsfolder/s/scurry_of_gremlins.txt
+++ b/forge-gui/res/cardsfolder/s/scurry_of_gremlins.txt
@@ -1,10 +1,10 @@
 Name:Scurry of Gremlins
 ManaCost:2 R W
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 red Gremlin creature tokens. Then you get an amount of {E} (energy counters) equal to the number of creatures you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create two 1/1 red Gremlin creature tokens. Then you get an amount of {E} (energy counters) equal to the number of creatures you control.
 SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ r_1_1_gremlin | SubAbility$ DBEnergy
 SVar:DBEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ X
 A:AB$ PumpAll | Cost$ PayEnergy<4> | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | KW$ Haste | SpellDescription$ Creatures you control get +1/+0 and gain haste until end of turn.
 SVar:X:Count$Valid Creature.YouCtrl
 DeckHas:Ability$Token
-Oracle:When Scurry of Gremlins enters the battlefield, create two 1/1 red Gremlin creature tokens. Then you get an amount of {E} (energy counters) equal to the number of creatures you control.\nPay {E}{E}{E}{E}: Creatures you control get +1/+0 and gain haste until end of turn.
+Oracle:When Scurry of Gremlins enters, create two 1/1 red Gremlin creature tokens. Then you get an amount of {E} (energy counters) equal to the number of creatures you control.\nPay {E}{E}{E}{E}: Creatures you control get +1/+0 and gain haste until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/scute_swarm.txt b/forge-gui/res/cardsfolder/s/scute_swarm.txt
index d81c6d3511d..e63f4d31dcf 100644
--- a/forge-gui/res/cardsfolder/s/scute_swarm.txt
+++ b/forge-gui/res/cardsfolder/s/scute_swarm.txt
@@ -2,11 +2,11 @@ Name:Scute Swarm
 ManaCost:2 G
 Types:Creature Insect
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigBranch | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, create a 1/1 green Insect creature token. If you control six or more lands, create a token that's a copy of CARDNAME instead.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigBranch | TriggerDescription$ Landfall — Whenever a land you control enters, create a 1/1 green Insect creature token. If you control six or more lands, create a token that's a copy of CARDNAME instead.
 SVar:TrigBranch:DB$ Branch | BranchConditionSVar$ X | BranchConditionSVarCompare$ GE6 | TrueSubAbility$ DBCopy | FalseSubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_1_1_insect | TokenOwner$ You
 SVar:DBCopy:DB$ CopyPermanent | Defined$ Self | NumCopies$ 1
 SVar:X:Count$Valid Land.YouCtrl
 DeckHas:Ability$Token
 SVar:BuffedBy:Land
-Oracle:Landfall — Whenever a land enters the battlefield under your control, create a 1/1 green Insect creature token. If you control six or more lands, create a token that's a copy of Scute Swarm instead.
+Oracle:Landfall — Whenever a land you control enters, create a 1/1 green Insect creature token. If you control six or more lands, create a token that's a copy of Scute Swarm instead.
diff --git a/forge-gui/res/cardsfolder/s/scuttling_sentinel.txt b/forge-gui/res/cardsfolder/s/scuttling_sentinel.txt
index 0030e733706..3a3784c21b7 100644
--- a/forge-gui/res/cardsfolder/s/scuttling_sentinel.txt
+++ b/forge-gui/res/cardsfolder/s/scuttling_sentinel.txt
@@ -4,8 +4,8 @@ Types:Creature Crab Elf
 PT:3/2
 K:Flash
 K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPut | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on another target creature you control. Until end of turn, that creature becomes a blue Crab in addition to its other types and gains hexproof. (It can't be the target of spells or abilities your opponents control.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPut | TriggerDescription$ When CARDNAME enters, put a +1/+1 counter on another target creature you control. Until end of turn, that creature becomes a blue Crab in addition to its other types and gains hexproof. (It can't be the target of spells or abilities your opponents control.)
 SVar:TrigPut:DB$ PutCounter | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Types$ Crab | Colors$ Blue | OverwriteColors$ True | Keywords$ Hexproof
 DeckHas:Ability$Counters & Type$Crab
-Oracle:Flash\nVigilance\nWhen Scuttling Sentinel enters the battlefield, put a +1/+1 counter on another target creature you control. Until end of turn, that creature becomes a blue Crab in addition to its other types and gains hexproof. (It can't be the target of spells or abilities your opponents control.)
+Oracle:Flash\nVigilance\nWhen Scuttling Sentinel enters, put a +1/+1 counter on another target creature you control. Until end of turn, that creature becomes a blue Crab in addition to its other types and gains hexproof. (It can't be the target of spells or abilities your opponents control.)
diff --git a/forge-gui/res/cardsfolder/s/scythe_leopard.txt b/forge-gui/res/cardsfolder/s/scythe_leopard.txt
index a2ea12965a0..2315ec423f5 100644
--- a/forge-gui/res/cardsfolder/s/scythe_leopard.txt
+++ b/forge-gui/res/cardsfolder/s/scythe_leopard.txt
@@ -2,7 +2,7 @@ Name:Scythe Leopard
 ManaCost:G
 Types:Creature Cat
 PT:1/1
-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 +1/+1 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 +1/+1 until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1
 SVar:BuffedBy:Land
-Oracle:Landfall — Whenever a land enters the battlefield under your control, Scythe Leopard gets +1/+1 until end of turn.
+Oracle:Landfall — Whenever a land you control enters, Scythe Leopard gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/scythe_tiger.txt b/forge-gui/res/cardsfolder/s/scythe_tiger.txt
index 40ff4d9bbe9..086ea0511a9 100644
--- a/forge-gui/res/cardsfolder/s/scythe_tiger.txt
+++ b/forge-gui/res/cardsfolder/s/scythe_tiger.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Creature Cat
 PT:3/2
 K:Shroud
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you sacrifice a Land.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters, sacrifice it unless you sacrifice a Land.
 SVar:TrigSacUnless:DB$ Sacrifice | UnlessCost$ Sac<1/Land> | UnlessPayer$ You
 SVar:NeedsToPlay:Land.YouCtrl
-Oracle:Shroud (This creature can't be the target of spells or abilities.)\nWhen Scythe Tiger enters the battlefield, sacrifice it unless you sacrifice a land.
+Oracle:Shroud (This creature can't be the target of spells or abilities.)\nWhen Scythe Tiger enters, sacrifice it unless you sacrifice a land.
diff --git a/forge-gui/res/cardsfolder/s/scytheclaw.txt b/forge-gui/res/cardsfolder/s/scytheclaw.txt
index 2f3247ca574..b72e5860cc1 100644
--- a/forge-gui/res/cardsfolder/s/scytheclaw.txt
+++ b/forge-gui/res/cardsfolder/s/scytheclaw.txt
@@ -8,4 +8,4 @@ T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player | Co
 SVar:TrigLoseLifeOpp:DB$ LoseLife | Defined$ TriggeredTarget | LifeAmount$ X
 SVar:X:TriggeredTarget$LifeTotal/HalfUp
 DeckHas:Ability$Token
-Oracle:Living weapon (When this Equipment enters the battlefield, create a 0/0 black Phyrexian Germ creature token, then attach this to it.)\nEquipped creature gets +1/+1.\nWhenever equipped creature deals combat damage to a player, that player loses half their life, rounded up.\nEquip {3}
+Oracle:Living weapon (When this Equipment enters, create a 0/0 black Phyrexian Germ creature token, then attach this to it.)\nEquipped creature gets +1/+1.\nWhenever equipped creature deals combat damage to a player, that player loses half their life, rounded up.\nEquip {3}
diff --git a/forge-gui/res/cardsfolder/s/sea_drake.txt b/forge-gui/res/cardsfolder/s/sea_drake.txt
index 3640f5c7ddc..460e12fe2e9 100644
--- a/forge-gui/res/cardsfolder/s/sea_drake.txt
+++ b/forge-gui/res/cardsfolder/s/sea_drake.txt
@@ -3,6 +3,6 @@ ManaCost:2 U
 Types:Creature Drake
 PT:4/3
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters the battlefield, return two target lands you control to their owner's hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters, return two target lands you control to their owner's hand.
 SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | TargetMin$ 2 | TargetMax$ 2
-Oracle:Flying\nWhen Sea Drake enters the battlefield, return two target lands you control to their owner's hand.
+Oracle:Flying\nWhen Sea Drake enters, return two target lands you control to their owner's hand.
diff --git a/forge-gui/res/cardsfolder/s/sea_gate.txt b/forge-gui/res/cardsfolder/s/sea_gate.txt
index a054717f7e0..33041f51b97 100644
--- a/forge-gui/res/cardsfolder/s/sea_gate.txt
+++ b/forge-gui/res/cardsfolder/s/sea_gate.txt
@@ -1,8 +1,9 @@
 Name:Sea Gate
 ManaCost:no cost
 Types:Land Gate
-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:ETBReplacement:Other:ChooseColor
-SVar:ChooseColor:DB$ ChooseColor | Defined$ You | Exclude$ blue | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a color other than blue.
+SVar:ChooseColor:DB$ ChooseColor | Defined$ You | Exclude$ blue | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters, choose a color other than blue.
 A:AB$ Mana | Cost$ T | Produced$ Combo U Chosen | SpellDescription$ Add {U} or one mana of the chosen color.
-Oracle:Sea Gate enters the battlefield tapped.\nAs Sea Gate enters the battlefield, choose a color other than blue.\n{T}: Add {U} or one mana of the chosen color.
+Oracle:Sea Gate enters tapped.\nAs Sea Gate enters, choose a color other than blue.\n{T}: Add {U} or one mana of the chosen color.
diff --git a/forge-gui/res/cardsfolder/s/sea_gate_oracle.txt b/forge-gui/res/cardsfolder/s/sea_gate_oracle.txt
index 8d7ef15bc46..23fbd31bb71 100644
--- a/forge-gui/res/cardsfolder/s/sea_gate_oracle.txt
+++ b/forge-gui/res/cardsfolder/s/sea_gate_oracle.txt
@@ -2,6 +2,6 @@ Name:Sea Gate Oracle
 ManaCost:2 U
 Types:Creature Human Wizard
 PT:1/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top two cards of your library. Put one of them into your hand and the other on the bottom of your library.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters, look at the top two cards of your library. Put one of them into your hand and the other on the bottom of your library.
 SVar:TrigDig:DB$ Dig | DigNum$ 2 | NoReveal$ True
-Oracle:When Sea Gate Oracle enters the battlefield, look at the top two cards of your library. Put one of them into your hand and the other on the bottom of your library.
+Oracle:When Sea Gate Oracle enters, look at the top two cards of your library. Put one of them into your hand and the other on the bottom of your library.
diff --git a/forge-gui/res/cardsfolder/s/sea_gate_restoration_sea_gate_reborn.txt b/forge-gui/res/cardsfolder/s/sea_gate_restoration_sea_gate_reborn.txt
index 66941184b7d..6b4b4cc490f 100644
--- a/forge-gui/res/cardsfolder/s/sea_gate_restoration_sea_gate_reborn.txt
+++ b/forge-gui/res/cardsfolder/s/sea_gate_restoration_sea_gate_reborn.txt
@@ -13,7 +13,7 @@ ALTERNATE
 Name:Sea Gate, Reborn
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:DBTap
-SVar:DBTap:DB$ Tap | ETB$ True | UnlessCost$ PayLife<3> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may pay 3 life. If you don't, it enters the battlefield tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ DBTap | ReplacementResult$ Updated | Description$ As CARDNAME enters, you may pay 3 life. If you don't, it enters tapped.
+SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ PayLife<3> | UnlessPayer$ You | StackDescription$ enters tapped.
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
-Oracle:As Sea Gate, Reborn enters the battlefield, you may pay 3 life. If you don't, it enters the battlefield tapped.\n{T}: Add {U}.
+Oracle:As Sea Gate, Reborn enters, you may pay 3 life. If you don't, it enters tapped.\n{T}: Add {U}.
diff --git a/forge-gui/res/cardsfolder/s/sea_gate_stormcaller.txt b/forge-gui/res/cardsfolder/s/sea_gate_stormcaller.txt
index 6a5667e64e1..2a9817538a4 100644
--- a/forge-gui/res/cardsfolder/s/sea_gate_stormcaller.txt
+++ b/forge-gui/res/cardsfolder/s/sea_gate_stormcaller.txt
@@ -3,10 +3,10 @@ ManaCost:1 U
 Types:Creature Human Wizard
 PT:2/1
 K:Kicker:4 U
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ When CARDNAME enters the battlefield, copy the next instant or sorcery spell with mana value 2 or less you cast this turn when you cast it. You may choose new targets for the copy.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ When CARDNAME enters, copy the next instant or sorcery spell with mana value 2 or less you cast this turn when you cast it. You may choose new targets for the copy.
 SVar:TrigEffect:DB$ DelayedTrigger | AILogic$ SpellCopy | Mode$ SpellCast | ValidCard$ Instant.cmcLE2,Sorcery.cmcLE2 | ValidActivatingPlayer$ You | ThisTurn$ True | Execute$ TrigCopy | TriggerDescription$ Copy the next instant or sorcery spell with mana value 2 or less you cast this turn when you cast it. You may choose new targets for the copy.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | AILogic$ Always | Amount$ X | MayChooseTarget$ True
 SVar:X:Count$Kicked.2.1
 SVar:PlayMain1:TRUE
 DeckNeeds:Type$Instant|Sorcery
-Oracle:Kicker {4}{U}\nWhen Sea Gate Stormcaller enters the battlefield, copy the next instant or sorcery spell with mana value 2 or less you cast this turn when you cast it. If Sea Gate Stormcaller was kicked, copy that spell twice instead. You may choose new targets for the copies.
+Oracle:Kicker {4}{U}\nWhen Sea Gate Stormcaller enters, copy the next instant or sorcery spell with mana value 2 or less you cast this turn when you cast it. If Sea Gate Stormcaller was kicked, copy that spell twice instead. You may choose new targets for the copies.
diff --git a/forge-gui/res/cardsfolder/s/sea_hag_aquatic_ingress.txt b/forge-gui/res/cardsfolder/s/sea_hag_aquatic_ingress.txt
index 6745d229392..e919b06e73b 100644
--- a/forge-gui/res/cardsfolder/s/sea_hag_aquatic_ingress.txt
+++ b/forge-gui/res/cardsfolder/s/sea_hag_aquatic_ingress.txt
@@ -2,10 +2,10 @@ Name:Sea Hag
 ManaCost:4 U
 Types:Creature Hag
 PT:3/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME enters the battlefield, creatures your opponents control get -4/-0 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME enters, creatures your opponents control get -4/-0 until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.OppCtrl | NumAtt$ -4 | IsCurse$ True
 AlternateMode:Adventure
-Oracle:When Sea Hag enters the battlefield, creatures your opponents control get -4/-0 until end of turn.
+Oracle:When Sea Hag enters, creatures your opponents control get -4/-0 until end of turn.
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/s/sea_of_clouds.txt b/forge-gui/res/cardsfolder/s/sea_of_clouds.txt
index 3f8dd46ab8c..86799224e18 100644
--- a/forge-gui/res/cardsfolder/s/sea_of_clouds.txt
+++ b/forge-gui/res/cardsfolder/s/sea_of_clouds.txt
@@ -1,8 +1,8 @@
 Name:Sea of Clouds
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar2 | ConditionSVarCompare$ LT2 | SpellDescription$ CARDNAME enters the battlefield tapped unless you have two or more opponents.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you have two or more opponents.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ ETBCheckSVar2 | ConditionSVarCompare$ LT2
 SVar:ETBCheckSVar2:PlayerCountOpponents$Amount
 A:AB$ Mana | Cost$ T | Produced$ Combo W U | SpellDescription$ Add {W} or {U}.
-Oracle:Sea of Clouds enters the battlefield tapped unless you have two or more opponents.\n{T}: Add {W} or {U}.
+Oracle:Sea of Clouds enters tapped unless you have two or more opponents.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/s/seachrome_coast.txt b/forge-gui/res/cardsfolder/s/seachrome_coast.txt
index 6977b2cdc30..3bb682b677e 100644
--- a/forge-gui/res/cardsfolder/s/seachrome_coast.txt
+++ b/forge-gui/res/cardsfolder/s/seachrome_coast.txt
@@ -1,7 +1,7 @@
 Name:Seachrome Coast
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Land.YouCtrl | ConditionCompare$ GT2 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control two or fewer other lands.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you control two or fewer other lands.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Land.YouCtrl | ConditionCompare$ GT2
 A:AB$ Mana | Cost$ T | Produced$ Combo W U | SpellDescription$ Add {W} or {U}.
-Oracle:Seachrome Coast enters the battlefield tapped unless you control two or fewer other lands.\n{T}: Add {W} or {U}.
+Oracle:Seachrome Coast enters tapped unless you control two or fewer other lands.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/s/seafloor_debris.txt b/forge-gui/res/cardsfolder/s/seafloor_debris.txt
index 32470752568..c87e2180b73 100644
--- a/forge-gui/res/cardsfolder/s/seafloor_debris.txt
+++ b/forge-gui/res/cardsfolder/s/seafloor_debris.txt
@@ -3,6 +3,7 @@ ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
-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
 DeckNeeds:Color$Blue
-Oracle:Seafloor Debris enters the battlefield tapped.\n{T}: Add {U}.\n{T}, Sacrifice Seafloor Debris: Add one mana of any color.
+Oracle:Seafloor Debris enters tapped.\n{T}: Add {U}.\n{T}, Sacrifice Seafloor Debris: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/s/seal_away.txt b/forge-gui/res/cardsfolder/s/seal_away.txt
index 2e70925ca33..23fe2c94297 100644
--- a/forge-gui/res/cardsfolder/s/seal_away.txt
+++ b/forge-gui/res/cardsfolder/s/seal_away.txt
@@ -2,8 +2,8 @@ Name:Seal Away
 ManaCost:1 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 tapped creature 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 tapped creature an opponent controls until CARDNAME leaves the battlefield.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.tapped+OppCtrl | TgtPrompt$ Select target tapped creature an opponent controls | Duration$ UntilHostLeavesPlay
 SVar:PlayMain1:TRUE
 SVar:OblivionRing:TRUE
-Oracle:Flash\nWhen Seal Away enters the battlefield, exile target tapped creature an opponent controls until Seal Away leaves the battlefield.
+Oracle:Flash\nWhen Seal Away enters, exile target tapped creature an opponent controls until Seal Away leaves the battlefield.
diff --git a/forge-gui/res/cardsfolder/s/seal_from_existence.txt b/forge-gui/res/cardsfolder/s/seal_from_existence.txt
index 236bd678d15..d9f576216b8 100644
--- a/forge-gui/res/cardsfolder/s/seal_from_existence.txt
+++ b/forge-gui/res/cardsfolder/s/seal_from_existence.txt
@@ -2,8 +2,8 @@ Name:Seal from Existence
 ManaCost:1 W W
 Types:Enchantment
 K:Ward:3
-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
 SVar:PlayMain1:TRUE
 SVar:OblivionRing:TRUE
-Oracle:Ward {3}\nWhen Seal from Existence enters the battlefield, exile target nonland permanent an opponent controls until Seal from Existence leaves the battlefield.
+Oracle:Ward {3}\nWhen Seal from Existence enters, exile target nonland permanent an opponent controls until Seal from Existence leaves the battlefield.
diff --git a/forge-gui/res/cardsfolder/s/seal_of_the_guildpact.txt b/forge-gui/res/cardsfolder/s/seal_of_the_guildpact.txt
index c418c8e749f..3d6214cf9b5 100644
--- a/forge-gui/res/cardsfolder/s/seal_of_the_guildpact.txt
+++ b/forge-gui/res/cardsfolder/s/seal_of_the_guildpact.txt
@@ -2,8 +2,8 @@ Name:Seal of the Guildpact
 ManaCost:5
 Types:Artifact
 K:ETBReplacement:Other:ChooseColors
-SVar:ChooseColors:DB$ ChooseColor | Defined$ You | TwoColors$ True | AILogic$ MostProminentDualInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose two colors.
+SVar:ChooseColors:DB$ ChooseColor | Defined$ You | TwoColors$ True | AILogic$ MostProminentDualInComputerDeck | SpellDescription$ As CARDNAME enters, choose two colors.
 S:Mode$ ReduceCost | ValidCard$ Card | Type$ Spell | Activator$ You | Amount$ Col | Relative$ True | Description$ Each spell you cast costs {1} less to cast for each of the chosen colors it is.
 SVar:Col:Count$HasNumChosenColors.OriginalHost
 AI:RemoveDeck:Random
-Oracle:As Seal of the Guildpact enters the battlefield, choose two colors.\nEach spell you cast costs {1} less to cast for each of the chosen colors it is.
+Oracle:As Seal of the Guildpact enters, choose two colors.\nEach spell you cast costs {1} less to cast for each of the chosen colors it is.
diff --git a/forge-gui/res/cardsfolder/s/search_party_captain.txt b/forge-gui/res/cardsfolder/s/search_party_captain.txt
index 4916b750124..0dc7072835c 100644
--- a/forge-gui/res/cardsfolder/s/search_party_captain.txt
+++ b/forge-gui/res/cardsfolder/s/search_party_captain.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Creature Human Soldier
 PT:2/2
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ X | EffectZone$ All | Description$ This spell costs {1} less to cast for each creature you attacked with this turn.
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You
 SVar:X:Count$AttackersDeclared
-Oracle:This spell costs {1} less to cast for each creature you attacked with this turn.\nWhen Search Party Captain enters the battlefield, draw a card.
+Oracle:This spell costs {1} less to cast for each creature you attacked with this turn.\nWhen Search Party Captain enters, draw a card.
diff --git a/forge-gui/res/cardsfolder/s/search_the_city.txt b/forge-gui/res/cardsfolder/s/search_the_city.txt
index edb8b493208..21b5fce24bf 100644
--- a/forge-gui/res/cardsfolder/s/search_the_city.txt
+++ b/forge-gui/res/cardsfolder/s/search_the_city.txt
@@ -1,7 +1,7 @@
 Name:Search the City
 ManaCost:4 U
 Types:Enchantment
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ SetupSearch | TriggerDescription$ When CARDNAME enters the battlefield, exile the top five cards of your library.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ SetupSearch | TriggerDescription$ When CARDNAME enters, exile the top five cards of your library.
 SVar:SetupSearch:DB$ Dig | Defined$ You | DigNum$ 5 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | ForgetOtherRemembered$ True
 T:Mode$ SpellCast | ValidCard$ Card.sharesNameWith Remembered | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigFind | TriggerDescription$ Whenever you play a card with the same name as one of the exiled cards, you may put one of those cards with that name into its owner's hand. Then if there are no cards exiled with CARDNAME, sacrifice it. If you do, take an extra turn after this one.
 T:Mode$ LandPlayed | ValidCard$ Land.YouCtrl+sharesNameWith Remembered | TriggerZones$ Battlefield | Execute$ TrigFind | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever you play a card with the same name as one of the exiled cards, you may put one of those cards with that name into its owner's hand. Then if there are no cards exiled with CARDNAME, sacrifice it. If you do, take an extra turn after this one.
@@ -11,4 +11,4 @@ SVar:AllFoundCelebration:DB$ AddTurn | NumTurns$ 1 | ConditionCheckSVar$ X | Con
 SVar:StillLooking:Remembered$Amount
 SVar:X:Remembered$Amount
 AI:RemoveDeck:Random
-Oracle:When Search the City enters the battlefield, exile the top five cards of your library.\nWhenever you play a card with the same name as one of the exiled cards, you may put one of those cards with that name into its owner's hand. Then if there are no cards exiled with Search the City, sacrifice it. If you do, take an extra turn after this one.
+Oracle:When Search the City enters, exile the top five cards of your library.\nWhenever you play a card with the same name as one of the exiled cards, you may put one of those cards with that name into its owner's hand. Then if there are no cards exiled with Search the City, sacrifice it. If you do, take an extra turn after this one.
diff --git a/forge-gui/res/cardsfolder/s/searchlight_companion.txt b/forge-gui/res/cardsfolder/s/searchlight_companion.txt
index 11f3ac80e8a..594a0c3eab7 100644
--- a/forge-gui/res/cardsfolder/s/searchlight_companion.txt
+++ b/forge-gui/res/cardsfolder/s/searchlight_companion.txt
@@ -3,7 +3,7 @@ ManaCost:3
 Types:Artifact Creature Drone
 PT:1/1
 K:Flying
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 colorless Spirit creature token.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 colorless Spirit creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_spirit
 DeckHas:Ability$Token & Type$Spirit
-Oracle:Flying\nWhen Searchlight Companion enters the battlefield, create a 1/1 colorless Spirit creature token.
+Oracle:Flying\nWhen Searchlight Companion enters, create a 1/1 colorless Spirit creature token.
diff --git a/forge-gui/res/cardsfolder/s/seas_claim.txt b/forge-gui/res/cardsfolder/s/seas_claim.txt
index 32dafa94155..fe23efbf44e 100644
--- a/forge-gui/res/cardsfolder/s/seas_claim.txt
+++ b/forge-gui/res/cardsfolder/s/seas_claim.txt
@@ -4,4 +4,4 @@ Types:Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ U | ValidTgts$ Land | AILogic$ ChangeType
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddType$ Island | RemoveLandTypes$ True | Description$ Enchanted land is an Island.
-Oracle:Enchant land (Target a land as you cast this. This card enters the battlefield attached to that land.)\nEnchanted land is an Island.
+Oracle:Enchant land (Target a land as you cast this. This card enters attached to that land.)\nEnchanted land is an Island.
diff --git a/forge-gui/res/cardsfolder/s/seascape_aerialist.txt b/forge-gui/res/cardsfolder/s/seascape_aerialist.txt
index 202d703712d..7cbb9c96bb7 100644
--- a/forge-gui/res/cardsfolder/s/seascape_aerialist.txt
+++ b/forge-gui/res/cardsfolder/s/seascape_aerialist.txt
@@ -2,9 +2,9 @@ Name:Seascape Aerialist
 ManaCost:4 U
 Types:Creature Merfolk Wizard Ally
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain flying until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another Ally you control enters, you may have Ally creatures you control gain flying until end of turn.
 SVar:TrigPump:DB$ PumpAll | ValidCards$ Ally.YouCtrl | KW$ Flying
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
 AI:RemoveDeck:Random
-Oracle:Whenever Seascape Aerialist or another Ally enters the battlefield under your control, you may have Ally creatures you control gain flying until end of turn.
+Oracle:Whenever Seascape Aerialist or another Ally you control enters, you may have Ally creatures you control gain flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/seaside_citadel.txt b/forge-gui/res/cardsfolder/s/seaside_citadel.txt
index b92fff7500b..3eb82cb4786 100644
--- a/forge-gui/res/cardsfolder/s/seaside_citadel.txt
+++ b/forge-gui/res/cardsfolder/s/seaside_citadel.txt
@@ -1,6 +1,7 @@
 Name:Seaside Citadel
 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$ Combo G W U | SpellDescription$ Add {G}, {W}, or {U}.
-Oracle:Seaside Citadel enters the battlefield tapped.\n{T}: Add {G}, {W}, or {U}.
+Oracle:Seaside Citadel enters tapped.\n{T}: Add {G}, {W}, or {U}.
diff --git a/forge-gui/res/cardsfolder/s/season_of_growth.txt b/forge-gui/res/cardsfolder/s/season_of_growth.txt
index 10f8add8591..ed32cd0dd5a 100644
--- a/forge-gui/res/cardsfolder/s/season_of_growth.txt
+++ b/forge-gui/res/cardsfolder/s/season_of_growth.txt
@@ -1,8 +1,8 @@
 Name:Season of Growth
 ManaCost:1 G
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigScry | TriggerDescription$ Whenever a creature enters the battlefield under your control, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigScry | TriggerDescription$ Whenever a creature you control enters, 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
 T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | ValidActivatingPlayer$ You | TargetsValid$ Creature.YouCtrl+inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever you cast a spell that targets a creature you control, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
-Oracle:Whenever a creature enters the battlefield under your control, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\nWhenever you cast a spell that targets a creature you control, draw a card.
+Oracle:Whenever a creature you control enters, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\nWhenever you cast a spell that targets a creature you control, draw a card.
diff --git a/forge-gui/res/cardsfolder/s/seasoned_buttoneer.txt b/forge-gui/res/cardsfolder/s/seasoned_buttoneer.txt
index cd12e102c62..bfd9fe6927f 100644
--- a/forge-gui/res/cardsfolder/s/seasoned_buttoneer.txt
+++ b/forge-gui/res/cardsfolder/s/seasoned_buttoneer.txt
@@ -2,6 +2,6 @@ Name:Seasoned Buttoneer
 ManaCost:2 U
 Types:Creature Vedalken Employee
 PT:2/2
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigOpenAttraction | TriggerDescription$ When CARDNAME enters the battlefield, open an Attraction.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigOpenAttraction | TriggerDescription$ When CARDNAME enters, open an Attraction.
 SVar:TrigOpenAttraction:DB$ OpenAttraction
-Oracle:When Seasoned Buttoneer enters the battlefield, open an Attraction.
\ No newline at end of file
+Oracle:When Seasoned Buttoneer enters, open an Attraction.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/seasoned_dungeoneer.txt b/forge-gui/res/cardsfolder/s/seasoned_dungeoneer.txt
index 5c3bac0e54a..416508fb322 100644
--- a/forge-gui/res/cardsfolder/s/seasoned_dungeoneer.txt
+++ b/forge-gui/res/cardsfolder/s/seasoned_dungeoneer.txt
@@ -2,7 +2,7 @@ Name:Seasoned Dungeoneer
 ManaCost:3 W
 Types:Creature Human Warrior
 PT:3/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInitiative | TriggerDescription$ When CARDNAME enters the battlefield, you take the initiative.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInitiative | TriggerDescription$ When CARDNAME enters, you take the initiative.
 SVar:TrigInitiative:DB$ TakeInitiative
 T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, target attacking Cleric, Rogue, Warrior, or Wizard gains protection from creatures until end of turn. It explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on the creature, then put the card back or put it into your graveyard.)
 SVar:TrigPump:DB$ Pump | KW$ Protection:Creature | TgtPrompt$ Select target attacking Cleric, Rogue, Warrior, or Wizard | ValidTgts$ Creature.attacking+Cleric,Creature.attacking+Rogue,Creature.attacking+Warrior,Creature.attacking+Wizard | SubAbility$ DBExplore
@@ -10,4 +10,4 @@ SVar:DBExplore:DB$ Explore | Defined$ Targeted
 SVar:PlayMain1:TRUE
 DeckHas:Ability$Party
 DeckHints:Type$Cleric|Rogue|Warrior|Wizard
-Oracle:When Seasoned Dungeoneer enters the battlefield, you take the initiative.\nWhenever you attack, target attacking Cleric, Rogue, Warrior, or Wizard gains protection from creatures until end of turn. It explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on the creature, then put the card back or put it into your graveyard.)
+Oracle:When Seasoned Dungeoneer enters, you take the initiative.\nWhenever you attack, target attacking Cleric, Rogue, Warrior, or Wizard gains protection from creatures until end of turn. It explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on the creature, then put the card back or put it into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/s/seasoned_pyromancer.txt b/forge-gui/res/cardsfolder/s/seasoned_pyromancer.txt
index 5f7edcac341..95b321912a0 100644
--- a/forge-gui/res/cardsfolder/s/seasoned_pyromancer.txt
+++ b/forge-gui/res/cardsfolder/s/seasoned_pyromancer.txt
@@ -2,7 +2,7 @@ Name:Seasoned Pyromancer
 ManaCost:1 R R
 Types:Creature Human Shaman
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, discard two cards, then draw two cards. For each nonland card discarded this way, create a 1/1 red Elemental creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, discard two cards, then draw two cards. For each nonland card discarded this way, create a 1/1 red Elemental creature token.
 SVar:TrigDiscard:DB$ Discard | NumCards$ 2 | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 2 | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenAmount$ X | TokenScript$ r_1_1_elemental | TokenOwner$ You | SubAbility$ DBCleanup
@@ -11,4 +11,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ Token | Cost$ 3 R R ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | TokenAmount$ 2 | TokenScript$ r_1_1_elemental | TokenOwner$ You | SpellDescription$ Create two 1/1 red Elemental creature tokens.
 SVar:AIPreference:ExileFromGraveCost$Card.Self
 DeckHas:Ability$Token
-Oracle:When Seasoned Pyromancer enters the battlefield, discard two cards, then draw two cards. For each nonland card discarded this way, create a 1/1 red Elemental creature token.\n{3}{R}{R}, Exile Seasoned Pyromancer from your graveyard: Create two 1/1 red Elemental creature tokens.
+Oracle:When Seasoned Pyromancer enters, discard two cards, then draw two cards. For each nonland card discarded this way, create a 1/1 red Elemental creature token.\n{3}{R}{R}, Exile Seasoned Pyromancer from your graveyard: Create two 1/1 red Elemental creature tokens.
diff --git a/forge-gui/res/cardsfolder/s/seatower_imprisonment.txt b/forge-gui/res/cardsfolder/s/seatower_imprisonment.txt
index d03c6c70bb5..a04ac1fd13c 100644
--- a/forge-gui/res/cardsfolder/s/seatower_imprisonment.txt
+++ b/forge-gui/res/cardsfolder/s/seatower_imprisonment.txt
@@ -3,7 +3,7 @@ ManaCost:2 W W
 Types:Enchantment Aura
 K:Enchant creature or planeswalker you don't control
 A:SP$ Attach | ValidTgts$ Creature.YouDontCtrl,Planeswalker.YouDontCtrl | AILogic$ Curse
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConjure | TriggerDescription$ When CARDNAME enters the battlefield, conjure a card named Soldiers of the Watch onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConjure | TriggerDescription$ When CARDNAME enters, conjure a card named Soldiers of the Watch onto the battlefield.
 SVar:TrigConjure:DB$ MakeCard | Conjure$ True | Name$ Soldiers of the Watch | Zone$ Battlefield
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block. & CARDNAME's activated abilities can't be activated. | Description$ Enchanted permanent can't attack or block and its activated abilities can't be activated.
-Oracle:Enchant creature or planeswalker you don't control\nWhen Seatower Imprisonment enters the battlefield, conjure a card named Soldiers of the Watch onto the battlefield.\nEnchanted permanent can't attack or block and its activated abilities can't be activated.
+Oracle:Enchant creature or planeswalker you don't control\nWhen Seatower Imprisonment enters, conjure a card named Soldiers of the Watch onto the battlefield.\nEnchanted permanent can't attack or block and its activated abilities can't be activated.
diff --git a/forge-gui/res/cardsfolder/s/secluded_courtyard.txt b/forge-gui/res/cardsfolder/s/secluded_courtyard.txt
index ba4492e94d9..83d2002a5ee 100644
--- a/forge-gui/res/cardsfolder/s/secluded_courtyard.txt
+++ b/forge-gui/res/cardsfolder/s/secluded_courtyard.txt
@@ -2,7 +2,7 @@ Name:Secluded Courtyard
 ManaCost:no cost
 Types:Land
 K:ETBReplacement:Other:ChooseCT
-SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type. | AILogic$ MostProminentInComputerDeck
+SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | SpellDescription$ As CARDNAME enters, choose a creature type. | AILogic$ MostProminentInComputerDeck
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Spell.Creature+ChosenType,Activated.Creature+ChosenType | SpellDescription$ Add one mana of any color. Spend this mana only to cast a creature spell of the chosen type or activate an ability of a creature or creature card of the chosen type.
-Oracle:As Secluded Courtyard enters the battlefield, choose a creature type.\n{T}: Add {C}.\n{T}: Add one mana of any color. Spend this mana only to cast a creature spell of the chosen type or activate an ability of a creature or creature card of the chosen type.
+Oracle:As Secluded Courtyard enters, choose a creature type.\n{T}: Add {C}.\n{T}: Add one mana of any color. Spend this mana only to cast a creature spell of the chosen type or activate an ability of a creature or creature card of the chosen type.
diff --git a/forge-gui/res/cardsfolder/s/secluded_glen.txt b/forge-gui/res/cardsfolder/s/secluded_glen.txt
index 9dc4645671a..00c45fcf7e6 100644
--- a/forge-gui/res/cardsfolder/s/secluded_glen.txt
+++ b/forge-gui/res/cardsfolder/s/secluded_glen.txt
@@ -2,6 +2,6 @@ Name:Secluded Glen
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ Combo U B | SpellDescription$ Add {U} or {B}.
-K:ETBReplacement:Other:DBTap
-SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Faerie> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Faerie card from your hand. If you don't, CARDNAME enters the battlefield tapped.
-Oracle:As Secluded Glen enters the battlefield, you may reveal a Faerie card from your hand. If you don't, Secluded Glen enters the battlefield tapped.\n{T}: Add {U} or {B}.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ DBTap | ReplacementResult$ Updated | Description$ As CARDNAME enters, you may reveal a Faerie card from your hand. If you don't, CARDNAME enters tapped.
+SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Faerie> | UnlessPayer$ You | StackDescription$ enters tapped.
+Oracle:As Secluded Glen enters, you may reveal a Faerie card from your hand. If you don't, Secluded Glen enters tapped.\n{T}: Add {U} or {B}.
diff --git a/forge-gui/res/cardsfolder/s/secluded_steppe.txt b/forge-gui/res/cardsfolder/s/secluded_steppe.txt
index cfc0cd51d0a..ceedeb8701f 100644
--- a/forge-gui/res/cardsfolder/s/secluded_steppe.txt
+++ b/forge-gui/res/cardsfolder/s/secluded_steppe.txt
@@ -1,7 +1,8 @@
 Name:Secluded Steppe
 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$ W | SpellDescription$ Add {W}.
 K:Cycling:W
-Oracle:Secluded Steppe enters the battlefield tapped.\n{T}: Add {W}.\nCycling {W} ({W}, Discard this card: Draw a card.)
+Oracle:Secluded Steppe enters tapped.\n{T}: Add {W}.\nCycling {W} ({W}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/s/secret_passage.txt b/forge-gui/res/cardsfolder/s/secret_passage.txt
index a8b2a91f6f6..fd72ceac236 100644
--- a/forge-gui/res/cardsfolder/s/secret_passage.txt
+++ b/forge-gui/res/cardsfolder/s/secret_passage.txt
@@ -1,8 +1,9 @@
 Name:Secret Passage
 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$ Combo U B | SpellDescription$ Add {U} or {B}.
 A:AB$ Investigate | Cost$ 4 T | SpellDescription$ Investigate. (Create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
 DeckHints:Ability$Investigate|Token
-Oracle:Secret Passage enters the battlefield tapped.\n{T}: Add {U} or {B}.\n{4}, {T}: Investigate. (Create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
+Oracle:Secret Passage enters tapped.\n{T}: Add {U} or {B}.\n{4}, {T}: Investigate. (Create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")
diff --git a/forge-gui/res/cardsfolder/s/secret_summoning.txt b/forge-gui/res/cardsfolder/s/secret_summoning.txt
index 0930805148b..a63bfc3ae74 100644
--- a/forge-gui/res/cardsfolder/s/secret_summoning.txt
+++ b/forge-gui/res/cardsfolder/s/secret_summoning.txt
@@ -2,8 +2,8 @@ Name:Secret Summoning
 ManaCost:no cost
 Types:Conspiracy
 K:Hidden agenda
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.NamedCard+YouCtrl | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ Whenever a creature with the chosen name enters the battlefield under your control, you may search your library for any number of cards with that name, reveal them, put them into your hand, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.NamedCard+YouCtrl | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ Whenever a creature with the chosen name you control enters, you may search your library for any number of cards with that name, reveal them, put them into your hand, then shuffle.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.NamedCard | ChangeNum$ X | ShuffleNonMandatory$ True
 SVar:X:Count$InYourLibrary
 SVar:AgendaLogic:MostProminentCreatureInComputerDeck
-Oracle:Hidden agenda (Start the game with this conspiracy face down in the command zone and secretly choose a card name. You may turn this conspiracy face up any time and reveal that name.)\nWhenever a creature with the chosen name enters the battlefield under your control, you may search your library for any number of cards with that name, reveal them, put them into your hand, then shuffle.
+Oracle:Hidden agenda (Start the game with this conspiracy face down in the command zone and secretly choose a card name. You may turn this conspiracy face up any time and reveal that name.)\nWhenever a creature with the chosen name you control enters, you may search your library for any number of cards with that name, reveal them, put them into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/securitron_squadron.txt b/forge-gui/res/cardsfolder/s/securitron_squadron.txt
index ac7cb698411..6b68ce0e752 100644
--- a/forge-gui/res/cardsfolder/s/securitron_squadron.txt
+++ b/forge-gui/res/cardsfolder/s/securitron_squadron.txt
@@ -4,8 +4,8 @@ Types:Artifact Creature Robot
 PT:2/2
 K:Squad:3
 K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature token enters the battlefield under your control, put a +1/+1 counter on it.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.token+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature token you control enters, put a +1/+1 counter on it.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ TriggeredCardLKICopy | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Token|Counters
 DeckHints:Ability$Token
-Oracle:Squad {3} (As an additional cost to cast this spell, you may pay {3} any number of times. When this creature enters the battlefield, create that many tokens that are copies of it.)\nVigilance\nWhenever a creature token enters the battlefield under your control, put a +1/+1 counter on it.
+Oracle:Squad {3} (As an additional cost to cast this spell, you may pay {3} any number of times. When this creature enters, create that many tokens that are copies of it.)\nVigilance\nWhenever a creature token you control enters, put a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/s/security_blockade.txt b/forge-gui/res/cardsfolder/s/security_blockade.txt
index 4e377a67f5d..29ff953d497 100644
--- a/forge-gui/res/cardsfolder/s/security_blockade.txt
+++ b/forge-gui/res/cardsfolder/s/security_blockade.txt
@@ -5,8 +5,8 @@ K:Enchant land
 A:SP$ Attach | Cost$ 2 W | ValidTgts$ Land | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Land.AttachedBy | AddAbility$ PreventDamage | Description$ Enchanted land has "{T}: Prevent the next 1 damage that would be dealt to you this turn."
 SVar:PreventDamage:AB$ PreventDamage | Cost$ T | Defined$ You | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to you this turn.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 2/2 white Knight creature token with vigilance.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 2/2 white Knight creature token with vigilance.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_2_2_knight_vigilance | TokenOwner$ You
 SVar:NonStackingAttachEffect:True
 DeckHas:Ability$Token
-Oracle:Enchant land\nWhen Security Blockade enters the battlefield, create a 2/2 white Knight creature token with vigilance.\nEnchanted land has "{T}: Prevent the next 1 damage that would be dealt to you this turn."
+Oracle:Enchant land\nWhen Security Blockade enters, create a 2/2 white Knight creature token with vigilance.\nEnchanted land has "{T}: Prevent the next 1 damage that would be dealt to you this turn."
diff --git a/forge-gui/res/cardsfolder/s/sedraxis_alchemist.txt b/forge-gui/res/cardsfolder/s/sedraxis_alchemist.txt
index 2c91ea80cd4..2404cdd74c0 100644
--- a/forge-gui/res/cardsfolder/s/sedraxis_alchemist.txt
+++ b/forge-gui/res/cardsfolder/s/sedraxis_alchemist.txt
@@ -2,10 +2,10 @@ Name:Sedraxis Alchemist
 ManaCost:2 B
 Types:Creature Zombie Wizard
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Permanent.Blue+YouCtrl | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters the battlefield, if you control a blue permanent, return target nonland permanent to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Permanent.Blue+YouCtrl | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters, if you control a blue permanent, return target nonland permanent to its owner's hand.
 SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent
 AI:RemoveDeck:Random
 DeckNeeds:Color$Blue
 DeckHints:Color$Blue
 SVar:PlayMain1:TRUE
-Oracle:When Sedraxis Alchemist enters the battlefield, if you control a blue permanent, return target nonland permanent to its owner's hand.
+Oracle:When Sedraxis Alchemist enters, if you control a blue permanent, return target nonland permanent to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/s/seed_the_land.txt b/forge-gui/res/cardsfolder/s/seed_the_land.txt
index 9b3e429067a..950fa15fb92 100644
--- a/forge-gui/res/cardsfolder/s/seed_the_land.txt
+++ b/forge-gui/res/cardsfolder/s/seed_the_land.txt
@@ -1,6 +1,6 @@
 Name:Seed the Land
 ManaCost:2 G G
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a land enters the battlefield, its controller creates a 1/1 green Snake creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a land enters, its controller creates a 1/1 green Snake creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_1_1_snake | TokenOwner$ TriggeredCardController
-Oracle:Whenever a land enters the battlefield, its controller creates a 1/1 green Snake creature token.
+Oracle:Whenever a land enters, its controller creates a 1/1 green Snake creature token.
diff --git a/forge-gui/res/cardsfolder/s/seedpod_caretaker.txt b/forge-gui/res/cardsfolder/s/seedpod_caretaker.txt
index f215dc76b94..682347722e6 100644
--- a/forge-gui/res/cardsfolder/s/seedpod_caretaker.txt
+++ b/forge-gui/res/cardsfolder/s/seedpod_caretaker.txt
@@ -2,10 +2,10 @@ Name:Seedpod Caretaker
 ManaCost:2 W
 Types:Creature Phyrexian Cleric
 PT:2/2
-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$ P1P1,Transform
 SVar:P1P1:DB$ PutCounter | ValidTgts$ Artifact.YouCtrl,Creature.YouCtrl | TgtPrompt$ Select target artifact or creature you control | CounterType$ P1P1 | SpellDescription$ Put a +1/+1 counter on target artifact or creature you control.
 SVar:Transform:DB$ SetState | ValidTgts$ Incubator.token+YouCtrl | TgtPrompt$ Select target Incubator token you control | Mode$ Transform | SpellDescription$ Transform target Incubator token you control.
 DeckHas:Ability$Counters
 DeckHints:Ability$Token & Type$Artifact
-Oracle:When Seedpod Caretaker enters the battlefield, choose one —\n• Put a +1/+1 counter on target artifact or creature you control.\n• Transform target Incubator token you control.
+Oracle:When Seedpod Caretaker enters, choose one —\n• Put a +1/+1 counter on target artifact or creature you control.\n• Transform target Incubator token you control.
diff --git a/forge-gui/res/cardsfolder/s/seekers_squire.txt b/forge-gui/res/cardsfolder/s/seekers_squire.txt
index 87d3a1bffb7..c5692de6e31 100644
--- a/forge-gui/res/cardsfolder/s/seekers_squire.txt
+++ b/forge-gui/res/cardsfolder/s/seekers_squire.txt
@@ -2,7 +2,7 @@ Name:Seekers' Squire
 ManaCost:1 B
 Types:Creature Human Scout
 PT:1/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExplore | TriggerDescription$ When CARDNAME enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back on top or into your graveyard.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExplore | TriggerDescription$ When CARDNAME enters, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back on top or into your graveyard.)
 SVar:TrigExplore:DB$ Explore
 DeckHas:Ability$Counters
-Oracle:When Seekers' Squire enters the battlefield, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.)
+Oracle:When Seekers' Squire enters, it explores. (Reveal the top card of your library. Put that card into your hand if it's a land. Otherwise, put a +1/+1 counter on this creature, then put the card back or put it into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/s/seers_sundial.txt b/forge-gui/res/cardsfolder/s/seers_sundial.txt
index e477fc6a700..51ea711de2d 100644
--- a/forge-gui/res/cardsfolder/s/seers_sundial.txt
+++ b/forge-gui/res/cardsfolder/s/seers_sundial.txt
@@ -1,6 +1,6 @@
 Name:Seer's Sundial
 ManaCost:4
 Types:Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, you may pay {2}. If you do, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Landfall — Whenever a land you control enters, you may pay {2}. If you do, draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ 2 | Defined$ You | NumCards$ 1
-Oracle:Landfall — Whenever a land enters the battlefield under your control, you may pay {2}. If you do, draw a card.
+Oracle:Landfall — Whenever a land you control enters, you may pay {2}. If you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/s/seething_skitter_priest.txt b/forge-gui/res/cardsfolder/s/seething_skitter_priest.txt
index 22346a0913e..8787aa6d2ad 100644
--- a/forge-gui/res/cardsfolder/s/seething_skitter_priest.txt
+++ b/forge-gui/res/cardsfolder/s/seething_skitter_priest.txt
@@ -3,9 +3,9 @@ ManaCost:2 W B
 Types:Creature Phyrexian Cleric
 PT:3/3
 K:Toxic:1
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ When CARDNAME enters the battlefield, creatures you control and creature cards in your hand perpetually gain "When this creature dies, create a 1/1 colorless Phyrexian Mite artifact creature token with toxic 1 and 'This creature can't block.'"
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ When CARDNAME enters, creatures you control and creature cards in your hand perpetually gain "When this creature dies, create a 1/1 colorless Phyrexian Mite artifact creature token with toxic 1 and 'This creature can't block.'"
 SVar:TrigAnimate:DB$ AnimateAll | Zone$ Battlefield,Hand | ValidCards$ Creature.YouCtrl | Triggers$ DiesTrig | Duration$ Perpetual
 SVar:DiesTrig:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature dies, create a 1/1 colorless Phyrexian Mite artifact creature token with toxic 1 and "This creature can't block."
 SVar:TrigToken:DB$ Token | TokenScript$ c_1_1_a_phyrexian_mite_toxic_noblock
 DeckHas:Type$Mite|Artifact & Ability$Token
-Oracle:Toxic 1\nWhen Seething Skitter-Priest enters the battlefield, creatures you control and creature cards in your hand perpetually gain "When this creature dies, create a 1/1 colorless Phyrexian Mite artifact creature token with toxic 1 and 'This creature can't block.'"
+Oracle:Toxic 1\nWhen Seething Skitter-Priest enters, creatures you control and creature cards in your hand perpetually gain "When this creature dies, create a 1/1 colorless Phyrexian Mite artifact creature token with toxic 1 and 'This creature can't block.'"
diff --git a/forge-gui/res/cardsfolder/s/sehts_tiger.txt b/forge-gui/res/cardsfolder/s/sehts_tiger.txt
index bdb11c96cf6..2576213e7a2 100644
--- a/forge-gui/res/cardsfolder/s/sehts_tiger.txt
+++ b/forge-gui/res/cardsfolder/s/sehts_tiger.txt
@@ -3,7 +3,7 @@ ManaCost:2 W W
 Types:Creature Cat
 PT:3/3
 K:Flash
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When CARDNAME enters the battlefield, you gain protection from the color of your choice until end of turn
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When CARDNAME enters, you gain protection from the color of your choice until end of turn
 SVar:TrigChoose:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentAttackers | SubAbility$ SehtsProtection
 SVar:SehtsProtection:DB$ ProtectionAll | ValidPlayers$ You | Gains$ ChosenColor
-Oracle:Flash (You may cast this spell any time you could cast an instant.)\nWhen Seht's Tiger enters the battlefield, you gain protection from the color of your choice until end of turn. (You can't be targeted, dealt damage, or enchanted by anything of the chosen color.)
+Oracle:Flash (You may cast this spell any time you could cast an instant.)\nWhen Seht's Tiger enters, you gain protection from the color of your choice until end of turn. (You can't be targeted, dealt damage, or enchanted by anything of the chosen color.)
diff --git a/forge-gui/res/cardsfolder/s/seismic_elemental.txt b/forge-gui/res/cardsfolder/s/seismic_elemental.txt
index c498a2173a9..37bbeb31854 100644
--- a/forge-gui/res/cardsfolder/s/seismic_elemental.txt
+++ b/forge-gui/res/cardsfolder/s/seismic_elemental.txt
@@ -2,8 +2,8 @@ Name:Seismic Elemental
 ManaCost:3 R R
 Types:Creature Elemental
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ When CARDNAME enters the battlefield, creatures without flying can't block this turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ When CARDNAME enters, creatures without flying can't block this turn.
 SVar:TrigEffect:DB$ Effect | StaticAbilities$ KWPump | SpellDescription$ Creatures without flying can't block this turn.
 SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.withoutFlying | AddHiddenKeyword$ CARDNAME can't block. | Description$ Creatures without flying can't block this turn.
 SVar:PlayMain1:TRUE
-Oracle:When Seismic Elemental enters the battlefield, creatures without flying can't block this turn.
+Oracle:When Seismic Elemental enters, creatures without flying can't block this turn.
diff --git a/forge-gui/res/cardsfolder/s/sejiri_refuge.txt b/forge-gui/res/cardsfolder/s/sejiri_refuge.txt
index e06475bbef0..9fe306f9881 100644
--- a/forge-gui/res/cardsfolder/s/sejiri_refuge.txt
+++ b/forge-gui/res/cardsfolder/s/sejiri_refuge.txt
@@ -1,9 +1,10 @@
 Name:Sejiri Refuge
 ManaCost:no cost
 Types:Land
-K:CARDNAME enters the battlefield tapped.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 1 life.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters, you gain 1 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 1
 A:AB$ Mana | Cost$ T | Produced$ Combo W U | SpellDescription$ Add {W} or {U}.
 DeckHas:Ability$LifeGain
-Oracle:Sejiri Refuge enters the battlefield tapped.\nWhen Sejiri Refuge enters the battlefield, you gain 1 life.\n{T}: Add {W} or {U}.
+Oracle:Sejiri Refuge enters tapped.\nWhen Sejiri Refuge enters, you gain 1 life.\n{T}: Add {W} or {U}.
diff --git a/forge-gui/res/cardsfolder/s/sejiri_shelter_sejiri_glacier.txt b/forge-gui/res/cardsfolder/s/sejiri_shelter_sejiri_glacier.txt
index de807269e79..a8f1a0acc84 100644
--- a/forge-gui/res/cardsfolder/s/sejiri_shelter_sejiri_glacier.txt
+++ b/forge-gui/res/cardsfolder/s/sejiri_shelter_sejiri_glacier.txt
@@ -10,6 +10,7 @@ ALTERNATE
 Name:Sejiri Glacier
 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$ W | SpellDescription$ Add {W}.
-Oracle:Sejiri Glacier enters the battlefield tapped.\n{T}: Add {W}.
+Oracle:Sejiri Glacier enters tapped.\n{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/s/sejiri_steppe.txt b/forge-gui/res/cardsfolder/s/sejiri_steppe.txt
index 1093c412d3b..9acc0c4b567 100644
--- a/forge-gui/res/cardsfolder/s/sejiri_steppe.txt
+++ b/forge-gui/res/cardsfolder/s/sejiri_steppe.txt
@@ -1,8 +1,9 @@
 Name:Sejiri Steppe
 ManaCost:no cost
 Types:Land
-K:CARDNAME enters the battlefield tapped.
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigProtect | TriggerDescription$ When CARDNAME enters the battlefield, target creature you control gains protection from the color of your choice until end of turn.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigProtect | TriggerDescription$ When CARDNAME enters, target creature you control gains protection from the color of your choice until end of turn.
 SVar:TrigProtect:DB$ Protection | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | Gains$ Choice | Choices$ AnyColor
 A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}.
-Oracle:Sejiri Steppe enters the battlefield tapped.\nWhen Sejiri Steppe enters the battlefield, target creature you control gains protection from the color of your choice until end of turn.\n{T}: Add {W}.
+Oracle:Sejiri Steppe enters tapped.\nWhen Sejiri Steppe enters, target creature you control gains protection from the color of your choice until end of turn.\n{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/s/sekki_seasons_guide.txt b/forge-gui/res/cardsfolder/s/sekki_seasons_guide.txt
index d903c38f0d0..3bad143bdeb 100644
--- a/forge-gui/res/cardsfolder/s/sekki_seasons_guide.txt
+++ b/forge-gui/res/cardsfolder/s/sekki_seasons_guide.txt
@@ -8,4 +8,4 @@ SVar:SekkiCounters:DB$ RemoveCounter | CounterType$ P1P1 | CounterNum$ SekkiX |
 SVar:DBSekkiToken:DB$ Token | TokenAmount$ SekkiX | TokenScript$ c_1_1_spirit
 A:AB$ ChangeZone | Cost$ Sac<8/Spirit> | Defined$ Self | ActivationZone$ Graveyard | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Return NICKNAME from your graveyard to the battlefield.
 SVar:SekkiX:ReplaceCount$DamageAmount
-Oracle:Sekki, Seasons' Guide enters the battlefield with eight +1/+1 counters on it.\nIf damage would be dealt to Sekki, prevent that damage, remove that many +1/+1 counters from Sekki, and create that many 1/1 colorless Spirit creature tokens.\nSacrifice eight Spirits: Return Sekki from your graveyard to the battlefield.
+Oracle:Sekki, Seasons' Guide enters with eight +1/+1 counters on it.\nIf damage would be dealt to Sekki, prevent that damage, remove that many +1/+1 counters from Sekki, and create that many 1/1 colorless Spirit creature tokens.\nSacrifice eight Spirits: Return Sekki from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/s/selesnya_guildgate.txt b/forge-gui/res/cardsfolder/s/selesnya_guildgate.txt
index 270e2e4c341..c07046b7977 100644
--- a/forge-gui/res/cardsfolder/s/selesnya_guildgate.txt
+++ b/forge-gui/res/cardsfolder/s/selesnya_guildgate.txt
@@ -1,6 +1,7 @@
 Name:Selesnya Guildgate
 ManaCost:no cost
 Types:Land Gate
-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$ Combo G W | SpellDescription$ Add {G} or {W}.
-Oracle:Selesnya Guildgate enters the battlefield tapped.\n{T}: Add {G} or {W}.
+Oracle:Selesnya Guildgate enters tapped.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/s/selesnya_sanctuary.txt b/forge-gui/res/cardsfolder/s/selesnya_sanctuary.txt
index 45b60bfb436..2745ca10d47 100644
--- a/forge-gui/res/cardsfolder/s/selesnya_sanctuary.txt
+++ b/forge-gui/res/cardsfolder/s/selesnya_sanctuary.txt
@@ -1,9 +1,10 @@
 Name:Selesnya Sanctuary
 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$ G W | SpellDescription$ Add {G}{W}.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters, return a land you control to its owner's hand.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | AILogic$ NeverBounceItself | SpellDescription$ Return a land you control to its owner's hand.
 SVar:NeedsToPlay:Land.Basic+YouCtrl
-Oracle:Selesnya Sanctuary enters the battlefield tapped.\nWhen Selesnya Sanctuary enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {G}{W}.
+Oracle:Selesnya Sanctuary enters tapped.\nWhen Selesnya Sanctuary enters, return a land you control to its owner's hand.\n{T}: Add {G}{W}.
diff --git a/forge-gui/res/cardsfolder/s/self_assembler.txt b/forge-gui/res/cardsfolder/s/self_assembler.txt
index a5a25a6752f..ba1ce16620b 100644
--- a/forge-gui/res/cardsfolder/s/self_assembler.txt
+++ b/forge-gui/res/cardsfolder/s/self_assembler.txt
@@ -2,7 +2,7 @@ Name:Self-Assembler
 ManaCost:5
 Types:Artifact Creature Assembly-Worker
 PT:4/4
-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 an Assembly-Worker creature card, reveal it, put it into your hand, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library for an Assembly-Worker creature card, reveal it, put it into your hand, then shuffle.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Creature.Assembly-Worker | ChangeNum$ 1 | ShuffleNonMandatory$ True
 DeckHints:Type$Assembly-Worker
-Oracle:When Self-Assembler enters the battlefield, you may search your library for an Assembly-Worker creature card, reveal it, put it into your hand, then shuffle.
+Oracle:When Self-Assembler enters, you may search your library for an Assembly-Worker creature card, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/s/selfless_squire.txt b/forge-gui/res/cardsfolder/s/selfless_squire.txt
index 13a8697324f..1ee2306ea02 100644
--- a/forge-gui/res/cardsfolder/s/selfless_squire.txt
+++ b/forge-gui/res/cardsfolder/s/selfless_squire.txt
@@ -3,10 +3,10 @@ ManaCost:3 W
 Types:Creature Human Soldier
 PT:1/1
 K:Flash
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBEffect | TriggerDescription$ When CARDNAME enters the battlefield, prevent all damage that would be dealt to you this turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBEffect | TriggerDescription$ When CARDNAME enters, prevent all damage that would be dealt to you this turn.
 SVar:DBEffect:DB$ Effect | ReplacementEffects$ RPrevent
 SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidTarget$ You | Description$ Prevent all damage that would be dealt to you this turn.
 T:Mode$ DamagePreventedOnce | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigPut | TriggerDescription$ Whenever damage that would be dealt to you is prevented, put that many +1/+1 counters on CARDNAME.
 SVar:TrigPut:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X
 SVar:X:TriggerCount$DamageAmount
-Oracle:Flash\nWhen Selfless Squire enters the battlefield, prevent all damage that would be dealt to you this turn.\nWhenever damage that would be dealt to you is prevented, put that many +1/+1 counters on Selfless Squire.
+Oracle:Flash\nWhen Selfless Squire enters, prevent all damage that would be dealt to you this turn.\nWhenever damage that would be dealt to you is prevented, put that many +1/+1 counters on Selfless Squire.
diff --git a/forge-gui/res/cardsfolder/s/selkie_hedge_mage.txt b/forge-gui/res/cardsfolder/s/selkie_hedge_mage.txt
index 9fee39cfa14..d1f264c2551 100644
--- a/forge-gui/res/cardsfolder/s/selkie_hedge_mage.txt
+++ b/forge-gui/res/cardsfolder/s/selkie_hedge_mage.txt
@@ -2,8 +2,8 @@ Name:Selkie Hedge-Mage
 ManaCost:2 GU
 Types:Creature Merfolk Wizard
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Forest.YouCtrl | PresentCompare$ GE2 | Execute$ TrigGainLife | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Forests, you may gain 3 life.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Island.YouCtrl | PresentCompare$ GE2 | Execute$ TrigBounce | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Islands, you may return target tapped creature to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Forest.YouCtrl | PresentCompare$ GE2 | Execute$ TrigGainLife | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, if you control two or more Forests, you may gain 3 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Island.YouCtrl | PresentCompare$ GE2 | Execute$ TrigBounce | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, if you control two or more Islands, you may return target tapped creature to its owner's hand.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3
 SVar:TrigBounce:DB$ ChangeZone | ValidTgts$ Creature.tapped | TgtPrompt$ Select target tapped creature | Origin$ Battlefield | Destination$ Hand
-Oracle:When Selkie Hedge-Mage enters the battlefield, if you control two or more Forests, you may gain 3 life.\nWhen Selkie Hedge-Mage enters the battlefield, if you control two or more Islands, you may return target tapped creature to its owner's hand.
+Oracle:When Selkie Hedge-Mage enters, if you control two or more Forests, you may gain 3 life.\nWhen Selkie Hedge-Mage enters, if you control two or more Islands, you may return target tapped creature to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/s/seller_of_songbirds.txt b/forge-gui/res/cardsfolder/s/seller_of_songbirds.txt
index b9c8473926c..bde5b0c2f66 100644
--- a/forge-gui/res/cardsfolder/s/seller_of_songbirds.txt
+++ b/forge-gui/res/cardsfolder/s/seller_of_songbirds.txt
@@ -2,7 +2,7 @@ Name:Seller of Songbirds
 ManaCost:2 W
 Types:Creature Human
 PT:1/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 white Bird creature token with flying.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 white Bird creature token with flying.
 SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenAmount$ 1 | TokenScript$ w_1_1_bird_flying
 DeckHas:Ability$Token
-Oracle:When Seller of Songbirds enters the battlefield, create a 1/1 white Bird creature token with flying.
+Oracle:When Seller of Songbirds enters, create a 1/1 white Bird creature token with flying.
diff --git a/forge-gui/res/cardsfolder/s/selvala_heart_of_the_wilds.txt b/forge-gui/res/cardsfolder/s/selvala_heart_of_the_wilds.txt
index a7956009718..8855e327ebc 100644
--- a/forge-gui/res/cardsfolder/s/selvala_heart_of_the_wilds.txt
+++ b/forge-gui/res/cardsfolder/s/selvala_heart_of_the_wilds.txt
@@ -2,10 +2,10 @@ Name:Selvala, Heart of the Wilds
 ManaCost:1 G G
 Types:Legendary Creature Elf Scout
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever another creature enters the battlefield, its controller may draw a card if its power is greater than each other creature's power.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever another creature enters, its controller may draw a card if its power is greater than each other creature's power.
 SVar:TrigDraw:DB$ Draw | OptionalDecider$ TriggeredCardController | Defined$ TriggeredCardController | NumCards$ 1 | ConditionCheckSVar$ Z | ConditionSVarCompare$ EQY
 SVar:Z:TriggeredCard$Valid Card.greatestPower
 SVar:Y:Count$Valid Card.greatestPower
 A:AB$ Mana | Cost$ G T | Produced$ Combo Any | Amount$ X | SpellDescription$ Add X mana in any combination of colors, where X is the greatest power among creatures you control.
 SVar:X:Count$Valid Creature.YouCtrl$GreatestPower
-Oracle:Whenever another creature enters the battlefield, its controller may draw a card if its power is greater than each other creature's power.\n{G}, {T}: Add X mana in any combination of colors, where X is the greatest power among creatures you control.
+Oracle:Whenever another creature enters, its controller may draw a card if its power is greater than each other creature's power.\n{G}, {T}: Add X mana in any combination of colors, where X is the greatest power among creatures you control.
diff --git a/forge-gui/res/cardsfolder/s/selvalas_enforcer.txt b/forge-gui/res/cardsfolder/s/selvalas_enforcer.txt
index e9c579f1d08..f69a8f30f77 100644
--- a/forge-gui/res/cardsfolder/s/selvalas_enforcer.txt
+++ b/forge-gui/res/cardsfolder/s/selvalas_enforcer.txt
@@ -2,10 +2,10 @@ Name:Selvala's Enforcer
 ManaCost:3 G
 Types:Creature Elf Warrior
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReveal | TriggerDescription$ Parley — When CARDNAME enters the battlefield, each player reveals the top card of their library. For each nonland card revealed this way, put a +1/+1 counter on CARDNAME. Then each player draws a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReveal | TriggerDescription$ Parley — When CARDNAME enters, each player reveals the top card of their library. For each nonland card revealed this way, put a +1/+1 counter on CARDNAME. Then each player draws a card.
 SVar:TrigReveal:DB$ PeekAndReveal | Defined$ Player | RememberRevealed$ True | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | CounterNum$ X | CounterType$ P1P1 | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ Player | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Valid Card.nonLand
-Oracle:Parley — When Selvala's Enforcer enters the battlefield, each player reveals the top card of their library. For each nonland card revealed this way, put a +1/+1 counter on Selvala's Enforcer. Then each player draws a card.
+Oracle:Parley — When Selvala's Enforcer enters, each player reveals the top card of their library. For each nonland card revealed this way, put a +1/+1 counter on Selvala's Enforcer. Then each player draws a card.
diff --git a/forge-gui/res/cardsfolder/s/semblance_anvil.txt b/forge-gui/res/cardsfolder/s/semblance_anvil.txt
index ef5ce5b2869..d1b8bb467ea 100644
--- a/forge-gui/res/cardsfolder/s/semblance_anvil.txt
+++ b/forge-gui/res/cardsfolder/s/semblance_anvil.txt
@@ -1,7 +1,7 @@
 Name:Semblance Anvil
 ManaCost:3
 Types:Artifact
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ Imprint — When CARDNAME enters the battlefield, you may exile a nonland card from your hand.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ Imprint — When CARDNAME enters, you may exile a nonland card from your hand.
 SVar:TrigExile:DB$ ChangeZone | Imprint$ True | Origin$ Hand | Destination$ Exile | ChangeType$ Card.nonLand | ChangeNum$ 1
 S:Mode$ ReduceCost | ValidCard$ Card.sharesCardTypeWith Imprinted | Type$ Spell | Activator$ You | Amount$ 2 | Description$ Spells you cast that share a card type with the exiled card cost {2} less to cast.
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Card.Self | Destination$ Any | Execute$ DBCleanup | Static$ True
@@ -11,4 +11,4 @@ SVar:DBForget:DB$ Pump | ForgetImprinted$ TriggeredCard
 SVar:NeedsToPlayVar:Y GE1
 SVar:Y:Count$ValidHand Permanent.nonLand+YouOwn
 AI:RemoveDeck:Random
-Oracle:Imprint — When Semblance Anvil enters the battlefield, you may exile a nonland card from your hand.\nSpells you cast that share a card type with the exiled card cost {2} less to cast.
+Oracle:Imprint — When Semblance Anvil enters, you may exile a nonland card from your hand.\nSpells you cast that share a card type with the exiled card cost {2} less to cast.
diff --git a/forge-gui/res/cardsfolder/s/semesters_end.txt b/forge-gui/res/cardsfolder/s/semesters_end.txt
index 576fcb26bde..cdf5f5f4420 100644
--- a/forge-gui/res/cardsfolder/s/semesters_end.txt
+++ b/forge-gui/res/cardsfolder/s/semesters_end.txt
@@ -1,8 +1,8 @@
 Name:Semester's End
 ManaCost:3 W
 Types:Instant
-A:SP$ ChangeZone | ValidTgts$ Creature.YouCtrl,Planeswalker.YouCtrl | TargetMin$ 0 | TargetMax$ X | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature you control | SubAbility$ DelTrig | RememberChanged$ True | SpellDescription$ Exile any number of target creatures and/or planeswalkers you control. At the beginning of the next end step, return each of them to the battlefield under its owner's control. Each of them enters the battlefield with an additional +1/+1 counter on it if it's a creature and an additional loyalty counter on it if it's a planeswalker.
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ RememberedLKI | TriggerDescription$ Return each of them to the battlefield under its owner's control. Each of them enters the battlefield with an additional +1/+1 counter on it if it's a creature and an additional loyalty counter on it if it's a planeswalker. | SubAbility$ DBCleanup
+A:SP$ ChangeZone | ValidTgts$ Creature.YouCtrl,Planeswalker.YouCtrl | TargetMin$ 0 | TargetMax$ X | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature you control | SubAbility$ DelTrig | RememberChanged$ True | SpellDescription$ Exile any number of target creatures and/or planeswalkers you control. At the beginning of the next end step, return each of them to the battlefield under its owner's control. Each of them enters with an additional +1/+1 counter on it if it's a creature and an additional loyalty counter on it if it's a planeswalker.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ RememberedLKI | TriggerDescription$ Return each of them to the battlefield under its owner's control. Each of them enters with an additional +1/+1 counter on it if it's a creature and an additional loyalty counter on it if it's a planeswalker. | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRememberedLKI | AnimateSubAbility$ DBConditionEffect
 SVar:DBConditionEffect:DB$ Effect | RememberObjects$ Remembered | ReplacementEffects$ ETBCreatPlans
@@ -12,4 +12,4 @@ SVar:DBPutLOYALTY:DB$ PutCounter | Defined$ ReplacedNewCard.Planeswalker | Count
 SVar:DBExile:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:X:Count$Valid Permanent.YouCtrl
 DeckHas:Ability$Counters
-Oracle:Exile any number of target creatures and/or planeswalkers you control. At the beginning of the next end step, return each of them to the battlefield under its owner's control. Each of them enters the battlefield with an additional +1/+1 counter on it if it's a creature and an additional loyalty counter on it if it's a planeswalker.
+Oracle:Exile any number of target creatures and/or planeswalkers you control. At the beginning of the next end step, return each of them to the battlefield under its owner's control. Each of them enters with an additional +1/+1 counter on it if it's a creature and an additional loyalty counter on it if it's a planeswalker.
diff --git a/forge-gui/res/cardsfolder/s/senate_griffin.txt b/forge-gui/res/cardsfolder/s/senate_griffin.txt
index 535d0ccfdc4..f67ace2e7cf 100644
--- a/forge-gui/res/cardsfolder/s/senate_griffin.txt
+++ b/forge-gui/res/cardsfolder/s/senate_griffin.txt
@@ -3,6 +3,6 @@ ManaCost:2 WU WU
 Types:Creature Griffin
 PT:3/2
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBScry | TriggerDescription$ When CARDNAME enters, scry 1.
 SVar:DBScry:DB$ Scry | ScryNum$ 1
-Oracle:Flying\nWhen Senate Griffin enters the battlefield, scry 1.
+Oracle:Flying\nWhen Senate Griffin enters, scry 1.