diff --git a/forge-gui/res/cardsfolder/o/organ_hoarder.txt b/forge-gui/res/cardsfolder/o/organ_hoarder.txt
index 46df54e0105..a81d0bf46e7 100644
--- a/forge-gui/res/cardsfolder/o/organ_hoarder.txt
+++ b/forge-gui/res/cardsfolder/o/organ_hoarder.txt
@@ -2,6 +2,6 @@ Name:Organ Hoarder
 ManaCost:3 U
 Types:Creature Zombie
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top three cards of your library, then put one of them into your hand and the rest into your graveyard.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters, look at the top three cards of your library, then put one of them into your hand and the rest into your graveyard.
 SVar:TrigDig:DB$ Dig | DigNum$ 3 | ChangeNum$ 1 | DestinationZone2$ Graveyard
-Oracle:When Organ Hoarder enters the battlefield, look at the top three cards of your library, then put one of them into your hand and the rest into your graveyard.
+Oracle:When Organ Hoarder enters, look at the top three cards of your library, then put one of them into your hand and the rest into your graveyard.
diff --git a/forge-gui/res/cardsfolder/o/ornery_kudu.txt b/forge-gui/res/cardsfolder/o/ornery_kudu.txt
index b79e9a9a662..5313f9e51a8 100644
--- a/forge-gui/res/cardsfolder/o/ornery_kudu.txt
+++ b/forge-gui/res/cardsfolder/o/ornery_kudu.txt
@@ -2,6 +2,6 @@ Name:Ornery Kudu
 ManaCost:2 G
 Types:Creature Antelope
 PT:3/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put a -1/-1 counter on target creature you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters, put a -1/-1 counter on target creature you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ M1M1 | IsCurse$ True | CounterNum$ 1
-Oracle:When Ornery Kudu enters the battlefield, put a -1/-1 counter on target creature you control.
+Oracle:When Ornery Kudu enters, put a -1/-1 counter on target creature you control.
diff --git a/forge-gui/res/cardsfolder/o/ornitharch.txt b/forge-gui/res/cardsfolder/o/ornitharch.txt
index c07bf460873..63563c5db15 100644
--- a/forge-gui/res/cardsfolder/o/ornitharch.txt
+++ b/forge-gui/res/cardsfolder/o/ornitharch.txt
@@ -4,6 +4,6 @@ Types:Creature Archon
 PT:3/3
 K:Flying
 K:Tribute:2
-SVar:TrigNotTribute:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_bird_flying | TokenOwner$ You | SpellDescription$ When CARDNAME enters the battlefield, if tribute wasn't paid, create two 1/1 white Bird creature tokens with flying.
+SVar:TrigNotTribute:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_bird_flying | TokenOwner$ You | SpellDescription$ When CARDNAME enters, if tribute wasn't paid, create two 1/1 white Bird creature tokens with flying.
 DeckHas:Ability$Counters|Token
-Oracle:Flying\nTribute 2 (As this creature enters the battlefield, an opponent of your choice may put two +1/+1 counters on it.)\nWhen Ornitharch enters the battlefield, if tribute wasn't paid, create two 1/1 white Bird creature tokens with flying.
+Oracle:Flying\nTribute 2 (As this creature enters, an opponent of your choice may put two +1/+1 counters on it.)\nWhen Ornitharch enters, if tribute wasn't paid, create two 1/1 white Bird creature tokens with flying.
diff --git a/forge-gui/res/cardsfolder/o/orochi_hatchery.txt b/forge-gui/res/cardsfolder/o/orochi_hatchery.txt
index eb9f2eab431..6469909392b 100644
--- a/forge-gui/res/cardsfolder/o/orochi_hatchery.txt
+++ b/forge-gui/res/cardsfolder/o/orochi_hatchery.txt
@@ -7,4 +7,4 @@ SVar:X:Count$xPaid
 SVar:Y:Count$CardCounters.CHARGE
 SVar:NeedsToPlayVar:Z GE4
 SVar:Z:Count$Valid Card.canProduceMana
-Oracle:Orochi Hatchery enters the battlefield with X charge counters on it.\n{5}, {T}: Create a 1/1 green Snake creature token for each charge counter on Orochi Hatchery.
+Oracle:Orochi Hatchery enters with X charge counters on it.\n{5}, {T}: Create a 1/1 green Snake creature token for each charge counter on Orochi Hatchery.
diff --git a/forge-gui/res/cardsfolder/o/orzhov_basilica.txt b/forge-gui/res/cardsfolder/o/orzhov_basilica.txt
index 188e04e6427..a36bfd85e54 100644
--- a/forge-gui/res/cardsfolder/o/orzhov_basilica.txt
+++ b/forge-gui/res/cardsfolder/o/orzhov_basilica.txt
@@ -1,9 +1,10 @@
 Name:Orzhov Basilica
 ManaCost:no cost
 Types:Land
-K:CARDNAME enters the battlefield tapped.
-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.
+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$ 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.
 A:AB$ Mana | Cost$ T | Produced$ W B | SpellDescription$ Add {W}{B}.
 SVar:NeedsToPlay:Land.Basic+YouCtrl
-Oracle:Orzhov Basilica enters the battlefield tapped.\nWhen Orzhov Basilica enters the battlefield, return a land you control to its owner's hand.\n{T}: Add {W}{B}.
+Oracle:Orzhov Basilica enters tapped.\nWhen Orzhov Basilica enters, return a land you control to its owner's hand.\n{T}: Add {W}{B}.
diff --git a/forge-gui/res/cardsfolder/o/orzhov_euthanist.txt b/forge-gui/res/cardsfolder/o/orzhov_euthanist.txt
index 0cc088f9ba9..3556391d356 100644
--- a/forge-gui/res/cardsfolder/o/orzhov_euthanist.txt
+++ b/forge-gui/res/cardsfolder/o/orzhov_euthanist.txt
@@ -4,4 +4,4 @@ Types:Creature Human Assassin
 PT:2/2
 K:Haunt:TrigDestroy
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Creature.wasDealtDamageThisTurn | TgtPrompt$ Select target creature that was dealt damage this turn. | SpellDescription$ Destroy target creature that was dealt damage this turn.
-Oracle:Haunt (When this creature dies, exile it haunting target creature.)\nWhen Orzhov Euthanist enters the battlefield or the creature it haunts dies, destroy target creature that was dealt damage this turn.
+Oracle:Haunt (When this creature dies, exile it haunting target creature.)\nWhen Orzhov Euthanist enters or the creature it haunts dies, destroy target creature that was dealt damage this turn.
diff --git a/forge-gui/res/cardsfolder/o/orzhov_guildgate.txt b/forge-gui/res/cardsfolder/o/orzhov_guildgate.txt
index 956d6e2a8d0..70bbaadb365 100644
--- a/forge-gui/res/cardsfolder/o/orzhov_guildgate.txt
+++ b/forge-gui/res/cardsfolder/o/orzhov_guildgate.txt
@@ -1,6 +1,7 @@
 Name:Orzhov 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 W B | SpellDescription$ Add {W} or {B}.
-Oracle:Orzhov Guildgate enters the battlefield tapped.\n{T}: Add {W} or {B}.
+Oracle:Orzhov Guildgate enters tapped.\n{T}: Add {W} or {B}.
diff --git a/forge-gui/res/cardsfolder/o/orzhov_pontiff.txt b/forge-gui/res/cardsfolder/o/orzhov_pontiff.txt
index 2e974692f29..f3854fc6c52 100644
--- a/forge-gui/res/cardsfolder/o/orzhov_pontiff.txt
+++ b/forge-gui/res/cardsfolder/o/orzhov_pontiff.txt
@@ -7,4 +7,4 @@ SVar:TrigChoose:DB$ Charm | Choices$ DBPump,DBCurse | CharmNum$ 1
 SVar:DBPump:DB$ PumpAll | ValidCards$ Card.Creature+YouCtrl | NumAtt$ 1 | NumDef$ 1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
 SVar:DBCurse:DB$ PumpAll | ValidCards$ Card.Creature+YouDontCtrl | NumAtt$ -1 | NumDef$ -1 | SpellDescription$ Creatures you don't control get -1/-1 until end of turn.
 AI:RemoveDeck:All
-Oracle:Haunt (When this creature dies, exile it haunting target creature.)\nWhen Orzhov Pontiff enters the battlefield or the creature it haunts dies, choose one —\n• Creatures you control get +1/+1 until end of turn.\n• Creatures you don't control get -1/-1 until end of turn.
+Oracle:Haunt (When this creature dies, exile it haunting target creature.)\nWhen Orzhov Pontiff enters or the creature it haunts dies, choose one —\n• Creatures you control get +1/+1 until end of turn.\n• Creatures you don't control get -1/-1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/o/ossification.txt b/forge-gui/res/cardsfolder/o/ossification.txt
index 7419b976134..514c27c3c68 100644
--- a/forge-gui/res/cardsfolder/o/ossification.txt
+++ b/forge-gui/res/cardsfolder/o/ossification.txt
@@ -3,8 +3,8 @@ ManaCost:1 W
 Types:Enchantment Aura
 K:Enchant basic land you control
 A:SP$ Attach | ValidTgts$ Land.YouCtrl+Basic | TgtPrompt$ Select target basic land you control | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile target creature or planeswalker 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 creature or planeswalker an opponent controls until CARDNAME leaves the battlefield.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.OppCtrl,Planeswalker.OppCtrl | TgtPrompt$ Select target creature or planeswalker an opponent controls | Duration$ UntilHostLeavesPlay
 SVar:PlayMain1:TRUE
 SVar:NeedsToPlay:Creature.OppCtrl
-Oracle:Enchant basic land you control\nWhen Ossification enters the battlefield, exile target creature or planeswalker an opponent controls until Ossification leaves the battlefield.
+Oracle:Enchant basic land you control\nWhen Ossification enters, exile target creature or planeswalker an opponent controls until Ossification leaves the battlefield.
diff --git a/forge-gui/res/cardsfolder/o/ossuary_rats.txt b/forge-gui/res/cardsfolder/o/ossuary_rats.txt
index 524ac0bf767..88afa201d14 100644
--- a/forge-gui/res/cardsfolder/o/ossuary_rats.txt
+++ b/forge-gui/res/cardsfolder/o/ossuary_rats.txt
@@ -2,8 +2,8 @@ Name:Ossuary Rats
 ManaCost:5 B
 Types:Creature Rat
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals X damage to target creature or planeswalker an opponent controls, where X is the number of creature cards in your graveyard.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters, it deals X damage to target creature or planeswalker an opponent controls, where X is the number of creature cards in your graveyard.
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl,Planeswalker.OppCtrl | TgtPrompt$ Select target creature or planeswalker an opponent controls | NumDmg$ X
 SVar:X:Count$TypeInYourYard.Creature
 DeckHints:Ability$Graveyard|Mill
-Oracle:When Ossuary Rats enters the battlefield, it deals X damage to target creature or planeswalker an opponent controls, where X is the number of creature cards in your graveyard.
+Oracle:When Ossuary Rats enters, it deals X damage to target creature or planeswalker an opponent controls, where X is the number of creature cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/o/oteclan_landmark_oteclan_levitator.txt b/forge-gui/res/cardsfolder/o/oteclan_landmark_oteclan_levitator.txt
index 1677d047267..e8d31d6a23f 100644
--- a/forge-gui/res/cardsfolder/o/oteclan_landmark_oteclan_levitator.txt
+++ b/forge-gui/res/cardsfolder/o/oteclan_landmark_oteclan_levitator.txt
@@ -1,13 +1,13 @@
 Name:Oteclan Landmark
 ManaCost:W
 Types:Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 2.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters, scry 2.
 SVar:TrigScry:DB$ Scry | ScryNum$ 2
 K:Craft:2 W ExileCtrlOrGrave<1/Artifact.Other>
 DeckHints:Ability$Discard|Mill|Sacrifice
 DeckHas:Ability$Graveyard
 AlternateMode:DoubleFaced
-Oracle:When Oteclan Landmark enters the battlefield, scry 2.\nCraft with artifact {2}{W} ({2}{W}, Exile this artifact, Exile another artifact you control or an artifact card from your graveyard: Return this card transformed under its owner's control. Craft only as a sorcery.)
+Oracle:When Oteclan Landmark enters, scry 2.\nCraft with artifact {2}{W} ({2}{W}, Exile this artifact, Exile another artifact you control or an artifact card from your graveyard: Return this card transformed under its owner's control. Craft only as a sorcery.)
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/o/oubliette.txt b/forge-gui/res/cardsfolder/o/oubliette.txt
index d6b24e78c12..35d308f91c0 100644
--- a/forge-gui/res/cardsfolder/o/oubliette.txt
+++ b/forge-gui/res/cardsfolder/o/oubliette.txt
@@ -1,11 +1,11 @@
 Name:Oubliette
 ManaCost:1 B B
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPhaseOut | TriggerDescription$ When CARDNAME enters the battlefield, target creature phases out until CARDNAME leaves the battlefield. Tap that creature as it phases in this way. (Auras and Equipment phase out with it. While permanents are phased out, they're treated as though they don't exist.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPhaseOut | TriggerDescription$ When CARDNAME enters, target creature phases out until CARDNAME leaves the battlefield. Tap that creature as it phases in this way. (Auras and Equipment phase out with it. While permanents are phased out, they're treated as though they don't exist.)
 SVar:TrigPhaseOut:DB$ Phases | ValidTgts$ Creature | TgtPrompt$ Select target creature | WontPhaseInNormal$ True | ConditionPresent$ Card.Self | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | Triggers$ TrigComeBack | RememberObjects$ Targeted | ImprintCards$ Self | ConditionPresent$ Card.Self | Duration$ Permanent | ForgetOnPhasedIn$ True
 SVar:TrigComeBack:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsImprinted | Execute$ DBPhaseIn | TriggerZones$ Command | TriggerController$ TriggeredCardController | Static$ True | TriggerDescription$ Target creature phases out until CARDNAME leaves the battlefield. Tap that creature as it phases in this way.
 SVar:DBPhaseIn:DB$ Phases | Defined$ Remembered | Tapped$ True | PhaseInOrOut$ True | SubAbility$ DBExileSelf
 SVar:DBExileSelf:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self
 AI:RemoveDeck:All
-Oracle:When Oubliette enters the battlefield, target creature phases out until Oubliette leaves the battlefield. Tap that creature as it phases in this way. (Auras and Equipment phase out with it. While permanents are phased out, they're treated as though they don't exist.)
+Oracle:When Oubliette enters, target creature phases out until Oubliette leaves the battlefield. Tap that creature as it phases in this way. (Auras and Equipment phase out with it. While permanents are phased out, they're treated as though they don't exist.)
diff --git a/forge-gui/res/cardsfolder/o/out_of_time.txt b/forge-gui/res/cardsfolder/o/out_of_time.txt
index 70a52ec4fba..67683718e1c 100644
--- a/forge-gui/res/cardsfolder/o/out_of_time.txt
+++ b/forge-gui/res/cardsfolder/o/out_of_time.txt
@@ -1,7 +1,7 @@
 Name:Out of Time
 ManaCost:1 W W
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigUntap | TriggerDescription$ When CARDNAME enters the battlefield, untap all creatures, then phase them out until CARDNAME leaves the battlefield. Put a time counter on CARDNAME for each creature phased out this way.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigUntap | TriggerDescription$ When CARDNAME enters, untap all creatures, then phase them out until CARDNAME leaves the battlefield. Put a time counter on CARDNAME for each creature phased out this way.
 SVar:TrigUntap:DB$ UntapAll | ValidCards$ Creature | SubAbility$ DBPhase
 SVar:DBPhase:DB$ Phases | AllValid$ Creature | RememberAffected$ True | WontPhaseInNormal$ True | ConditionPresent$ Card.Self | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | Triggers$ TrigComeBack | RememberObjects$ Remembered | ImprintCards$ Self | ConditionPresent$ Card.Self | Duration$ Permanent | ForgetOnPhasedIn$ True | SubAbility$ DBPutCounter
@@ -12,4 +12,4 @@ SVar:DBPutCounter:DB$ PutCounter | CounterType$ TIME | CounterNum$ X | SubAbilit
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$RememberedSize
 K:Vanishing
-Oracle:When Out of Time enters the battlefield, untap all creatures, then phase them out until Out of Time leaves the battlefield. Put a time counter on Out of Time for each creature phased out this way.\nVanishing (At the beginning of your upkeep, remove a time counter from this enchantment. When the last is removed, sacrifice it.)
+Oracle:When Out of Time enters, untap all creatures, then phase them out until Out of Time leaves the battlefield. Put a time counter on Out of Time for each creature phased out this way.\nVanishing (At the beginning of your upkeep, remove a time counter from this enchantment. When the last is removed, sacrifice it.)
diff --git a/forge-gui/res/cardsfolder/o/outcaster_greenblade.txt b/forge-gui/res/cardsfolder/o/outcaster_greenblade.txt
index de40e12081e..07b7815f7cb 100644
--- a/forge-gui/res/cardsfolder/o/outcaster_greenblade.txt
+++ b/forge-gui/res/cardsfolder/o/outcaster_greenblade.txt
@@ -2,9 +2,9 @@ Name:Outcaster Greenblade
 ManaCost:2 G
 Types:Creature Human Mercenary
 PT:1/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When CARDNAME enters the battlefield, search your library for a basic land card or a Desert card, reveal it, put it into your hand, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When CARDNAME enters, search your library for a basic land card or a Desert card, reveal it, put it into your hand, then shuffle.
 SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic,Desert | ChangeNum$ 1
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Description$ CARDNAME gets +1/+1 for each Desert you control.
 SVar:X:Count$Valid Desert.YouCtrl
 DeckHints:Type$Desert
-Oracle:When Outcaster Greenblade enters the battlefield, search your library for a basic land card or a Desert card, reveal it, put it into your hand, then shuffle.\nOutcaster Greenblade gets +1/+1 for each Desert you control.
+Oracle:When Outcaster Greenblade enters, search your library for a basic land card or a Desert card, reveal it, put it into your hand, then shuffle.\nOutcaster Greenblade gets +1/+1 for each Desert you control.
diff --git a/forge-gui/res/cardsfolder/o/outcaster_trailblazer.txt b/forge-gui/res/cardsfolder/o/outcaster_trailblazer.txt
index 65ef709b321..a7dbcc43fab 100644
--- a/forge-gui/res/cardsfolder/o/outcaster_trailblazer.txt
+++ b/forge-gui/res/cardsfolder/o/outcaster_trailblazer.txt
@@ -2,9 +2,9 @@ Name:Outcaster Trailblazer
 ManaCost:2 G
 Types:Creature Human Druid
 PT:4/2
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add one mana of any color.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters, add one mana of any color.
 SVar:TrigMana:DB$ Mana | Produced$ Any | Amount$ 1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE4+Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever another creature with power 4 or greater enters the battlefield under your control, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerGE4+Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever another creature you control with power 4 or greater enters, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 K:Plot:2 G
-Oracle:When Outcaster Trailblazer enters the battlefield, add one mana of any color.\nWhenever another creature with power 4 or greater enters the battlefield under your control, draw a card.\nPlot {2}{G} (You may pay {2}{G} and exile this card from your hand. Cast it as a sorcery on a later turn without paying its mana cost. Plot only as a sorcery.)
+Oracle:When Outcaster Trailblazer enters, add one mana of any color.\nWhenever another creature you control with power 4 or greater enters, draw a card.\nPlot {2}{G} (You may pay {2}{G} and exile this card from your hand. Cast it as a sorcery on a later turn without paying its mana cost. Plot only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/o/outfitted_jouster.txt b/forge-gui/res/cardsfolder/o/outfitted_jouster.txt
index 5f822229596..a57b0891869 100644
--- a/forge-gui/res/cardsfolder/o/outfitted_jouster.txt
+++ b/forge-gui/res/cardsfolder/o/outfitted_jouster.txt
@@ -2,7 +2,7 @@ Name:Outfitted Jouster
 ManaCost:2 B R
 Types:Creature Knight
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConjure | TriggerDescription$ When CARDNAME enters the battlefield, conjure a card named Steelclaw Lance and a card named Brawler's Plate onto the battlefield and attach them to CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConjure | TriggerDescription$ When CARDNAME enters, conjure a card named Steelclaw Lance and a card named Brawler's Plate onto the battlefield and attach them to CARDNAME.
 SVar:TrigConjure:DB$ MakeCard | Conjure$ True | Names$ Steelclaw Lance,Brawler's Plate | Zone$ Battlefield | RememberMade$ True | SubAbility$ DBAttach
 SVar:DBAttach:DB$ Attach | Object$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
@@ -12,4 +12,4 @@ SVar:TrigSacrifice:DB$ Sacrifice | SacValid$ Equipment.AttachedTo Card.Self | Sa
 SVar:EquipMe:Once
 DeckHas:Type$Equipment & Ability$Sacrifice
 DeckHints:Type$Equipment
-Oracle:When Outfitted Jouster enters the battlefield, conjure a card named Steelclaw Lance and a card named Brawler's Plate onto the battlefield and attach them to Outfitted Jouster.\nIf damage would be dealt to Outfitted Jouster while it's equipped, prevent that damage. When damage is prevented this way, sacrifice an Equipment attached to Outfitted Jouster.
+Oracle:When Outfitted Jouster enters, conjure a card named Steelclaw Lance and a card named Brawler's Plate onto the battlefield and attach them to Outfitted Jouster.\nIf damage would be dealt to Outfitted Jouster while it's equipped, prevent that damage. When damage is prevented this way, sacrifice an Equipment attached to Outfitted Jouster.
diff --git a/forge-gui/res/cardsfolder/o/outlaw_stitcher.txt b/forge-gui/res/cardsfolder/o/outlaw_stitcher.txt
index d5ef32cb2c9..b3b41ce23cb 100644
--- a/forge-gui/res/cardsfolder/o/outlaw_stitcher.txt
+++ b/forge-gui/res/cardsfolder/o/outlaw_stitcher.txt
@@ -2,7 +2,7 @@ Name:Outlaw Stitcher
 ManaCost:3 U
 Types:Creature Human Warlock
 PT:1/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 2/2 blue and black Zombie Rogue creature token, then put two +1/+1 counters on that token for each spell you've cast this turn other than the first.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 2/2 blue and black Zombie Rogue creature token, then put two +1/+1 counters on that token for each spell you've cast this turn other than the first.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ ub_2_2_zombie_rogue | TokenOwner$ You | RememberTokens$ True | SubAbility$ DBPutCounters
 SVar:DBPutCounters:DB$ PutCounter | Defined$ Remembered | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
@@ -10,4 +10,4 @@ SVar:X:SVar$Y/Twice
 SVar:Y:Count$ThisTurnCast_Card.YouCtrl/Minus.1
 DeckHas:Ability$Token|Counters & Type$Zombie|Rogue & Color$Black
 K:Plot:4 U
-Oracle:When Outlaw Stitcher enters the battlefield, create a 2/2 blue and black Zombie Rogue creature token, then put two +1/+1 counters on that token for each spell you've cast this turn other than the first.\nPlot {4}{U} (You may pay {4}{U} and exile this card from your hand. Cast it as a sorcery on a later turn without paying its mana cost. Plot only as a sorcery.)
+Oracle:When Outlaw Stitcher enters, create a 2/2 blue and black Zombie Rogue creature token, then put two +1/+1 counters on that token for each spell you've cast this turn other than the first.\nPlot {4}{U} (You may pay {4}{U} and exile this card from your hand. Cast it as a sorcery on a later turn without paying its mana cost. Plot only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/o/outlaws_merriment.txt b/forge-gui/res/cardsfolder/o/outlaws_merriment.txt
index 07e2beeb4a0..3975ff0080f 100644
--- a/forge-gui/res/cardsfolder/o/outlaws_merriment.txt
+++ b/forge-gui/res/cardsfolder/o/outlaws_merriment.txt
@@ -5,6 +5,6 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigCharm | TriggerZ
 SVar:TrigCharm:DB$ Charm | Random$ True | Choices$ DBToken1,DBToken2,DBToken3 | AdditionalDescription$ Create a red and white creature token with those characteristics.
 SVar:DBToken1:DB$ Token | TokenAmount$ 1 | TokenScript$ rw_3_1_human_warrior_trample_haste | TokenOwner$ You | SpellDescription$ 3/1 Human Warrior with trample and haste.
 SVar:DBToken2:DB$ Token | TokenAmount$ 1 | TokenScript$ rw_2_1_human_cleric_lifelink_haste | TokenOwner$ You | SpellDescription$ 2/1 Human Cleric with lifelink and haste.
-SVar:DBToken3:DB$ Token | TokenAmount$ 1 | TokenScript$ rw_1_2_human_rogue_haste_damage | TokenOwner$ You | SpellDescription$ 1/2 Human Rogue with haste and "When this creature enters the battlefield, it deals 1 damage to any target."
+SVar:DBToken3:DB$ Token | TokenAmount$ 1 | TokenScript$ rw_1_2_human_rogue_haste_damage | TokenOwner$ You | SpellDescription$ 1/2 Human Rogue with haste and "When this creature enters, it deals 1 damage to any target."
 DeckHas:Ability$Token
-Oracle:At the beginning of your upkeep, choose one at random. Create a red and white creature token with those characteristics.\n• 3/1 Human Warrior with trample and haste.\n• 2/1 Human Cleric with lifelink and haste.\n• 1/2 Human Rogue with haste and "When this creature enters the battlefield, it deals 1 damage to any target."
+Oracle:At the beginning of your upkeep, choose one at random. Create a red and white creature token with those characteristics.\n• 3/1 Human Warrior with trample and haste.\n• 2/1 Human Cleric with lifelink and haste.\n• 1/2 Human Rogue with haste and "When this creature enters, it deals 1 damage to any target."
diff --git a/forge-gui/res/cardsfolder/o/outpost_siege.txt b/forge-gui/res/cardsfolder/o/outpost_siege.txt
index 961ffae92f3..e8d6dfc81e6 100644
--- a/forge-gui/res/cardsfolder/o/outpost_siege.txt
+++ b/forge-gui/res/cardsfolder/o/outpost_siege.txt
@@ -2,16 +2,14 @@ Name:Outpost Siege
 ManaCost:3 R
 Types:Enchantment
 K:ETBReplacement:Other:SiegeChoice
-SVar:SiegeChoice:DB$ GenericChoice | Choices$ Khans,Dragons | Defined$ You | SetChosenMode$ True | AILogic$ Khans | ShowChoice$ ExceptSelf | SpellDescription$ As CARDNAME enters the battlefield, choose Khans or Dragons.
-SVar:Khans:DB$ Pump | SpellDescription$ Khans
-SVar:Dragons:DB$ Pump | SpellDescription$ Dragons
-S:Mode$ Continuous | Affected$ Card.Self+ChosenModeKhans | AddTrigger$ KhansTrigger | Description$ • Khans — At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card.
-S:Mode$ Continuous | Affected$ Card.Self+ChosenModeDragons | AddTrigger$ DragonsTrigger | Description$ • Dragons — Whenever a creature you control leaves the battlefield, CARDNAME deals 1 damage to any target.
-SVar:KhansTrigger:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ PseudoDraw | Secondary$ True | TriggerDescription$ At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card.
+SVar:SiegeChoice:DB$ GenericChoice | Choices$ Khans,Dragons | Defined$ You | SetChosenMode$ True | AILogic$ Khans | ShowChoice$ ExceptSelf | SpellDescription$ As CARDNAME enters, choose Khans or Dragons.,,,• Khans — At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card.,,,• Dragons — Whenever a creature you control leaves the battlefield, CARDNAME deals 1 damage to any target.
+SVar:Khans:DB$ Animate | Defined$ Self | Triggers$ KhansTrigger | Duration$ Permanent | SpellDescription$ Khans
+SVar:KhansTrigger:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ PseudoDraw | TriggerDescription$ At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card.
 SVar:PseudoDraw:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Play | SubAbility$ DBCleanup | ExileOnMoved$ Exile
 SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play remembered card.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:DragonsTrigger:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ SmallBurnination | Secondary$ True | TriggerDescription$ Whenever a creature you control leaves the battlefield, CARDNAME deals 1 damage to any target.
+SVar:Dragons:DB$ Animate | Defined$ Self | Triggers$ DragonsTrigger | Duration$ Permanent | SpellDescription$ Dragons
+SVar:DragonsTrigger:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ SmallBurnination | TriggerDescription$ Whenever a creature you control leaves the battlefield, CARDNAME deals 1 damage to any target.
 SVar:SmallBurnination:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 1
-Oracle:As Outpost Siege enters the battlefield, choose Khans or Dragons.\n• Khans — At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card.\n• Dragons — Whenever a creature you control leaves the battlefield, Outpost Siege deals 1 damage to any target.
+Oracle:As Outpost Siege enters, choose Khans or Dragons.\n• Khans — At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card.\n• Dragons — Whenever a creature you control leaves the battlefield, Outpost Siege deals 1 damage to any target.
diff --git a/forge-gui/res/cardsfolder/o/outrage_shaman.txt b/forge-gui/res/cardsfolder/o/outrage_shaman.txt
index 8d4d7933af8..afcc4070010 100644
--- a/forge-gui/res/cardsfolder/o/outrage_shaman.txt
+++ b/forge-gui/res/cardsfolder/o/outrage_shaman.txt
@@ -2,8 +2,8 @@ Name:Outrage Shaman
 ManaCost:3 R R
 Types:Creature Goblin Shaman
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Chroma — When CARDNAME enters the battlefield, it deals damage to target creature equal to the number of red mana symbols in the mana costs of permanents you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Chroma — When CARDNAME enters, it deals damage to target creature equal to the number of red mana symbols in the mana costs of permanents you control.
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X
 SVar:X:Count$Chroma.Red
 SVar:PlayMain1:TRUE
-Oracle:Chroma — When Outrage Shaman enters the battlefield, it deals damage to target creature equal to the number of red mana symbols in the mana costs of permanents you control.
+Oracle:Chroma — When Outrage Shaman enters, it deals damage to target creature equal to the number of red mana symbols in the mana costs of permanents you control.
diff --git a/forge-gui/res/cardsfolder/o/ovalchase_daredevil.txt b/forge-gui/res/cardsfolder/o/ovalchase_daredevil.txt
index 6d1cd252a73..67e1e78891d 100644
--- a/forge-gui/res/cardsfolder/o/ovalchase_daredevil.txt
+++ b/forge-gui/res/cardsfolder/o/ovalchase_daredevil.txt
@@ -2,6 +2,6 @@ Name:Ovalchase Daredevil
 ManaCost:3 B
 Types:Creature Human Pilot
 PT:4/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.YouCtrl | OptionalDecider$ You | TriggerZones$ Graveyard | Execute$ TrigChange | TriggerDescription$ Whenever an artifact enters the battlefield under your control, you may return CARDNAME from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.YouCtrl | OptionalDecider$ You | TriggerZones$ Graveyard | Execute$ TrigChange | TriggerDescription$ Whenever an artifact you control enters, you may return CARDNAME from your graveyard to your hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand
-Oracle:Whenever an artifact enters the battlefield under your control, you may return Ovalchase Daredevil from your graveyard to your hand.
+Oracle:Whenever an artifact you control enters, you may return Ovalchase Daredevil from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/o/overcharged_amalgam.txt b/forge-gui/res/cardsfolder/o/overcharged_amalgam.txt
index 3dca35338f3..f250e141c47 100644
--- a/forge-gui/res/cardsfolder/o/overcharged_amalgam.txt
+++ b/forge-gui/res/cardsfolder/o/overcharged_amalgam.txt
@@ -9,4 +9,4 @@ T:Mode$ Exploited | ValidCard$ Creature | ValidSource$ Card.Self | TriggerZones$
 SVar:TrigCounter:DB$ Counter | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability | ValidTgts$ Card,Emblem | SpellDescription$ Counter target spell, activated ability, or triggered ability.
 AI:RemoveDeck:All
 DeckHas:Ability$Sacrifice
-Oracle:Flash\nFlying\nExploit (When this creature enters the battlefield, you may sacrifice a creature.)\nWhen Overcharged Amalgam exploits a creature, counter target spell, activated ability, or triggered ability.
+Oracle:Flash\nFlying\nExploit (When this creature enters, you may sacrifice a creature.)\nWhen Overcharged Amalgam exploits a creature, counter target spell, activated ability, or triggered ability.
diff --git a/forge-gui/res/cardsfolder/o/overencumbered.txt b/forge-gui/res/cardsfolder/o/overencumbered.txt
index bbe8469dc44..98bd53c920f 100644
--- a/forge-gui/res/cardsfolder/o/overencumbered.txt
+++ b/forge-gui/res/cardsfolder/o/overencumbered.txt
@@ -3,11 +3,11 @@ ManaCost:1 W
 Types:Enchantment Aura
 K:Enchant opponent
 A:SP$ Attach | ValidTgts$ Opponent | AILogic$ Curse
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, enchanted opponent creates a Clue token, a Food token, and a Junk token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, enchanted opponent creates a Clue token, a Food token, and a Junk token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_clue_draw,c_a_food_sac,c_a_junk_sac_exileplay | TokenOwner$ EnchantedPlayer
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ Opponent.EnchantedBy | TriggerZones$ Battlefield | Execute$ TrigEffect | TriggerDescription$ At the beginning of combat on enchanted opponent's turn, that player may pay {1} for each artifact they control. If they don't, creatures can't attack this combat.
 SVar:TrigEffect:DB$ Effect | UnlessCost$ Y | UnlessPayer$ EnchantedPlayer | Duration$ UntilEndOfCombat | StaticAbilities$ StaticCantAttack
 SVar:StaticCantAttack:Mode$ CantAttack | ValidCard$ Creature | Description$ Creatures can't attack this turn.
 SVar:Y:Count$Valid Artifact.EnchantedPlayerCtrl
 DeckHas:Ability$Token & Type$Clue|Food|Junk
-Oracle:Enchant opponent\nWhen Overencumbered enters the battlefield, enchanted opponent creates a Clue token, a Food token, and a Junk token.\nAt the beginning of combat on enchanted opponent's turn, that player may pay {1} for each artifact they control. If they don't, creatures can't attack this combat.
+Oracle:Enchant opponent\nWhen Overencumbered enters, enchanted opponent creates a Clue token, a Food token, and a Junk token.\nAt the beginning of combat on enchanted opponent's turn, that player may pay {1} for each artifact they control. If they don't, creatures can't attack this combat.
diff --git a/forge-gui/res/cardsfolder/o/overgrown_farmland.txt b/forge-gui/res/cardsfolder/o/overgrown_farmland.txt
index 4522af904d1..ce00b5e5cf1 100644
--- a/forge-gui/res/cardsfolder/o/overgrown_farmland.txt
+++ b/forge-gui/res/cardsfolder/o/overgrown_farmland.txt
@@ -2,6 +2,6 @@ Name:Overgrown Farmland
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ Combo G W | SpellDescription$ Add {G} or {W}.
-K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Land.YouCtrl | ConditionCompare$ LT2 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control two or more other lands.
-Oracle:Overgrown Farmland enters the battlefield tapped unless you control two or more other lands.\n{T}: Add {G} or {W}.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you control two or more other lands.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Land.YouCtrl | ConditionCompare$ LT2
+Oracle:Overgrown Farmland enters tapped unless you control two or more other lands.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/o/overgrown_pest.txt b/forge-gui/res/cardsfolder/o/overgrown_pest.txt
index 0ded6f11277..00d0c88f40e 100644
--- a/forge-gui/res/cardsfolder/o/overgrown_pest.txt
+++ b/forge-gui/res/cardsfolder/o/overgrown_pest.txt
@@ -2,6 +2,6 @@ Name:Overgrown Pest
 ManaCost:2 G
 Types:Creature Pest
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top five cards of your library. You may reveal a land or double-faced card from among them and put that card into your hand. Put the rest on the bottom of your library in a random order.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters, look at the top five cards of your library. You may reveal a land or double-faced card from among them and put that card into your hand. Put the rest on the bottom of your library in a random order.
 SVar:TrigDig:DB$ Dig | DigNum$ 5 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Land,Card.DoubleFaced | RestRandomOrder$ True
-Oracle:When Overgrown Pest enters the battlefield, look at the top five cards of your library. You may reveal a land or double-faced card from among them and put that card into your hand. Put the rest on the bottom of your library in a random order.
+Oracle:When Overgrown Pest enters, look at the top five cards of your library. You may reveal a land or double-faced card from among them and put that card into your hand. Put the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/o/overgrown_tomb.txt b/forge-gui/res/cardsfolder/o/overgrown_tomb.txt
index 991068edb34..4a5c982970b 100644
--- a/forge-gui/res/cardsfolder/o/overgrown_tomb.txt
+++ b/forge-gui/res/cardsfolder/o/overgrown_tomb.txt
@@ -1,6 +1,6 @@
 Name:Overgrown Tomb
 ManaCost:no cost
 Types:Land Swamp Forest
-K:ETBReplacement:Other:DBTap
-SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ PayLife<2> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may pay 2 life. If you don't, it enters the battlefield tapped.
-Oracle:({T}: Add {B} or {G}.)\nAs Overgrown Tomb enters the battlefield, you may pay 2 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 2 life. If you don't, it enters tapped.
+SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ PayLife<2> | UnlessPayer$ You | StackDescription$ enters tapped.
+Oracle:({T}: Add {B} or {G}.)\nAs Overgrown Tomb enters, you may pay 2 life. If you don't, it enters tapped.
diff --git a/forge-gui/res/cardsfolder/o/overgrowth_elemental.txt b/forge-gui/res/cardsfolder/o/overgrowth_elemental.txt
index c560eb9465e..fe163663409 100644
--- a/forge-gui/res/cardsfolder/o/overgrowth_elemental.txt
+++ b/forge-gui/res/cardsfolder/o/overgrowth_elemental.txt
@@ -2,7 +2,7 @@ Name:Overgrowth Elemental
 ManaCost:2 G
 Types:Creature Elemental
 PT:3/2
-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 Elemental you 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 Elemental you control.
 SVar:TrigPut:DB$ PutCounter | ValidTgts$ Elemental.Other+YouCtrl | TgtPrompt$ Select another target Elemental you control | CounterType$ P1P1 | CounterNum$ 1
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever another creature you control dies, you gain 1 life. If that creature was an Elemental, put a +1/+1 counter on CARDNAME.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1 | SubAbility$ DBPutCounter
@@ -11,4 +11,4 @@ DeckHas:Ability$Counters
 DeckHints:Type$Elemental
 AI:RemoveDeck:Random
 SVar:PlayMain1:TRUE
-Oracle:When Overgrowth Elemental enters the battlefield, put a +1/+1 counter on another target Elemental you control.\nWhenever another creature you control dies, you gain 1 life. If that creature was an Elemental, put a +1/+1 counter on Overgrowth Elemental.
+Oracle:When Overgrowth Elemental enters, put a +1/+1 counter on another target Elemental you control.\nWhenever another creature you control dies, you gain 1 life. If that creature was an Elemental, put a +1/+1 counter on Overgrowth Elemental.
diff --git a/forge-gui/res/cardsfolder/o/overlaid_terrain.txt b/forge-gui/res/cardsfolder/o/overlaid_terrain.txt
index 9cae673a99b..def87c0f4d3 100644
--- a/forge-gui/res/cardsfolder/o/overlaid_terrain.txt
+++ b/forge-gui/res/cardsfolder/o/overlaid_terrain.txt
@@ -2,9 +2,9 @@ Name:Overlaid Terrain
 ManaCost:2 G G
 Types:Enchantment
 K:ETBReplacement:Other:TrigSac
-SVar:TrigSac:DB$ SacrificeAll | ValidCards$ Land.YouCtrl | SpellDescription$ As CARDNAME enters the battlefield, sacrifice all lands you control.
+SVar:TrigSac:DB$ SacrificeAll | ValidCards$ Land.YouCtrl | SpellDescription$ As CARDNAME enters, sacrifice all lands you control.
 S:Mode$ Continuous | Affected$ Land.YouCtrl | AddAbility$ AnyMana | Description$ Lands you control have "{T}: Add two mana of any one color."
 SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color.
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
-Oracle:As Overlaid Terrain enters the battlefield, sacrifice all lands you control.\nLands you control have "{T}: Add two mana of any one color."
+Oracle:As Overlaid Terrain enters, sacrifice all lands you control.\nLands you control have "{T}: Add two mana of any one color."
diff --git a/forge-gui/res/cardsfolder/o/overseer_of_the_damned.txt b/forge-gui/res/cardsfolder/o/overseer_of_the_damned.txt
index e0997877503..fd9ee32454d 100644
--- a/forge-gui/res/cardsfolder/o/overseer_of_the_damned.txt
+++ b/forge-gui/res/cardsfolder/o/overseer_of_the_damned.txt
@@ -3,9 +3,9 @@ ManaCost:5 B B
 Types:Creature Demon
 PT:5/5
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may destroy target creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may destroy target creature.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Creature | TgtPrompt$ Choose target creature.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature an opponent controls dies, create a tapped 2/2 black Zombie creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_2_2_zombie | TokenOwner$ You | TokenTapped$ True
 SVar:PlayMain1:TRUE
-Oracle:Flying\nWhen Overseer of the Damned enters the battlefield, you may destroy target creature.\nWhenever a nontoken creature an opponent controls dies, create a tapped 2/2 black Zombie creature token.
+Oracle:Flying\nWhen Overseer of the Damned enters, you may destroy target creature.\nWhenever a nontoken creature an opponent controls dies, create a tapped 2/2 black Zombie creature token.
diff --git a/forge-gui/res/cardsfolder/o/overseer_of_vault_76.txt b/forge-gui/res/cardsfolder/o/overseer_of_vault_76.txt
index 68de712126d..c3122a18472 100644
--- a/forge-gui/res/cardsfolder/o/overseer_of_vault_76.txt
+++ b/forge-gui/res/cardsfolder/o/overseer_of_vault_76.txt
@@ -2,11 +2,11 @@ Name:Overseer of Vault 76
 ManaCost:2 W
 Types:Legendary Creature Human Advisor
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Creature.powerLE3+YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ First Contact — Whenever CARDNAME or another creature with power 3 or less enters the battlefield under your control, put a quest counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Creature.powerLE3+YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ First Contact — Whenever CARDNAME or another creature you control with power 3 or less enters, put a quest counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ Quest | CounterNum$ 1
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigImmediateTrig | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, you may remove three quest counters from among permanents you control. When you do, put a +1/+1 counter on each creature you control and they gain vigilance until end of turn.
 SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ RemoveAnyCounter<3/QUEST/Permanent.YouCtrl/among permanents you control> | Execute$ TrigPutCounterAll | TriggerDescription$ When you do, put a +1/+1 counter on each creature you control and they gain vigilance until end of turn.
 SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBPumpAll
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Vigilance
 DeckHas:Ability$Counters
-Oracle:First Contact — Whenever Overseer of Vault 76 or another creature with power 3 or less enters the battlefield under your control, put a quest counter on Overseer of Vault 76.\nAt the beginning of combat on your turn, you may remove three quest counters from among permanents you control. When you do, put a +1/+1 counter on each creature you control and they gain vigilance until end of turn.
+Oracle:First Contact — Whenever Overseer of Vault 76 or another creature you control with power 3 or less enters, put a quest counter on Overseer of Vault 76.\nAt the beginning of combat on your turn, you may remove three quest counters from among permanents you control. When you do, put a +1/+1 counter on each creature you control and they gain vigilance until end of turn.
diff --git a/forge-gui/res/cardsfolder/o/overwhelmed_apprentice.txt b/forge-gui/res/cardsfolder/o/overwhelmed_apprentice.txt
index 92ac686e34f..e7e3651ce73 100644
--- a/forge-gui/res/cardsfolder/o/overwhelmed_apprentice.txt
+++ b/forge-gui/res/cardsfolder/o/overwhelmed_apprentice.txt
@@ -2,7 +2,7 @@ Name:Overwhelmed Apprentice
 ManaCost:U
 Types:Creature Human Wizard
 PT:1/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, each opponent mills two cards. Then you scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters, each opponent mills two cards. Then you scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
 SVar:TrigMill:DB$ Mill | Defined$ Player.Opponent | NumCards$ 2 | SubAbility$ DBScry
 SVar:DBScry:DB$ Scry | ScryNum$ 2
-Oracle:When Overwhelmed Apprentice enters the battlefield, each opponent mills two cards. Then you scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+Oracle:When Overwhelmed Apprentice enters, each opponent mills two cards. Then you scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
diff --git a/forge-gui/res/cardsfolder/o/overwhelmed_archivist_archive_haunt.txt b/forge-gui/res/cardsfolder/o/overwhelmed_archivist_archive_haunt.txt
index 2efca55ad88..66e26e140db 100644
--- a/forge-gui/res/cardsfolder/o/overwhelmed_archivist_archive_haunt.txt
+++ b/forge-gui/res/cardsfolder/o/overwhelmed_archivist_archive_haunt.txt
@@ -2,13 +2,13 @@ Name:Overwhelmed Archivist
 ManaCost:2 U
 Types:Creature Human Wizard
 PT:3/2
-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
 K:Disturb:3 U
 DeckHas:Ability$Graveyard
 AlternateMode:DoubleFaced
-Oracle:When Overwhelmed Archivist enters the battlefield, draw a card, then discard a card.\nDisturb {3}{U} (You may cast this card from your graveyard transformed for its disturb cost.)
+Oracle:When Overwhelmed Archivist enters, draw a card, then discard a card.\nDisturb {3}{U} (You may cast this card from your graveyard transformed for its disturb cost.)
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/o/ovinomancer.txt b/forge-gui/res/cardsfolder/o/ovinomancer.txt
index 939bba3178d..93510bf7692 100644
--- a/forge-gui/res/cardsfolder/o/ovinomancer.txt
+++ b/forge-gui/res/cardsfolder/o/ovinomancer.txt
@@ -2,9 +2,9 @@ Name:Ovinomancer
 ManaCost:2 U
 Types:Creature Human Wizard
 PT:0/1
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return three basic lands you control to their owner's hand.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters, sacrifice it unless you return three basic lands you control to their owner's hand.
 A:AB$ Destroy | Cost$ Return<1/CARDNAME> T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NoRegen$ True | SubAbility$ DBToken | SpellDescription$ Destroy target creature. It can't be regenerated.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_0_1_sheep | TokenOwner$ TargetedController
 SVar:TrigBounce:DB$ Sacrifice | UnlessCost$ Return<3/Land.Basic> | UnlessPayer$ You
 AI:RemoveDeck:All
-Oracle:When Ovinomancer enters the battlefield, sacrifice it unless you return three basic lands you control to their owner's hand.\n{T}, Return Ovinomancer to its owner's hand: Destroy target creature. It can't be regenerated. That creature's controller creates a 0/1 green Sheep creature token.
+Oracle:When Ovinomancer enters, sacrifice it unless you return three basic lands you control to their owner's hand.\n{T}, Return Ovinomancer to its owner's hand: Destroy target creature. It can't be regenerated. That creature's controller creates a 0/1 green Sheep creature token.
diff --git a/forge-gui/res/cardsfolder/o/owl_familiar.txt b/forge-gui/res/cardsfolder/o/owl_familiar.txt
index 98870285f86..dd09877b02d 100644
--- a/forge-gui/res/cardsfolder/o/owl_familiar.txt
+++ b/forge-gui/res/cardsfolder/o/owl_familiar.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Bird
 PT:1/1
 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 Owl Familiar enters the battlefield, draw a card, then discard a card.
+Oracle:Flying\nWhen Owl Familiar enters, draw a card, then discard a card.
diff --git a/forge-gui/res/cardsfolder/o/owlbear.txt b/forge-gui/res/cardsfolder/o/owlbear.txt
index 15b77de6e72..4428b10081f 100644
--- a/forge-gui/res/cardsfolder/o/owlbear.txt
+++ b/forge-gui/res/cardsfolder/o/owlbear.txt
@@ -3,6 +3,6 @@ ManaCost:3 G G
 Types:Creature Bird Bear
 PT:4/4
 K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Keen Senses — When CARDNAME enters the battlefield, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ Keen Senses — When CARDNAME enters, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
-Oracle:Trample\nKeen Senses — When Owlbear enters the battlefield, draw a card.
+Oracle:Trample\nKeen Senses — When Owlbear enters, draw a card.
diff --git a/forge-gui/res/cardsfolder/o/ox_drover.txt b/forge-gui/res/cardsfolder/o/ox_drover.txt
index 6f268cc82eb..e2846e1413b 100644
--- a/forge-gui/res/cardsfolder/o/ox_drover.txt
+++ b/forge-gui/res/cardsfolder/o/ox_drover.txt
@@ -4,8 +4,8 @@ Types:Creature Human Peasant
 PT:4/4
 K:Vigilance
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Creature.Ox | Description$ CARDNAME can't be blocked by Oxen.
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, target opponent creates a 2/4 white Ox creature token and you draw a card.
-T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, target opponent creates a 2/4 white Ox creature token and you draw a card.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters or attacks, target opponent creates a 2/4 white Ox creature token and you draw a card.
+T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters or attacks, target opponent creates a 2/4 white Ox creature token and you draw a card.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | ValidTgts$ Opponent | TokenOwner$ Targeted | TokenScript$ w_2_4_ox | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw
-Oracle:Vigilance\nOx Drover can't be blocked by Oxen.\nWhenever Ox Drover enters the battlefield or attacks, target opponent creates a 2/4 white Ox creature token and you draw a card.
+Oracle:Vigilance\nOx Drover can't be blocked by Oxen.\nWhenever Ox Drover enters or attacks, target opponent creates a 2/4 white Ox creature token and you draw a card.
diff --git a/forge-gui/res/cardsfolder/o/ox_of_agonas.txt b/forge-gui/res/cardsfolder/o/ox_of_agonas.txt
index efd5939539f..a63e32b0921 100644
--- a/forge-gui/res/cardsfolder/o/ox_of_agonas.txt
+++ b/forge-gui/res/cardsfolder/o/ox_of_agonas.txt
@@ -2,11 +2,11 @@ Name:Ox of Agonas
 ManaCost:3 R R
 Types:Creature Ox
 PT:4/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBDiscard | TriggerDescription$ When CARDNAME enters the battlefield, discard your hand, then draw three cards.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBDiscard | TriggerDescription$ When CARDNAME enters, discard your hand, then draw three cards.
 SVar:DBDiscard:DB$ Discard | Mode$ Hand | Defined$ You | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 3
 K:Escape:R R ExileFromGrave<8/Card.Other/other>
 K:etbCounter:P1P1:1:ValidCard$ Card.Self+escaped:CARDNAME escapes with a +1/+1 counter on it.
 SVar:AIPreference:SacCost$Card.YouOwn+Other+inZoneGraveyard
 DeckHas:Ability$Counters
-Oracle:When Ox of Agonas enters the battlefield, discard your hand, then draw three cards.\nEscape—{R}{R}, Exile eight other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)\nOx of Agonas escapes with a +1/+1 counter on it.
+Oracle:When Ox of Agonas enters, discard your hand, then draw three cards.\nEscape—{R}{R}, Exile eight other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)\nOx of Agonas escapes with a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/o/oxidda_scrapmelter.txt b/forge-gui/res/cardsfolder/o/oxidda_scrapmelter.txt
index 0bd3980f806..b060cf0654a 100644
--- a/forge-gui/res/cardsfolder/o/oxidda_scrapmelter.txt
+++ b/forge-gui/res/cardsfolder/o/oxidda_scrapmelter.txt
@@ -2,6 +2,6 @@ Name:Oxidda Scrapmelter
 ManaCost:3 R
 Types:Creature Beast
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy target artifact.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Choose target artifact.
-Oracle:When Oxidda Scrapmelter enters the battlefield, destroy target artifact.
+Oracle:When Oxidda Scrapmelter enters, destroy target artifact.