diff --git a/forge-gui/res/cardsfolder/n/naban_dean_of_iteration.txt b/forge-gui/res/cardsfolder/n/naban_dean_of_iteration.txt
index 8446863251e..da43c6ba75b 100644
--- a/forge-gui/res/cardsfolder/n/naban_dean_of_iteration.txt
+++ b/forge-gui/res/cardsfolder/n/naban_dean_of_iteration.txt
@@ -2,6 +2,6 @@ Name:Naban, Dean of Iteration
 ManaCost:1 U
 Types:Legendary Creature Human Wizard
 PT:2/1
-S:Mode$ Panharmonicon | ValidMode$ ChangesZone,ChangesZoneAll | ValidCard$ Permanent.YouCtrl | ValidCause$ Wizard.YouCtrl | Destination$ Battlefield | Description$ If a Wizard entering the battlefield under your control causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time.
+S:Mode$ Panharmonicon | ValidMode$ ChangesZone,ChangesZoneAll | ValidCard$ Permanent.YouCtrl | ValidCause$ Wizard.YouCtrl | Destination$ Battlefield | Description$ If a Wizard entering under your control causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time.
 DeckHints:Type$Wizard
-Oracle:If a Wizard entering the battlefield under your control causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time.
+Oracle:If a Wizard entering under your control causes a triggered ability of a permanent you control to trigger, that ability triggers an additional time.
diff --git a/forge-gui/res/cardsfolder/n/nadaar_selfless_paladin.txt b/forge-gui/res/cardsfolder/n/nadaar_selfless_paladin.txt
index 19647258fd0..75ab85f438e 100644
--- a/forge-gui/res/cardsfolder/n/nadaar_selfless_paladin.txt
+++ b/forge-gui/res/cardsfolder/n/nadaar_selfless_paladin.txt
@@ -3,9 +3,9 @@ ManaCost:2 W
 Types:Legendary Creature Dragon Knight
 PT:3/3
 K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBVenture | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, venture into the dungeon. (Enter the first room or advance to the next room.)
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DBVenture | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, venture into the dungeon. (Enter the first room or advance to the next room.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBVenture | TriggerDescription$ Whenever CARDNAME enters or attacks, venture into the dungeon. (Enter the first room or advance to the next room.)
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DBVenture | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, venture into the dungeon. (Enter the first room or advance to the next room.)
 SVar:DBVenture:DB$ Venture | Defined$ You
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+Other | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | Description$ Other creatures you control get +1/+1 as long as you've completed a dungeon.
 SVar:X:PlayerCountPropertyYou$DungeonsCompleted
-Oracle:Vigilance\nWhenever Nadaar, Selfless Paladin enters the battlefield or attacks, venture into the dungeon. (Enter the first room or advance to the next room.)\nOther creatures you control get +1/+1 as long as you've completed a dungeon.
+Oracle:Vigilance\nWhenever Nadaar, Selfless Paladin enters or attacks, venture into the dungeon. (Enter the first room or advance to the next room.)\nOther creatures you control get +1/+1 as long as you've completed a dungeon.
diff --git a/forge-gui/res/cardsfolder/n/naga_oracle.txt b/forge-gui/res/cardsfolder/n/naga_oracle.txt
index d9f88e64326..15b239288d6 100644
--- a/forge-gui/res/cardsfolder/n/naga_oracle.txt
+++ b/forge-gui/res/cardsfolder/n/naga_oracle.txt
@@ -2,7 +2,7 @@ Name:Naga Oracle
 ManaCost:3 U
 Types:Creature Snake Cleric
 PT:2/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters the battlefield, surveil 3. (Look at the top three cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters, surveil 3. (Look at the top three cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
 SVar:TrigSurveil:DB$ Surveil | Amount$ 3
 DeckHas:Ability$Surveil|Graveyard
-Oracle:When Naga Oracle enters the battlefield, surveil 3. (Look at the top three cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
+Oracle:When Naga Oracle enters, surveil 3. (Look at the top three cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt b/forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt
index 28879fd8a5d..d091434a374 100644
--- a/forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt
+++ b/forge-gui/res/cardsfolder/n/nahiris_lithoforming.txt
@@ -1,12 +1,12 @@
 Name:Nahiri's Lithoforming
 ManaCost:X R R
 Types:Sorcery
-A:SP$ Sacrifice | SacValid$ Land | Amount$ X | RememberSacrificed$ True | SubAbility$ DBDraw | StackDescription$ SpellDescription | SpellDescription$ Sacrifice X lands. For each land sacrificed this way, draw a card. You may play X additional lands this turn. Lands you control enter the battlefield tapped this turn.
+A:SP$ Sacrifice | SacValid$ Land | Amount$ X | RememberSacrificed$ True | SubAbility$ DBDraw | StackDescription$ SpellDescription | SpellDescription$ Sacrifice X lands. For each land sacrificed this way, draw a card. You may play X additional lands this turn. Lands you control enter tapped this turn.
 SVar:DBDraw:DB$ Draw | NumCards$ Y | SubAbility$ DBStoreSVar | StackDescription$ None
 SVar:DBStoreSVar:DB$ StoreSVar | SVar$ XLands | Type$ CountSVar | Expression$ X | SubAbility$ DBEffect
 SVar:DBEffect:DB$ Effect | StaticAbilities$ PlayMoreLand | ReplacementEffects$ LandETB | SubAbility$ DBCleanup
 SVar:PlayMoreLand:Mode$ Continuous | Affected$ You | AdjustLandPlays$ XLands | EffectZone$ Command | Description$ You may play X additional lands this turn.
-SVar:LandETB:Event$ Moved | ValidCard$ Land.YouCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | Description$ Lands you control enter the battlefield tapped this turn.
+SVar:LandETB:Event$ Moved | ValidCard$ Land.YouCtrl | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | Description$ Lands you control enter tapped this turn.
 SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$xPaid
@@ -14,4 +14,4 @@ SVar:Y:Count$RememberedSize
 SVar:XLands:Number$0
 DeckHas:Ability$Sacrifice
 AI:RemoveDeck:All
-Oracle:Sacrifice X lands. For each land sacrificed this way, draw a card. You may play X additional lands this turn. Lands you control enter the battlefield tapped this turn.
+Oracle:Sacrifice X lands. For each land sacrificed this way, draw a card. You may play X additional lands this turn. Lands you control enter tapped this turn.
diff --git a/forge-gui/res/cardsfolder/n/nameless_race.txt b/forge-gui/res/cardsfolder/n/nameless_race.txt
index 8ab13ded4a5..c276498cca6 100644
--- a/forge-gui/res/cardsfolder/n/nameless_race.txt
+++ b/forge-gui/res/cardsfolder/n/nameless_race.txt
@@ -3,10 +3,10 @@ ManaCost:3 B
 Types:Creature
 PT:*/*
 K:Trample
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ PayLife | ReplacementResult$ Updated | Description$ As CARDNAME enters the battlefield, pay any amount of life. The amount you pay can't be more than the total number of white nontoken permanents your opponents control plus the total number of white cards in their graveyards.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ PayLife | ReplacementResult$ Updated | Description$ As CARDNAME enters, pay any amount of life. The amount you pay can't be more than the total number of white nontoken permanents your opponents control plus the total number of white cards in their graveyards.
 SVar:PayLife:AB$ StoreSVar | Cost$ Mandatory PayLife<X> | XMaxLimit$ Limit | SVar$ LifePaidOnETB | Type$ Calculate | Expression$ X
 # Don't use References, when the variable is set by StoreSVar
-S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ LifePaidOnETB | SetToughness$ LifePaidOnETB | Description$ CARDNAME's power and toughness are each equal to the life paid as it entered the battlefield.
+S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ LifePaidOnETB | SetToughness$ LifePaidOnETB | Description$ CARDNAME's power and toughness are each equal to the life paid as it entered.
 SVar:X:Count$xPaid
 SVar:Limit:SVar$Active/Plus.Buried
 SVar:Active:Count$Valid Permanent.White+nonToken+OppCtrl
@@ -14,4 +14,4 @@ SVar:Buried:Count$ValidGraveyard Card.White+OppCtrl
 SVar:LifePaidOnETB:Number$0
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
-Oracle:Trample\nAs Nameless Race enters the battlefield, pay any amount of life. The amount you pay can't be more than the total number of white nontoken permanents your opponents control plus the total number of white cards in their graveyards.\nNameless Race's power and toughness are each equal to the life paid as it entered the battlefield.
+Oracle:Trample\nAs Nameless Race enters, pay any amount of life. The amount you pay can't be more than the total number of white nontoken permanents your opponents control plus the total number of white cards in their graveyards.\nNameless Race's power and toughness are each equal to the life paid as it entered.
diff --git a/forge-gui/res/cardsfolder/n/nantuko_cultivator.txt b/forge-gui/res/cardsfolder/n/nantuko_cultivator.txt
index e4d5a0eaf9d..21a37b55d90 100644
--- a/forge-gui/res/cardsfolder/n/nantuko_cultivator.txt
+++ b/forge-gui/res/cardsfolder/n/nantuko_cultivator.txt
@@ -2,7 +2,7 @@ Name:Nantuko Cultivator
 ManaCost:3 G
 Types:Creature Insect Druid
 PT:2/2
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigNantukoDiscardLand | TriggerDescription$ When CARDNAME enters the battlefield, you may discard any number of land cards. Put that many +1/+1 counters on CARDNAME and draw that many cards.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigNantukoDiscardLand | TriggerDescription$ When CARDNAME enters, you may discard any number of land cards. Put that many +1/+1 counters on CARDNAME and draw that many cards.
 SVar:TrigNantukoDiscardLand:DB$ Discard | DiscardValid$ Land | NumCards$ NantukoX | Optional$ True | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBNantukoPutCounter
 SVar:DBNantukoPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ NantukoY | SubAbility$ DBNantukoDraw
 SVar:DBNantukoDraw:DB$ Draw | NumCards$ NantukoY | SubAbility$ DBNantukoCleanup
@@ -11,4 +11,4 @@ SVar:NantukoX:Count$TypeInYourHand.Land
 SVar:NantukoY:Remembered$Amount
 AI:RemoveDeck:All
 DeckHas:Ability$Counters
-Oracle:When Nantuko Cultivator enters the battlefield, you may discard any number of land cards. Put that many +1/+1 counters on Nantuko Cultivator and draw that many cards.
+Oracle:When Nantuko Cultivator enters, you may discard any number of land cards. Put that many +1/+1 counters on Nantuko Cultivator and draw that many cards.
diff --git a/forge-gui/res/cardsfolder/n/nantuko_shaman.txt b/forge-gui/res/cardsfolder/n/nantuko_shaman.txt
index aded54d5736..b7e4da61855 100644
--- a/forge-gui/res/cardsfolder/n/nantuko_shaman.txt
+++ b/forge-gui/res/cardsfolder/n/nantuko_shaman.txt
@@ -3,6 +3,6 @@ ManaCost:2 G
 Types:Creature Insect Shaman
 PT:3/2
 K:Suspend:1:2 G G
-T:Mode$ ChangesZone | ValidCard$ Card.Self | IsPresent$ Land.tapped+YouCtrl | PresentCompare$ EQ0 | Origin$ Any | Destination$ Battlefield | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, if you control no tapped lands, draw a card.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | IsPresent$ Land.tapped+YouCtrl | PresentCompare$ EQ0 | Origin$ Any | Destination$ Battlefield | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, if you control no tapped lands, draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
-Oracle:When Nantuko Shaman enters the battlefield, if you control no tapped lands, draw a card.\nSuspend 1—{2}{G}{G} (Rather than cast this card from your hand, you may pay {2}{G}{G} and exile it with a time counter on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)
+Oracle:When Nantuko Shaman enters, if you control no tapped lands, draw a card.\nSuspend 1—{2}{G}{G} (Rather than cast this card from your hand, you may pay {2}{G}{G} and exile it with a time counter on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost. It has haste.)
diff --git a/forge-gui/res/cardsfolder/n/nantuko_slicer.txt b/forge-gui/res/cardsfolder/n/nantuko_slicer.txt
index 96d6da7600f..dfc99c4fcfb 100644
--- a/forge-gui/res/cardsfolder/n/nantuko_slicer.txt
+++ b/forge-gui/res/cardsfolder/n/nantuko_slicer.txt
@@ -3,11 +3,11 @@ ManaCost:2 G G
 Types:Creature Insect
 PT:3/2
 K:Kicker:B
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target card from your graveyard to your hand. If this spell was kicked, conjure a duplicate of target card in an opponent's graveyard into your hand. It perpetually gains: "You may spend mana as though it were mana of any color to cast this spell."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, return target card from your graveyard to your hand. If this spell was kicked, conjure a duplicate of target card in an opponent's graveyard into your hand. It perpetually gains: "You may spend mana as though it were mana of any color to cast this spell."
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Card.YouOwn | TgtPrompt$ Select target card from your graveyard | SubAbility$ DBConjure
 SVar:DBConjure:DB$ MakeCard | Condition$ Kicked | Conjure$ True | TgtPrompt$ Select target creature card in an opponent's graveyard | ValidTgts$ Creature.OppOwn | TgtZone$ Graveyard | DefinedName$ ThisTargetedCard | Zone$ Hand | RememberMade$ True | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ SpendAnyMana | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:SpendAnyMana:Mode$ ManaConvert | EffectZone$ Stack | ValidPlayer$ You | ValidCard$ Card.Self | ValidSA$ Spell | ManaConversion$ AnyType->AnyColor | Description$ You may spend mana as though it were mana of any color to cast this spell.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Graveyard
-Oracle:Kicker{B}\nWhen Nantuko Slicer enters the battlefield, return target card from your graveyard to your hand. If this spell was kicked, conjure a duplicate of target card in an opponent's graveyard into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
+Oracle:Kicker{B}\nWhen Nantuko Slicer enters, return target card from your graveyard to your hand. If this spell was kicked, conjure a duplicate of target card in an opponent's graveyard into your hand. It perpetually gains "You may spend mana as though it were mana of any color to cast this spell."
diff --git a/forge-gui/res/cardsfolder/n/nantuko_tracer.txt b/forge-gui/res/cardsfolder/n/nantuko_tracer.txt
index 5108a6905e1..3caa3045488 100644
--- a/forge-gui/res/cardsfolder/n/nantuko_tracer.txt
+++ b/forge-gui/res/cardsfolder/n/nantuko_tracer.txt
@@ -2,6 +2,6 @@ Name:Nantuko Tracer
 ManaCost:1 G
 Types:Creature Insect Druid
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may put target card from a graveyard on the bottom of its owner's library.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may put target card from a graveyard on the bottom of its owner's library.
 SVar:TrigChange:DB$ ChangeZone | ValidTgts$ Card | TgtPrompt$ Select target card in a graveyard | Origin$ Graveyard | Destination$ Library | LibraryPosition$ -1
-Oracle:When Nantuko Tracer enters the battlefield, you may put target card from a graveyard on the bottom of its owner's library.
+Oracle:When Nantuko Tracer enters, you may put target card from a graveyard on the bottom of its owner's library.
diff --git a/forge-gui/res/cardsfolder/n/naomi_pillar_of_order.txt b/forge-gui/res/cardsfolder/n/naomi_pillar_of_order.txt
index 2feca635c0f..40d36add9ae 100644
--- a/forge-gui/res/cardsfolder/n/naomi_pillar_of_order.txt
+++ b/forge-gui/res/cardsfolder/n/naomi_pillar_of_order.txt
@@ -2,10 +2,10 @@ Name:Naomi, Pillar of Order
 ManaCost:3 W B
 Types:Legendary Creature Human Advisor
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Artifact.YouCtrl | IsPresent2$ Enchantment.YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, if you control an artifact and an enchantment, create a 2/2 white Samurai creature token with vigilance.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | IsPresent$ Artifact.YouCtrl | IsPresent2$ Enchantment.YouCtrl | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, if you control an artifact and an enchantment, create a 2/2 white Samurai creature token with vigilance.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Artifact.YouCtrl | IsPresent2$ Enchantment.YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters or attacks, if you control an artifact and an enchantment, create a 2/2 white Samurai creature token with vigilance.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | IsPresent$ Artifact.YouCtrl | IsPresent2$ Enchantment.YouCtrl | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, if you control an artifact and an enchantment, create a 2/2 white Samurai creature token with vigilance.
 SVar:TrigToken:DB$ Token | TokenScript$ w_2_2_samurai_vigilance
 DeckHints:Type$Artifact|Enchantment
 DeckHas:Ability$Token & Type$Samurai
 SVar:HasAttackEffect:TRUE
-Oracle:Whenever Naomi, Pillar of Order enters the battlefield or attacks, if you control an artifact and an enchantment, create a 2/2 white Samurai creature token with vigilance.
+Oracle:Whenever Naomi, Pillar of Order enters or attacks, if you control an artifact and an enchantment, create a 2/2 white Samurai creature token with vigilance.
diff --git a/forge-gui/res/cardsfolder/n/narnam_renegade.txt b/forge-gui/res/cardsfolder/n/narnam_renegade.txt
index 44ffc7d71ca..2e9620633e5 100644
--- a/forge-gui/res/cardsfolder/n/narnam_renegade.txt
+++ b/forge-gui/res/cardsfolder/n/narnam_renegade.txt
@@ -3,5 +3,5 @@ ManaCost:G
 Types:Creature Elf Warrior
 PT:1/2
 K:Deathtouch
-K:etbCounter:P1P1:1:Revolt$ True:Revolt — CARDNAME enters the battlefield with a +1/+1 counter on it if a permanent you controlled left the battlefield this turn.
-Oracle:Deathtouch\nRevolt — Narnam Renegade enters the battlefield with a +1/+1 counter on it if a permanent you controlled left the battlefield this turn.
+K:etbCounter:P1P1:1:Revolt$ True:Revolt — CARDNAME enters with a +1/+1 counter on it if a permanent you controlled left the battlefield this turn.
+Oracle:Deathtouch\nRevolt — Narnam Renegade enters with a +1/+1 counter on it if a permanent you controlled left the battlefield this turn.
diff --git a/forge-gui/res/cardsfolder/n/naru_meha_master_wizard.txt b/forge-gui/res/cardsfolder/n/naru_meha_master_wizard.txt
index c14a2b50cd2..e14e4eb2576 100644
--- a/forge-gui/res/cardsfolder/n/naru_meha_master_wizard.txt
+++ b/forge-gui/res/cardsfolder/n/naru_meha_master_wizard.txt
@@ -3,8 +3,8 @@ ManaCost:2 U U
 Types:Legendary Creature Human Wizard
 PT:3/3
 K:Flash
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCopy | TriggerDescription$ When CARDNAME enters the battlefield, copy target instant or sorcery spell you control. You may choose new targets for that copy.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCopy | TriggerDescription$ When CARDNAME enters, copy target instant or sorcery spell you control. You may choose new targets for that copy.
 SVar:TrigCopy:DB$ CopySpellAbility | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl | TgtPrompt$ Select target instant or sorcery spell you control | TargetType$ Spell | MayChooseTarget$ True
 S:Mode$ Continuous | Affected$ Wizard.Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other Wizards you control get +1/+1.
 DeckHints:Type$Wizard
-Oracle:Flash\nWhen Naru Meha, Master Wizard enters the battlefield, copy target instant or sorcery spell you control. You may choose new targets for the copy.\nOther Wizards you control get +1/+1.
+Oracle:Flash\nWhen Naru Meha, Master Wizard enters, copy target instant or sorcery spell you control. You may choose new targets for the copy.\nOther Wizards you control get +1/+1.
diff --git a/forge-gui/res/cardsfolder/n/nashi_illusion_gadgeteer.txt b/forge-gui/res/cardsfolder/n/nashi_illusion_gadgeteer.txt
index 45ede24640a..0b6d8af7cce 100644
--- a/forge-gui/res/cardsfolder/n/nashi_illusion_gadgeteer.txt
+++ b/forge-gui/res/cardsfolder/n/nashi_illusion_gadgeteer.txt
@@ -4,9 +4,9 @@ Types:Legendary Creature Rat Rogue
 PT:4/4
 K:Menace
 K:Ward:2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When NICKNAME enters the battlefield, secretly choose a card in your graveyard and conjure a duplicate of it into your hand. If the duplicate isn't a land card, it perpetually gains flash.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ When NICKNAME enters, secretly choose a card in your graveyard and conjure a duplicate of it into your hand. If the duplicate isn't a land card, it perpetually gains flash.
 SVar:TrigChoose:DB$ ChooseCard | ChoiceZone$ Graveyard | Choices$ Card.YouOwn | Secretly$ True | Amount$ 1 | ChoiceTitle$ Secretly choose a creature in your graveyard | SubAbility$ DBConjure | Mandatory$ True
 SVar:DBConjure:DB$ MakeCard | Conjure$ True | DefinedName$ ChosenCard | Zone$ Hand | RememberMade$ True | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | PumpZone$ Hand | KW$ Flash | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
-Oracle:Menace, Ward {2}\nWhen Nashi enters the battlefield, secretly choose a card in your graveyard and conjure a duplicate of it into your hand. If the duplicate isn't a land card, it perpetually gains flash.
+Oracle:Menace, Ward {2}\nWhen Nashi enters, secretly choose a card in your graveyard and conjure a duplicate of it into your hand. If the duplicate isn't a land card, it perpetually gains flash.
diff --git a/forge-gui/res/cardsfolder/n/naths_elite.txt b/forge-gui/res/cardsfolder/n/naths_elite.txt
index 97d4e158cec..3ae5152a711 100644
--- a/forge-gui/res/cardsfolder/n/naths_elite.txt
+++ b/forge-gui/res/cardsfolder/n/naths_elite.txt
@@ -3,7 +3,7 @@ ManaCost:4 G
 Types:Creature Elf Warrior
 PT:4/2
 K:All creatures able to block CARDNAME do so.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigClash | TriggerDescription$ When CARDNAME enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigClash | TriggerDescription$ When CARDNAME enters, clash with an opponent. If you win, put a +1/+1 counter on CARDNAME.
 SVar:TrigClash:DB$ Clash | WinSubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-Oracle:All creatures able to block Nath's Elite do so.\nWhen Nath's Elite enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on Nath's Elite. (Each clashing player reveals the top card of their library, then puts that card on the top or bottom. A player wins if their card had a higher mana value.)
+Oracle:All creatures able to block Nath's Elite do so.\nWhen Nath's Elite enters, clash with an opponent. If you win, put a +1/+1 counter on Nath's Elite. (Each clashing player reveals the top card of their library, then puts that card on the top or bottom. A player wins if their card had a higher mana value.)
diff --git a/forge-gui/res/cardsfolder/n/natural_emergence.txt b/forge-gui/res/cardsfolder/n/natural_emergence.txt
index 4da63aec399..24fe4e3b611 100644
--- a/forge-gui/res/cardsfolder/n/natural_emergence.txt
+++ b/forge-gui/res/cardsfolder/n/natural_emergence.txt
@@ -1,11 +1,11 @@
 Name:Natural Emergence
 ManaCost:2 R G
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters the battlefield, return a red or green enchantment you control to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters, return a red or green enchantment you control to its owner's hand.
 SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Enchantment.YouCtrl+Red,Enchantment.YouCtrl+Green | ChangeNum$ 1 | Mandatory$ True | AILogic$ NeverBounceItself
 S:Mode$ Continuous | Affected$ Land.YouCtrl | SetPower$ 2 | SetToughness$ 2 | AddType$ Creature | AddKeyword$ First Strike | Description$ Lands you control are 2/2 creatures with first strike. They're still lands.
 SVar:NeedsToPlay:Enchantment.Red+YouCtrl,Enchantment.Green+YouCtrl
 AI:RemoveDeck:Random
 SVar:NonStackingEffect:True
 DeckNeeds:Type$Enchantment
-Oracle:When Natural Emergence enters the battlefield, return a red or green enchantment you control to its owner's hand.\nLands you control are 2/2 creatures with first strike. They're still lands.
+Oracle:When Natural Emergence enters, return a red or green enchantment you control to its owner's hand.\nLands you control are 2/2 creatures with first strike. They're still lands.
diff --git a/forge-gui/res/cardsfolder/n/nautiloid_ship.txt b/forge-gui/res/cardsfolder/n/nautiloid_ship.txt
index 1447c17f73c..6029ddc5f38 100644
--- a/forge-gui/res/cardsfolder/n/nautiloid_ship.txt
+++ b/forge-gui/res/cardsfolder/n/nautiloid_ship.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact Vehicle
 PT:5/5
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExileGrave | TriggerDescription$ When CARDNAME enters the battlefield, exile target player's graveyard.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExileGrave | TriggerDescription$ When CARDNAME enters, exile target player's graveyard.
 SVar:TrigExileGrave:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Player | ChangeType$ Card | RememberChanged$ True
 T:Mode$ DamageDone | ValidSource$ Card.Self | Execute$ TrigPut | CombatDamage$ True | ValidTarget$ Player | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may put a creature card exiled with CARDNAME onto the battlefield under your control.
 SVar:TrigPut:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Hidden$ True | ChangeType$ Creature.IsRemembered | SelectPrompt$ Select a creature card exiled with this | GainControl$ True
@@ -14,4 +14,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 K:Crew:3
 SVar:NeedsToPlayVar:X GE2
 SVar:X:PlayerCountOpponents$HighestValidGraveyard Creature.YouOwn
-Oracle:Flying\nWhen Nautiloid Ship enters the battlefield, exile target player's graveyard.\nWhenever Nautiloid Ship deals combat damage to a player, you may put a creature card exiled with Nautiloid Ship onto the battlefield under your control.\nCrew 3
+Oracle:Flying\nWhen Nautiloid Ship enters, exile target player's graveyard.\nWhenever Nautiloid Ship deals combat damage to a player, you may put a creature card exiled with Nautiloid Ship onto the battlefield under your control.\nCrew 3
diff --git a/forge-gui/res/cardsfolder/n/navigators_compass.txt b/forge-gui/res/cardsfolder/n/navigators_compass.txt
index 7e8a5198152..ffeeb79737e 100644
--- a/forge-gui/res/cardsfolder/n/navigators_compass.txt
+++ b/forge-gui/res/cardsfolder/n/navigators_compass.txt
@@ -1,8 +1,8 @@
 Name:Navigator's Compass
 ManaCost:1
 Types:Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 3 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters, you gain 3 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 3
 A:AB$ ChooseType | Cost$ T | Defined$ You | Type$ Basic Land | SubAbility$ DBAnimate | SpellDescription$ Until end of turn, target land you control becomes the basic land type of your choice in addition to its other types.
 SVar:DBAnimate:DB$ Animate | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | Types$ ChosenType
-Oracle:When Navigator's Compass enters the battlefield, you gain 3 life.\n{T}: Until end of turn, target land you control becomes the basic land type of your choice in addition to its other types.
+Oracle:When Navigator's Compass enters, you gain 3 life.\n{T}: Until end of turn, target land you control becomes the basic land type of your choice in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/n/naya_soulbeast.txt b/forge-gui/res/cardsfolder/n/naya_soulbeast.txt
index dc0994c4b60..916418434c2 100644
--- a/forge-gui/res/cardsfolder/n/naya_soulbeast.txt
+++ b/forge-gui/res/cardsfolder/n/naya_soulbeast.txt
@@ -4,11 +4,11 @@ Types:Creature Beast
 PT:0/0
 T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigReveal | TriggerDescription$ When you cast this spell, each player reveals the top card of their library.
 SVar:TrigReveal:DB$ PeekAndReveal | Defined$ Player | RememberRevealed$ True
-K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with X +1/+1 counters on it, where X is the total mana value of all cards revealed this way.
+K:etbCounter:P1P1:X:no Condition:CARDNAME enters with X +1/+1 counters on it, where X is the total mana value of all cards revealed this way.
 SVar:X:Remembered$SumCMC
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 K:Trample
 AI:RemoveDeck:Random
 DeckHas:Ability$Counters
-Oracle:When you cast this spell, each player reveals the top card of their library. Naya Soulbeast enters the battlefield with X +1/+1 counters on it, where X is the total mana value of all cards revealed this way.\nTrample
+Oracle:When you cast this spell, each player reveals the top card of their library. Naya Soulbeast enters with X +1/+1 counters on it, where X is the total mana value of all cards revealed this way.\nTrample
diff --git a/forge-gui/res/cardsfolder/n/nazahn_revered_bladesmith.txt b/forge-gui/res/cardsfolder/n/nazahn_revered_bladesmith.txt
index c775d2d1354..5b9dc07dac4 100644
--- a/forge-gui/res/cardsfolder/n/nazahn_revered_bladesmith.txt
+++ b/forge-gui/res/cardsfolder/n/nazahn_revered_bladesmith.txt
@@ -2,7 +2,7 @@ Name:Nazahn, Revered Bladesmith
 ManaCost:4 G W
 Types:Legendary Creature Cat Artificer
 PT:5/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, search your library for an Equipment card and reveal it. If you reveal a card named Hammer of Nazahn this way, put it onto the battlefield. Otherwise, put that card into your hand. Then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, search your library for an Equipment card and reveal it. If you reveal a card named Hammer of Nazahn this way, put it onto the battlefield. Otherwise, put that card into your hand. Then shuffle.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Equipment | ChangeNum$ 1 | Reveal$ True | Shuffle$ False | RememberChanged$ True | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Battlefield | ConditionDefined$ Remembered | ConditionPresent$ Card.namedHammer of Nazahn | ForgetChanged$ True | SubAbility$ DBChangeZone2
 SVar:DBChangeZone2:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Hand | SubAbility$ DBShuffle
@@ -11,4 +11,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+equipped | Execute$ TrigTap | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever an equipped creature you control attacks, you may tap target creature defending player controls.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.DefendingPlayerCtrl | TgtPrompt$ Select target creature defending player controls
 DeckHints:Name$Hammer of Nazahn
-Oracle:When Nazahn, Revered Bladesmith enters the battlefield, search your library for an Equipment card and reveal it. If you reveal a card named Hammer of Nazahn this way, put it onto the battlefield. Otherwise, put that card into your hand. Then shuffle.\nWhenever an equipped creature you control attacks, you may tap target creature defending player controls.
+Oracle:When Nazahn, Revered Bladesmith enters, search your library for an Equipment card and reveal it. If you reveal a card named Hammer of Nazahn this way, put it onto the battlefield. Otherwise, put that card into your hand. Then shuffle.\nWhenever an equipped creature you control attacks, you may tap target creature defending player controls.
diff --git a/forge-gui/res/cardsfolder/n/nazgul.txt b/forge-gui/res/cardsfolder/n/nazgul.txt
index 5d677c07cde..437f46f4b4b 100644
--- a/forge-gui/res/cardsfolder/n/nazgul.txt
+++ b/forge-gui/res/cardsfolder/n/nazgul.txt
@@ -4,10 +4,10 @@ Types:Creature Wraith Knight
 PT:1/2
 K:Deathtouch
 K:DeckLimit:9:A deck can have up to nine cards named CARDNAME.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTempt | TriggerDescription$ When CARDNAME enters the battlefield, the Ring tempts you.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTempt | TriggerDescription$ When CARDNAME enters, the Ring tempts you.
 SVar:TrigTempt:DB$ RingTemptsYou
 T:Mode$ RingTemptsYou | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCounters | TriggerDescription$ Whenever the Ring tempts you, put a +1/+1 counter on each Wraith you control.
 SVar:TrigCounters:DB$ PutCounterAll | ValidCards$ Creature.Wraith+YouCtrl | CounterType$ P1P1 | CounterNum$ 1
 DeckNeeds:Name$Nazgûl
 DeckHas:Ability$Token
-Oracle:Deathtouch\nWhen Nazgûl enters the battlefield, the Ring tempts you.\nWhenever the Ring tempts you, put a +1/+1 counter on each Wraith you control.\nA deck can have up to nine cards named Nazgûl.
+Oracle:Deathtouch\nWhen Nazgûl enters, the Ring tempts you.\nWhenever the Ring tempts you, put a +1/+1 counter on each Wraith you control.\nA deck can have up to nine cards named Nazgûl.
diff --git a/forge-gui/res/cardsfolder/n/nearheath_pilgrim.txt b/forge-gui/res/cardsfolder/n/nearheath_pilgrim.txt
index ef28d34118f..13e7d6828e9 100644
--- a/forge-gui/res/cardsfolder/n/nearheath_pilgrim.txt
+++ b/forge-gui/res/cardsfolder/n/nearheath_pilgrim.txt
@@ -4,4 +4,4 @@ Types:Creature Human Cleric
 PT:2/1
 K:Soulbond
 S:Mode$ Continuous | Affected$ Creature.PairedWith,Creature.Self+Paired | AddKeyword$ Lifelink | Description$ As long as CARDNAME is paired with another creature, both creatures have lifelink.
-Oracle:Soulbond (You may pair this creature with another unpaired creature when either enters the battlefield. They remain paired for as long as you control both of them.)\nAs long as Nearheath Pilgrim is paired with another creature, both creatures have lifelink.
+Oracle:Soulbond (You may pair this creature with another unpaired creature when either enters. They remain paired for as long as you control both of them.)\nAs long as Nearheath Pilgrim is paired with another creature, both creatures have lifelink.
diff --git a/forge-gui/res/cardsfolder/n/nebelgast_herald.txt b/forge-gui/res/cardsfolder/n/nebelgast_herald.txt
index a64fec825c6..1378fe1393d 100644
--- a/forge-gui/res/cardsfolder/n/nebelgast_herald.txt
+++ b/forge-gui/res/cardsfolder/n/nebelgast_herald.txt
@@ -4,8 +4,8 @@ Types:Creature Spirit
 PT:2/1
 K:Flash
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Spirit.YouCtrl+Other | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME or another Spirit enters the battlefield under your control, tap target creature an opponent controls.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Spirit.YouCtrl+Other | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME or another Spirit you control enters, tap target creature an opponent controls.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls.
 SVar:BuffedBy:Spirit
 DeckHints:Type$Spirit
-Oracle:Flash (You may cast this spell any time you could cast an instant.)\nFlying\nWhenever Nebelgast Herald or another Spirit enters the battlefield under your control, tap target creature an opponent controls.
+Oracle:Flash (You may cast this spell any time you could cast an instant.)\nFlying\nWhenever Nebelgast Herald or another Spirit you control enters, tap target creature an opponent controls.
diff --git a/forge-gui/res/cardsfolder/n/nebelgast_intruder.txt b/forge-gui/res/cardsfolder/n/nebelgast_intruder.txt
index 7847a45415a..a3221331710 100644
--- a/forge-gui/res/cardsfolder/n/nebelgast_intruder.txt
+++ b/forge-gui/res/cardsfolder/n/nebelgast_intruder.txt
@@ -4,6 +4,6 @@ Types:Creature Spirit
 PT:2/1
 K:Flash
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBPump | TriggerDescription$ When CARDNAME enters the battlefield, up to one target creature an opponent controls gets -2/-0 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBPump | TriggerDescription$ When CARDNAME enters, up to one target creature an opponent controls gets -2/-0 until end of turn.
 SVar:DBPump:DB$ Pump | NumAtt$ -2 | IsCurse$ True | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature opponent controls
-Oracle:Flash\nFlying\nWhen Nebelgast Intruder enters the battlefield, up to one target creature an opponent controls gets -2/-0 until end of turn.
+Oracle:Flash\nFlying\nWhen Nebelgast Intruder enters, up to one target creature an opponent controls gets -2/-0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/n/necravolver.txt b/forge-gui/res/cardsfolder/n/necravolver.txt
index 17552bec7c1..a5e2e0de23b 100644
--- a/forge-gui/res/cardsfolder/n/necravolver.txt
+++ b/forge-gui/res/cardsfolder/n/necravolver.txt
@@ -5,9 +5,9 @@ PT:2/2
 K:Kicker:1 G:W
 K:ETBReplacement:Other:VolverStrength:Mandatory::Card.Self+kicked 1
 K:ETBReplacement:Other:VolverPumped:Mandatory::Card.Self+kicked 2
-SVar:VolverStrength:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2 | ETB$ True | SubAbility$ VolverStomp | SpellDescription$ If CARDNAME was kicked with its {1}{G} kicker, it enters the battlefield with two +1/+1 counters on it and with trample.
+SVar:VolverStrength:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 2 | ETB$ True | SubAbility$ VolverStomp | SpellDescription$ If CARDNAME was kicked with its {1}{G} kicker, it enters with two +1/+1 counters on it and with trample.
 SVar:VolverStomp:DB$ Animate | Defined$ Self | Keywords$ Trample | Duration$ Permanent
-SVar:VolverPumped:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ETB$ True | SubAbility$ VolverLife | SpellDescription$ If CARDNAME was kicked with its {W} kicker, it enters the battlefield with a +1/+1 counter on it and with "Whenever CARDNAME deals damage, you gain that much life."
+SVar:VolverPumped:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ETB$ True | SubAbility$ VolverLife | SpellDescription$ If CARDNAME was kicked with its {W} kicker, it enters with a +1/+1 counter on it and with "Whenever CARDNAME deals damage, you gain that much life."
 SVar:VolverLife:DB$ Animate | Defined$ Self | Triggers$ PseudoLifelink | Duration$ Permanent
 SVar:PseudoLifelink:Mode$ DamageDealtOnce | ValidSource$ Card.Self | Execute$ VolverTrigGain | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
 SVar:VolverTrigGain:DB$ GainLife | Defined$ You | LifeAmount$ VolverX
@@ -15,4 +15,4 @@ SVar:VolverX:TriggerCount$DamageAmount
 AI:RemoveDeck:Random
 DeckNeeds:Color$Green|White
 DeckHas:Ability$Counters
-Oracle:Kicker {1}{G} and/or {W} (You may pay an additional {1}{G} and/or {W} as you cast this spell.)\nIf Necravolver was kicked with its {1}{G} kicker, it enters the battlefield with two +1/+1 counters on it and with trample.\nIf Necravolver was kicked with its {W} kicker, it enters the battlefield with a +1/+1 counter on it and with "Whenever Necravolver deals damage, you gain that much life."
+Oracle:Kicker {1}{G} and/or {W} (You may pay an additional {1}{G} and/or {W} as you cast this spell.)\nIf Necravolver was kicked with its {1}{G} kicker, it enters with two +1/+1 counters on it and with trample.\nIf Necravolver was kicked with its {W} kicker, it enters with a +1/+1 counter on it and with "Whenever Necravolver deals damage, you gain that much life."
diff --git a/forge-gui/res/cardsfolder/n/necroblossom_snarl.txt b/forge-gui/res/cardsfolder/n/necroblossom_snarl.txt
index d9b255ddd0e..f60f4ac82f7 100644
--- a/forge-gui/res/cardsfolder/n/necroblossom_snarl.txt
+++ b/forge-gui/res/cardsfolder/n/necroblossom_snarl.txt
@@ -1,7 +1,7 @@
 Name:Necroblossom Snarl
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:DBTap
-SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Swamp,Forest/Swamp or Forest> | UnlessPayer$ You | StackDescription$ enters the battlefield tapped. | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Swamp or Forest card from your hand. If you don't, CARDNAME enters the battlefield tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ DBTap | ReplacementResult$ Updated | Description$ As CARDNAME enters, you may reveal a Swamp or Forest card from your hand. If you don't, CARDNAME enters tapped.
+SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | UnlessCost$ Reveal<1/Swamp,Forest/Swamp or Forest> | UnlessPayer$ You | StackDescription$ enters tapped.
 A:AB$ Mana | Cost$ T | Produced$ Combo B G | SpellDescription$ Add {B} or {G}.
-Oracle:As Necroblossom Snarl enters the battlefield, you may reveal a Swamp or Forest card from your hand. If you don't, Necroblossom Snarl enters the battlefield tapped.\n{T}: Add {B} or {G}.
+Oracle:As Necroblossom Snarl enters, you may reveal a Swamp or Forest card from your hand. If you don't, Necroblossom Snarl enters tapped.\n{T}: Add {B} or {G}.
diff --git a/forge-gui/res/cardsfolder/n/necroduality.txt b/forge-gui/res/cardsfolder/n/necroduality.txt
index 2c6af89fada..3c45b664e33 100644
--- a/forge-gui/res/cardsfolder/n/necroduality.txt
+++ b/forge-gui/res/cardsfolder/n/necroduality.txt
@@ -1,9 +1,9 @@
 Name:Necroduality
 ManaCost:3 U
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Zombie.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever a nontoken Zombie enters the battlefield under your control, create a token that's a copy of that creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Zombie.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever a nontoken Zombie you control enters, create a token that's a copy of that creature.
 SVar:TrigCopy:DB$ CopyPermanent | Defined$ TriggeredCardLKICopy
 DeckNeeds:Type$Zombie
 DeckHas:Ability$Token
 AI:RemoveDeck:Random
-Oracle:Whenever a nontoken Zombie enters the battlefield under your control, create a token that's a copy of that creature.
+Oracle:Whenever a nontoken Zombie you control enters, create a token that's a copy of that creature.
diff --git a/forge-gui/res/cardsfolder/n/necrogen_censer.txt b/forge-gui/res/cardsfolder/n/necrogen_censer.txt
index b31fcbfd95f..ed41706309e 100644
--- a/forge-gui/res/cardsfolder/n/necrogen_censer.txt
+++ b/forge-gui/res/cardsfolder/n/necrogen_censer.txt
@@ -3,4 +3,4 @@ ManaCost:3
 Types:Artifact
 K:etbCounter:CHARGE:2
 A:AB$ LoseLife | Cost$ T SubCounter<1/CHARGE> | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 2 | SpellDescription$ Target player loses 2 life.
-Oracle:Necrogen Censer enters the battlefield with two charge counters on it.\n{T}, Remove a charge counter from Necrogen Censer: Target player loses 2 life.
+Oracle:Necrogen Censer enters with two charge counters on it.\n{T}, Remove a charge counter from Necrogen Censer: Target player loses 2 life.
diff --git a/forge-gui/res/cardsfolder/n/necrogen_scudder.txt b/forge-gui/res/cardsfolder/n/necrogen_scudder.txt
index 4505d127228..70eea2f899b 100644
--- a/forge-gui/res/cardsfolder/n/necrogen_scudder.txt
+++ b/forge-gui/res/cardsfolder/n/necrogen_scudder.txt
@@ -3,6 +3,6 @@ ManaCost:2 B
 Types:Creature Phyrexian Horror
 PT:3/3
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME enters the battlefield, you lose 3 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME enters, you lose 3 life.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 3
-Oracle:Flying\nWhen Necrogen Scudder enters the battlefield, you lose 3 life.
+Oracle:Flying\nWhen Necrogen Scudder enters, you lose 3 life.
diff --git a/forge-gui/res/cardsfolder/n/necromancers_assistant.txt b/forge-gui/res/cardsfolder/n/necromancers_assistant.txt
index 94c237ca663..6a224ae13db 100644
--- a/forge-gui/res/cardsfolder/n/necromancers_assistant.txt
+++ b/forge-gui/res/cardsfolder/n/necromancers_assistant.txt
@@ -2,7 +2,7 @@ Name:Necromancer's Assistant
 ManaCost:2 B
 Types:Creature Zombie
 PT:3/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, mill three cards.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters, mill three cards.
 SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ You
 DeckHints:Ability$Graveyard
-Oracle:When Necromancer's Assistant enters the battlefield, mill three cards.
+Oracle:When Necromancer's Assistant enters, mill three cards.
diff --git a/forge-gui/res/cardsfolder/n/necromancers_covenant.txt b/forge-gui/res/cardsfolder/n/necromancers_covenant.txt
index 55c4db169b6..1d0af2535aa 100644
--- a/forge-gui/res/cardsfolder/n/necromancers_covenant.txt
+++ b/forge-gui/res/cardsfolder/n/necromancers_covenant.txt
@@ -1,11 +1,11 @@
 Name:Necromancer's Covenant
 ManaCost:3 W B B
 Types:Enchantment
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, exile all creature cards from target player's graveyard, then create a 2/2 black Zombie creature token for each card exiled this way.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, exile all creature cards from target player's graveyard, then create a 2/2 black Zombie creature token for each card exiled this way.
 SVar:TrigChange:DB$ ChangeZoneAll | ValidTgts$ Player | TgtPrompt$ Select target player | Origin$ Graveyard | Destination$ Exile | ChangeType$ Creature | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenScript$ b_2_2_zombie | TokenOwner$ You | TokenAmount$ X | SubAbility$ DBClearRemember
 S:Mode$ Continuous | Affected$ Zombie.YouCtrl | AddKeyword$ Lifelink | Description$ Zombies you control have lifelink.
 SVar:DBClearRemember:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:PlayMain1:TRUE
-Oracle:When Necromancer's Covenant enters the battlefield, exile all creature cards from target player's graveyard, then create a 2/2 black Zombie creature token for each card exiled this way.\nZombies you control have lifelink.
+Oracle:When Necromancer's Covenant enters, exile all creature cards from target player's graveyard, then create a 2/2 black Zombie creature token for each card exiled this way.\nZombies you control have lifelink.
diff --git a/forge-gui/res/cardsfolder/n/necromancy.txt b/forge-gui/res/cardsfolder/n/necromancy.txt
index 0826b934ea2..2ed5e7647f0 100644
--- a/forge-gui/res/cardsfolder/n/necromancy.txt
+++ b/forge-gui/res/cardsfolder/n/necromancy.txt
@@ -2,7 +2,7 @@ Name:Necromancy
 ManaCost:2 B
 Types:Enchantment
 K:MayFlashSac
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ RaiseDead | TriggerDescription$ When CARDNAME enters the battlefield, if it's on the battlefield, it becomes an Aura with "enchant creature put onto the battlefield with CARDNAME." Put target creature card from a graveyard onto the battlefield under your control and attach CARDNAME to it. When CARDNAME leaves the battlefield, that creature's controller sacrifices it. When CARDNAME leaves the battlefield, that creature's controller sacrifices it.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ RaiseDead | TriggerDescription$ When CARDNAME enters, if it's on the battlefield, it becomes an Aura with "enchant creature put onto the battlefield with CARDNAME." Put target creature card from a graveyard onto the battlefield under your control and attach CARDNAME to it. When CARDNAME leaves the battlefield, that creature's controller sacrifices it. When CARDNAME leaves the battlefield, that creature's controller sacrifices it.
 SVar:RaiseDead:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | RememberChanged$ True | TgtPrompt$ Select target creature card in a graveyard | ValidTgts$ Creature | ChangeNum$ 1 | SubAbility$ Aurify
 SVar:Aurify:DB$ Animate | IsPresent$ Card.Self | Types$ Aura | OverwriteSpells$ True | Abilities$ NewAttach | Keywords$ Enchant creature put onto the battlefield with CARDNAME | Duration$ Permanent | SubAbility$ NecromAttach
 SVar:NewAttach:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature.IsRemembered | AILogic$ Pump
@@ -13,4 +13,4 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.S
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:NeedsToPlayVar:Y GE1
 SVar:Y:Count$TypeInYourYard.Creature
-Oracle:You may cast Necromancy as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step.\nWhen Necromancy enters the battlefield, if it's on the battlefield, it becomes an Aura with "enchant creature put onto the battlefield with Necromancy." Put target creature card from a graveyard onto the battlefield under your control and attach Necromancy to it. When Necromancy leaves the battlefield, that creature's controller sacrifices it.
+Oracle:You may cast Necromancy as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step.\nWhen Necromancy enters, if it's on the battlefield, it becomes an Aura with "enchant creature put onto the battlefield with Necromancy." Put target creature card from a graveyard onto the battlefield under your control and attach Necromancy to it. When Necromancy leaves the battlefield, that creature's controller sacrifices it.
diff --git a/forge-gui/res/cardsfolder/n/necromantic_summons.txt b/forge-gui/res/cardsfolder/n/necromantic_summons.txt
index bf041e0b791..5fd8f15e68d 100644
--- a/forge-gui/res/cardsfolder/n/necromantic_summons.txt
+++ b/forge-gui/res/cardsfolder/n/necromantic_summons.txt
@@ -1,7 +1,7 @@
 Name:Necromantic Summons
 ManaCost:4 B
 Types:Sorcery
-A:SP$ ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature card in a graveyard | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ P1P1 | WithCountersAmount$ Y | GainControl$ True | SpellDescription$ Put target creature card from a graveyard onto the battlefield under your control. Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, that creature enters the battlefield with two additional +1/+1 counters on it.
+A:SP$ ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature card in a graveyard | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ P1P1 | WithCountersAmount$ Y | GainControl$ True | SpellDescription$ Put target creature card from a graveyard onto the battlefield under your control. Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, that creature enters with two additional +1/+1 counters on it.
 SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn
 SVar:Y:Count$Compare X GE2.2.0
-Oracle:Put target creature card from a graveyard onto the battlefield under your control.\nSpell mastery — If there are two or more instant and/or sorcery cards in your graveyard, that creature enters the battlefield with two additional +1/+1 counters on it.
+Oracle:Put target creature card from a graveyard onto the battlefield under your control.\nSpell mastery — If there are two or more instant and/or sorcery cards in your graveyard, that creature enters with two additional +1/+1 counters on it.
diff --git a/forge-gui/res/cardsfolder/n/necron_deathmark.txt b/forge-gui/res/cardsfolder/n/necron_deathmark.txt
index 3a9a6cc80c6..5df66dbb34a 100644
--- a/forge-gui/res/cardsfolder/n/necron_deathmark.txt
+++ b/forge-gui/res/cardsfolder/n/necron_deathmark.txt
@@ -3,8 +3,8 @@ ManaCost:3 B B
 Types:Artifact Creature Necron
 PT:5/3
 K:Flash
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ Synaptic Disintegrator — When CARDNAME enters the battlefield, destroy up to one target creature and target player mills three cards.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ Synaptic Disintegrator — When CARDNAME enters, destroy up to one target creature and target player mills three cards.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBMill
 SVar:DBMill:DB$ Mill | ValidTgts$ Player | NumCards$ 3
 DeckHas:Ability$Mill
-Oracle:Flash\nSynaptic Disintegrator — When Necron Deathmark enters the battlefield, destroy up to one target creature and target player mills three cards.
+Oracle:Flash\nSynaptic Disintegrator — When Necron Deathmark enters, destroy up to one target creature and target player mills three cards.
diff --git a/forge-gui/res/cardsfolder/n/necropouncer.txt b/forge-gui/res/cardsfolder/n/necropouncer.txt
index 66e61b9970e..1cd86bebca8 100644
--- a/forge-gui/res/cardsfolder/n/necropouncer.txt
+++ b/forge-gui/res/cardsfolder/n/necropouncer.txt
@@ -5,4 +5,4 @@ K:Living Weapon
 K:Equip:2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 3 | AddToughness$ 1 | AddKeyword$ Haste | Description$ Equipped creature gets +3/+1 and has haste.
 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 +3/+1 and has haste.\nEquip {2}
+Oracle:Living weapon (When this Equipment enters, create a 0/0 black Phyrexian Germ creature token, then attach this to it.)\nEquipped creature gets +3/+1 and has haste.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/n/necrosquito.txt b/forge-gui/res/cardsfolder/n/necrosquito.txt
index d55149fcd3a..daa2240fec8 100644
--- a/forge-gui/res/cardsfolder/n/necrosquito.txt
+++ b/forge-gui/res/cardsfolder/n/necrosquito.txt
@@ -9,4 +9,4 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ OIL | CounterNum$ 1
 SVar:X:Count$CardCounters.OIL
 DeckHas:Ability$Counters
-Oracle:Flying\nNecrosquito enters the battlefield with two oil counters on it.\nNecrosquito gets +1/+1 for each oil counter on it.\nWhenever another creature or artifact you control is put into a graveyard from the battlefield, put an oil counter on Necrosquito.
+Oracle:Flying\nNecrosquito enters with two oil counters on it.\nNecrosquito gets +1/+1 for each oil counter on it.\nWhenever another creature or artifact you control is put into a graveyard from the battlefield, put an oil counter on Necrosquito.
diff --git a/forge-gui/res/cardsfolder/n/needle_spires.txt b/forge-gui/res/cardsfolder/n/needle_spires.txt
index dc49d2c26b5..51b622c3afa 100644
--- a/forge-gui/res/cardsfolder/n/needle_spires.txt
+++ b/forge-gui/res/cardsfolder/n/needle_spires.txt
@@ -1,7 +1,8 @@
 Name:Needle Spires
 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 R W | SpellDescription$ Add {R} or {W}.
 A:AB$ Animate | Cost$ 2 R W | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Creature,Elemental | Colors$ Red,White | OverwriteColors$ True | Keywords$ Double Strike | SpellDescription$ CARDNAME becomes a 2/1 red and white Elemental creature with double strike until end of turn. It's still a land.
-Oracle:Needle Spires enters the battlefield tapped.\n{T}: Add {R} or {W}.\n{2}{R}{W}: Needle Spires becomes a 2/1 red and white Elemental creature with double strike until end of turn. It's still a land.
+Oracle:Needle Spires enters tapped.\n{T}: Add {R} or {W}.\n{2}{R}{W}: Needle Spires becomes a 2/1 red and white Elemental creature with double strike until end of turn. It's still a land.
diff --git a/forge-gui/res/cardsfolder/n/negan_the_cold_blooded.txt b/forge-gui/res/cardsfolder/n/negan_the_cold_blooded.txt
index 70b51797333..d2c8f3f7012 100644
--- a/forge-gui/res/cardsfolder/n/negan_the_cold_blooded.txt
+++ b/forge-gui/res/cardsfolder/n/negan_the_cold_blooded.txt
@@ -3,7 +3,7 @@ AltName:Malik, Grim Manipulator
 ManaCost:2 R W B
 Types:Legendary Creature Human Rogue
 PT:4/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTgtOpp | TriggerDescription$ When NICKNAME enters the battlefield, you and target opponent each secretly choose a creature that player controls. Then those choices are revealed, and that player sacrifices those creatures.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTgtOpp | TriggerDescription$ When NICKNAME enters, you and target opponent each secretly choose a creature that player controls. Then those choices are revealed, and that player sacrifices those creatures.
 SVar:TrigTgtOpp:DB$ Pump | ValidTgts$ Player | TgtPrompt$ Select target opponent | IsCurse$ True | RememberTargets$ True | SubAbility$ DBYouChoose
 SVar:DBYouChoose:DB$ ChooseCard | Defined$ You | Amount$ 1 | Mandatory$ True | Choices$ Creature.RememberedPlayerCtrl | RememberChosen$ True | SubAbility$ DBOppChoose
 SVar:DBOppChoose:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Mandatory$ True | Choices$ Creature.RememberedPlayerCtrl | SubAbility$ DBReveal
@@ -14,4 +14,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
 T:Mode$ Sacrificed | ValidCard$ Creature.OppCtrl | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent sacrifices a creature, you create a Treasure token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
 DeckHas:Ability$Token
-Oracle:When Negan enters the battlefield, you and target opponent each secretly choose a creature that player controls. Then those choices are revealed, and that player sacrifices those creatures.\nWhenever an opponent sacrifices a creature, you create a Treasure token.
+Oracle:When Negan enters, you and target opponent each secretly choose a creature that player controls. Then those choices are revealed, and that player sacrifices those creatures.\nWhenever an opponent sacrifices a creature, you create a Treasure token.
diff --git a/forge-gui/res/cardsfolder/n/neighborhood_guardian.txt b/forge-gui/res/cardsfolder/n/neighborhood_guardian.txt
index f23d3b8d569..78eda953b55 100644
--- a/forge-gui/res/cardsfolder/n/neighborhood_guardian.txt
+++ b/forge-gui/res/cardsfolder/n/neighborhood_guardian.txt
@@ -2,6 +2,6 @@ Name:Neighborhood Guardian
 ManaCost:1 W
 Types:Creature Unicorn
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerLE2+YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another creature with power 2 or less enters the battlefield under your control, target creature you control gets +1/+1 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.powerLE2+YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another creature you control with power 2 or less enters, target creature you control gets +1/+1 until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +1 | NumDef$ +1
-Oracle:Whenever another creature with power 2 or less enters the battlefield under your control, target creature you control gets +1/+1 until end of turn.
+Oracle:Whenever another creature you control with power 2 or less enters, target creature you control gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/n/nekrataal.txt b/forge-gui/res/cardsfolder/n/nekrataal.txt
index add20eab8a3..afa2a68f0d4 100644
--- a/forge-gui/res/cardsfolder/n/nekrataal.txt
+++ b/forge-gui/res/cardsfolder/n/nekrataal.txt
@@ -3,7 +3,7 @@ ManaCost:2 B B
 Types:Creature Human Assassin
 PT:2/1
 K:First Strike
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target nonartifact, nonblack creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy target nonartifact, nonblack creature.
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Creature.nonArtifact+nonBlack | NoRegen$ True | TgtPrompt$ Select target nonartifact, nonblack creature.
 SVar:PlayMain1:TRUE
-Oracle:First strike\nWhen Nekrataal enters the battlefield, destroy target nonartifact, nonblack creature. That creature can't be regenerated.
+Oracle:First strike\nWhen Nekrataal enters, destroy target nonartifact, nonblack creature. That creature can't be regenerated.
diff --git a/forge-gui/res/cardsfolder/n/nemesis_mask.txt b/forge-gui/res/cardsfolder/n/nemesis_mask.txt
index e38207748c2..b4441c4f1a6 100644
--- a/forge-gui/res/cardsfolder/n/nemesis_mask.txt
+++ b/forge-gui/res/cardsfolder/n/nemesis_mask.txt
@@ -3,4 +3,4 @@ ManaCost:3
 Types:Artifact Equipment
 K:Equip:3
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddHiddenKeyword$ All creatures able to block CARDNAME do so. | Description$ All creatures able to block equipped creature do so.
-Oracle:All creatures able to block equipped creature do so.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
+Oracle:All creatures able to block equipped creature do so.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card enters unattached and stays on the battlefield if the creature leaves.)
diff --git a/forge-gui/res/cardsfolder/n/nephalia_moondrakes.txt b/forge-gui/res/cardsfolder/n/nephalia_moondrakes.txt
index 3e5c90f7dbe..7ff03cc1b9e 100644
--- a/forge-gui/res/cardsfolder/n/nephalia_moondrakes.txt
+++ b/forge-gui/res/cardsfolder/n/nephalia_moondrakes.txt
@@ -3,8 +3,8 @@ ManaCost:5 U U
 Types:Creature Drake
 PT:5/5
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gains flying until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature gains flying until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying
 A:AB$ PumpAll | Cost$ 4 U U ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | ValidCards$ Creature.YouCtrl | KW$ Flying | SpellDescription$ Creatures you control gain flying until end of turn.
 SVar:PlayMain1:TRUE
-Oracle:Flying\nWhen Nephalia Moondrakes enters the battlefield, target creature gains flying until end of turn.\n{4}{U}{U}, Exile Nephalia Moondrakes from your graveyard: Creatures you control gain flying until end of turn.
+Oracle:Flying\nWhen Nephalia Moondrakes enters, target creature gains flying until end of turn.\n{4}{U}{U}, Exile Nephalia Moondrakes from your graveyard: Creatures you control gain flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/n/nerd_rage.txt b/forge-gui/res/cardsfolder/n/nerd_rage.txt
index 60ca536ce77..0d05e0f630b 100644
--- a/forge-gui/res/cardsfolder/n/nerd_rage.txt
+++ b/forge-gui/res/cardsfolder/n/nerd_rage.txt
@@ -3,11 +3,11 @@ ManaCost:2 U
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ FreeCard | TriggerDescription$ When CARDNAME enters the battlefield, draw two cards.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ FreeCard | TriggerDescription$ When CARDNAME enters, draw two cards.
 SVar:FreeCard:DB$ Draw | Defined$ You | NumCards$ 2
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddStaticAbility$ NoMaxHandSize | AddTrigger$ AttackTrig | Description$ Enchanted creature has "You have no maximum hand size" and "Whenever this creature attacks, if you have ten or more cards in hand, it gets +10/+10 until end of turn."
 SVar:NoMaxHandSize:Mode$ Continuous | Affected$ You | SetMaxHandSize$ Unlimited | Description$ You have no maximum hand size.
 SVar:AttackTrig:Mode$ Attacks | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE10 | Execute$ TrigPump | TriggerDescription$ Whenever this creature attacks, if you have ten or more cards in hand, it gets +10/+10 until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 10 | NumDef$ 10
 SVar:X:Count$CardsInYourHand
-Oracle:Enchant creature\nWhen Nerd Rage enters the battlefield, draw two cards.\nEnchanted creature has "You have no maximum hand size" and "Whenever this creature attacks, if you have ten or more cards in hand, it gets +10/+10 until end of turn."
+Oracle:Enchant creature\nWhen Nerd Rage enters, draw two cards.\nEnchanted creature has "You have no maximum hand size" and "Whenever this creature attacks, if you have ten or more cards in hand, it gets +10/+10 until end of turn."
diff --git a/forge-gui/res/cardsfolder/n/nessian_demolok.txt b/forge-gui/res/cardsfolder/n/nessian_demolok.txt
index 270e0de8525..d3a257992bf 100644
--- a/forge-gui/res/cardsfolder/n/nessian_demolok.txt
+++ b/forge-gui/res/cardsfolder/n/nessian_demolok.txt
@@ -3,7 +3,7 @@ ManaCost:3 G G
 Types:Creature Beast
 PT:3/3
 K:Tribute:3
-SVar:TrigNotTribute:DB$ Destroy | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select target noncreature permanent | SpellDescription$ When CARDNAME enters the battlefield, if tribute wasn't paid, destroy target noncreature permanent.
+SVar:TrigNotTribute:DB$ Destroy | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select target noncreature permanent | SpellDescription$ When CARDNAME enters, if tribute wasn't paid, destroy target noncreature permanent.
 SVar:TributeAILogic:Always
 DeckHas:Ability$Counters
-Oracle:Tribute 3 (As this creature enters the battlefield, an opponent of your choice may put three +1/+1 counters on it.)\nWhen Nessian Demolok enters the battlefield, if tribute wasn't paid, destroy target noncreature permanent.
+Oracle:Tribute 3 (As this creature enters, an opponent of your choice may put three +1/+1 counters on it.)\nWhen Nessian Demolok enters, if tribute wasn't paid, destroy target noncreature permanent.
diff --git a/forge-gui/res/cardsfolder/n/nessian_game_warden.txt b/forge-gui/res/cardsfolder/n/nessian_game_warden.txt
index 06f9f33ee57..0740d9fee6d 100644
--- a/forge-gui/res/cardsfolder/n/nessian_game_warden.txt
+++ b/forge-gui/res/cardsfolder/n/nessian_game_warden.txt
@@ -2,7 +2,7 @@ Name:Nessian Game Warden
 ManaCost:3 G G
 Types:Creature Beast
 PT:4/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top X cards of your library, where X is the number of forests you control. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters, look at the top X cards of your library, where X is the number of forests you control. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
 SVar:TrigDig:DB$ Dig | DigNum$ X | ChangeNum$ 1 | Optional$ True | ChangeValid$ Creature
 SVar:X:Count$Valid Forest.YouCtrl
-Oracle:When Nessian Game Warden enters the battlefield, look at the top X cards of your library, where X is the number of Forests you control. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
+Oracle:When Nessian Game Warden enters, look at the top X cards of your library, where X is the number of Forests you control. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
diff --git a/forge-gui/res/cardsfolder/n/nessian_wanderer.txt b/forge-gui/res/cardsfolder/n/nessian_wanderer.txt
index 2de94c58eac..e43be395ff1 100644
--- a/forge-gui/res/cardsfolder/n/nessian_wanderer.txt
+++ b/forge-gui/res/cardsfolder/n/nessian_wanderer.txt
@@ -2,7 +2,7 @@ Name:Nessian Wanderer
 ManaCost:1 G
 Types:Creature Satyr Scout
 PT:1/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ Constellation — Whenever an enchantment enters the battlefield under your control, look at the top three cards of your library. You may reveal a land 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$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ Constellation — Whenever an enchantment you control enters, look at the top three cards of your library. You may reveal a land 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$ 3 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Land | ForceRevealToController$ True | DestinationZone$ Hand | RestRandomOrder$ True
 DeckNeeds:Type$Enchantment
-Oracle:Constellation — Whenever an enchantment enters the battlefield under your control, look at the top three cards of your library. You may reveal a land 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:Constellation — Whenever an enchantment you control enters, look at the top three cards of your library. You may reveal a land 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/n/nessian_wilds_ravager.txt b/forge-gui/res/cardsfolder/n/nessian_wilds_ravager.txt
index 67e22d45881..22d9c3b3708 100644
--- a/forge-gui/res/cardsfolder/n/nessian_wilds_ravager.txt
+++ b/forge-gui/res/cardsfolder/n/nessian_wilds_ravager.txt
@@ -3,7 +3,7 @@ ManaCost:4 G G
 Types:Creature Hydra
 PT:6/6
 K:Tribute:6
-SVar:TrigNotTribute:DB$ Fight | Optional$ True | Defined$ Self | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature | SpellDescription$ When CARDNAME enters the battlefield, if tribute wasn't paid, you may have CARDNAME fight another target creature.
+SVar:TrigNotTribute:DB$ Fight | Optional$ True | Defined$ Self | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature | SpellDescription$ When CARDNAME enters, if tribute wasn't paid, you may have CARDNAME fight another target creature.
 SVar:TributeAILogic:Never
 DeckHas:Ability$Counters
-Oracle:Tribute 6 (As this creature enters the battlefield, an opponent of your choice may put six +1/+1 counters on it.)\nWhen Nessian Wilds Ravager enters the battlefield, if tribute wasn't paid, you may have Nessian Wilds Ravager fight another target creature. (Each deals damage equal to its power to the other.)
+Oracle:Tribute 6 (As this creature enters, an opponent of your choice may put six +1/+1 counters on it.)\nWhen Nessian Wilds Ravager enters, if tribute wasn't paid, you may have Nessian Wilds Ravager fight another target creature. (Each deals damage equal to its power to the other.)
diff --git a/forge-gui/res/cardsfolder/n/nest_invader.txt b/forge-gui/res/cardsfolder/n/nest_invader.txt
index a9059cd58ba..ccfa02868e6 100644
--- a/forge-gui/res/cardsfolder/n/nest_invader.txt
+++ b/forge-gui/res/cardsfolder/n/nest_invader.txt
@@ -2,8 +2,8 @@ Name:Nest Invader
 ManaCost:1 G
 Types:Creature Eldrazi Drone
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_0_1_eldrazi_spawn_sac | TokenOwner$ You
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless|Token
-Oracle:When Nest Invader enters the battlefield, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
+Oracle:When Nest Invader enters, create a 0/1 colorless Eldrazi Spawn creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/n/nesting_dovehawk.txt b/forge-gui/res/cardsfolder/n/nesting_dovehawk.txt
index afa5a854e78..192d7e1e539 100644
--- a/forge-gui/res/cardsfolder/n/nesting_dovehawk.txt
+++ b/forge-gui/res/cardsfolder/n/nesting_dovehawk.txt
@@ -5,8 +5,8 @@ PT:2/2
 K:Flying
 T:Mode$ Phase | Phase$ BeginCombat | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigPopulate | TriggerDescription$ At the beginning of combat on your turn, populate. (Create a token that's a copy of a creature token you control.)
 SVar:TrigPopulate:DB$ CopyPermanent | Choices$ Creature.token+YouCtrl | Populate$ True
-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 CARDNAME.
+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 CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters & Ability$Token
 DeckNeeds:Ability$Token
-Oracle:Flying\nAt the beginning of combat on your turn, populate. (Create a token that's a copy of a creature token you control.)\nWhenever a creature token enters the battlefield under your control, put a +1/+1 counter on Nesting Dovehawk.
+Oracle:Flying\nAt the beginning of combat on your turn, populate. (Create a token that's a copy of a creature token you control.)\nWhenever a creature token you control enters, put a +1/+1 counter on Nesting Dovehawk.
diff --git a/forge-gui/res/cardsfolder/n/nesting_dragon.txt b/forge-gui/res/cardsfolder/n/nesting_dragon.txt
index eca97e7da3f..138b52f74c4 100644
--- a/forge-gui/res/cardsfolder/n/nesting_dragon.txt
+++ b/forge-gui/res/cardsfolder/n/nesting_dragon.txt
@@ -3,6 +3,6 @@ ManaCost:3 R R
 Types:Creature Dragon
 PT:5/4
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, create a 0/2 red Dragon creature token with defender and "When this creature dies, create a 2/2 red Dragon creature token with flying and '{R}: This creature gets +1/+0 until end of turn.'"
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Landfall — Whenever a land you control enters, create a 0/2 red Dragon creature token with defender and "When this creature dies, create a 2/2 red Dragon creature token with flying and '{R}: This creature gets +1/+0 until end of turn.'"
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenOwner$ You | TokenScript$ r_0_2_dragon_egg_defender_hatches_dragon
-Oracle:Flying\nLandfall — Whenever a land enters the battlefield under your control, create a 0/2 red Dragon Egg creature token with defender and "When this creature dies, create a 2/2 red Dragon creature token with flying and '{R}: This creature gets +1/+0 until end of turn.'"
+Oracle:Flying\nLandfall — Whenever a land you control enters, create a 0/2 red Dragon Egg creature token with defender and "When this creature dies, create a 2/2 red Dragon creature token with flying and '{R}: This creature gets +1/+0 until end of turn.'"
diff --git a/forge-gui/res/cardsfolder/n/nesting_wurm.txt b/forge-gui/res/cardsfolder/n/nesting_wurm.txt
index 9ae656008e0..d4165e3ff2b 100644
--- a/forge-gui/res/cardsfolder/n/nesting_wurm.txt
+++ b/forge-gui/res/cardsfolder/n/nesting_wurm.txt
@@ -3,7 +3,7 @@ ManaCost:4 G G
 Types:Creature Wurm
 PT:4/3
 K:Trample
-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 up to three cards named Nesting Wurm, reveal them, put them 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 up to three cards named Nesting Wurm, reveal them, put them into your hand, then shuffle.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedNesting Wurm | ChangeNum$ 3 | ShuffleNonMandatory$ True
 DeckHints:Name$Nesting Wurm
-Oracle:Trample\nWhen Nesting Wurm enters the battlefield, you may search your library for up to three cards named Nesting Wurm, reveal them, put them into your hand, then shuffle.
+Oracle:Trample\nWhen Nesting Wurm enters, you may search your library for up to three cards named Nesting Wurm, reveal them, put them into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/n/netherborn_phalanx.txt b/forge-gui/res/cardsfolder/n/netherborn_phalanx.txt
index 1bf07464135..f4ebbcc31d9 100644
--- a/forge-gui/res/cardsfolder/n/netherborn_phalanx.txt
+++ b/forge-gui/res/cardsfolder/n/netherborn_phalanx.txt
@@ -3,8 +3,8 @@ ManaCost:5 B
 Types:Creature Horror
 PT:2/4
 K:Transmute:1 B B
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEachOpp | TriggerDescription$ When CARDNAME enters the battlefield, each opponent loses 1 life for each creature they control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEachOpp | TriggerDescription$ When CARDNAME enters, each opponent loses 1 life for each creature they control.
 SVar:TrigEachOpp:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ TrigLoseLife
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.IsRemembered | LifeAmount$ X
 SVar:X:Count$Valid Creature.RememberedPlayerCtrl
-Oracle:When Netherborn Phalanx enters the battlefield, each opponent loses 1 life for each creature they control.\nTransmute {1}{B}{B} ({1}{B}{B}, Discard this card: Search your library for a card with the same mana value as this card, reveal it, put it into your hand, then shuffle. Transmute only as a sorcery.)
+Oracle:When Netherborn Phalanx enters, each opponent loses 1 life for each creature they control.\nTransmute {1}{B}{B} ({1}{B}{B}, Discard this card: Search your library for a card with the same mana value as this card, reveal it, put it into your hand, then shuffle. Transmute only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/n/nettlecyst.txt b/forge-gui/res/cardsfolder/n/nettlecyst.txt
index 33bf248284d..7c78bb3945f 100644
--- a/forge-gui/res/cardsfolder/n/nettlecyst.txt
+++ b/forge-gui/res/cardsfolder/n/nettlecyst.txt
@@ -9,4 +9,4 @@ SVar:NeedsToPlayVar:X GE1
 SVar:BuffedBy:Artifact,Enchantment
 DeckHas:Ability$Token
 DeckHints:Type$Artifact|Enchantment
-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 for each artifact and/or enchantment you control.\nEquip {2}
+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 for each artifact and/or enchantment you control.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/n/network_disruptor.txt b/forge-gui/res/cardsfolder/n/network_disruptor.txt
index f049aef7526..0346ffa38db 100644
--- a/forge-gui/res/cardsfolder/n/network_disruptor.txt
+++ b/forge-gui/res/cardsfolder/n/network_disruptor.txt
@@ -3,6 +3,6 @@ ManaCost:U
 Types:Artifact Creature Moonfolk Rogue
 PT:1/1
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target permanent.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, tap target permanent.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Permanent | TgtPrompt$ Select target permanent
-Oracle:Flying\nWhen Network Disruptor enters the battlefield, tap target permanent.
+Oracle:Flying\nWhen Network Disruptor enters, tap target permanent.
diff --git a/forge-gui/res/cardsfolder/n/neurok_familiar.txt b/forge-gui/res/cardsfolder/n/neurok_familiar.txt
index b4acbef2e56..87a49562fea 100644
--- a/forge-gui/res/cardsfolder/n/neurok_familiar.txt
+++ b/forge-gui/res/cardsfolder/n/neurok_familiar.txt
@@ -3,6 +3,6 @@ ManaCost:1 U
 Types:Creature Bird
 PT:1/1
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, reveal the top card of your library. If it's an artifact card, put it into your hand. Otherwise, put it into your graveyard.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters, reveal the top card of your library. If it's an artifact card, put it into your hand. Otherwise, put it into your graveyard.
 SVar:TrigDig:DB$ Dig | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Artifact | DestinationZone2$ Graveyard
-Oracle:Flying\nWhen Neurok Familiar enters the battlefield, reveal the top card of your library. If it's an artifact card, put it into your hand. Otherwise, put it into your graveyard.
+Oracle:Flying\nWhen Neurok Familiar enters, reveal the top card of your library. If it's an artifact card, put it into your hand. Otherwise, put it into your graveyard.
diff --git a/forge-gui/res/cardsfolder/n/neurok_hoversail.txt b/forge-gui/res/cardsfolder/n/neurok_hoversail.txt
index 3f0c0789527..ea4e9252bcc 100644
--- a/forge-gui/res/cardsfolder/n/neurok_hoversail.txt
+++ b/forge-gui/res/cardsfolder/n/neurok_hoversail.txt
@@ -3,4 +3,4 @@ ManaCost:1
 Types:Artifact Equipment
 K:Equip:2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Flying | Description$ Equipped creature has flying.
-Oracle:Equipped creature has flying.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
+Oracle:Equipped creature has flying.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery. This card enters unattached and stays on the battlefield if the creature leaves.)
diff --git a/forge-gui/res/cardsfolder/n/neurok_invisimancer.txt b/forge-gui/res/cardsfolder/n/neurok_invisimancer.txt
index aad7e9a454a..bfff4ed283a 100644
--- a/forge-gui/res/cardsfolder/n/neurok_invisimancer.txt
+++ b/forge-gui/res/cardsfolder/n/neurok_invisimancer.txt
@@ -3,8 +3,8 @@ ManaCost:1 U U
 Types:Creature Human Wizard
 PT:2/1
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't be blocked.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigUnblockable | TriggerDescription$ When CARDNAME enters the battlefield, target creature can't be blocked this turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigUnblockable | TriggerDescription$ When CARDNAME enters, target creature can't be blocked this turn.
 SVar:TrigUnblockable:DB$ Effect | ValidTgts$ Creature | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 SVar:PlayMain1:TRUE
-Oracle:Neurok Invisimancer can't be blocked.\nWhen Neurok Invisimancer enters the battlefield, target creature can't be blocked this turn.
+Oracle:Neurok Invisimancer can't be blocked.\nWhen Neurok Invisimancer enters, target creature can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/n/neva_stalked_by_nightmares.txt b/forge-gui/res/cardsfolder/n/neva_stalked_by_nightmares.txt
index ae9895f2e77..0333f8f9701 100644
--- a/forge-gui/res/cardsfolder/n/neva_stalked_by_nightmares.txt
+++ b/forge-gui/res/cardsfolder/n/neva_stalked_by_nightmares.txt
@@ -3,11 +3,11 @@ ManaCost:2 W B
 Types:Legendary Creature Human Noble
 PT:2/2
 K:Menace
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return target creature or enchantment card from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters, return target creature or enchantment card from your graveyard to your hand.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl,Enchantment.YouCtrl | TgtPrompt$ Select target creature or enchantment you control in your graveyard
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an enchantment you control is put into a graveyard from the battlefield, put a +1/+1 counter on NICKNAME, then scry 1.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBScry
 SVar:DBScry:DB$ Scry | ScryNum$ 1
 DeckHas:Ability$Graveyard|Counters
 DeckHints:Type$Enchantment
-Oracle:Menace\nWhen Neva, Stalked by Nightmares enters the battlefield, return target creature or enchantment card from your graveyard to your hand.\nWhenever an enchantment you control is put into a graveyard from the battlefield, put a +1/+1 counter on Neva, then scry 1.
+Oracle:Menace\nWhen Neva, Stalked by Nightmares enters, return target creature or enchantment card from your graveyard to your hand.\nWhenever an enchantment you control is put into a graveyard from the battlefield, put a +1/+1 counter on Neva, then scry 1.
diff --git a/forge-gui/res/cardsfolder/n/nevermaker.txt b/forge-gui/res/cardsfolder/n/nevermaker.txt
index 5e79b922913..de23a1ae9b7 100644
--- a/forge-gui/res/cardsfolder/n/nevermaker.txt
+++ b/forge-gui/res/cardsfolder/n/nevermaker.txt
@@ -7,4 +7,4 @@ K:Evoke:3 U
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigBounce | TriggerDescription$ When CARDNAME leaves the battlefield, put target nonland permanent on top of its owner's library.
 SVar:TrigBounce:DB$ ChangeZone | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0
 SVar:NeedsToPlayEvoked:Card.nonLand+OppCtrl
-Oracle:Flying\nWhen Nevermaker leaves the battlefield, put target nonland permanent on top of its owner's library.\nEvoke {3}{U} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)
+Oracle:Flying\nWhen Nevermaker leaves the battlefield, put target nonland permanent on top of its owner's library.\nEvoke {3}{U} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters.)
diff --git a/forge-gui/res/cardsfolder/n/nevermore.txt b/forge-gui/res/cardsfolder/n/nevermore.txt
index 2578b116c90..b0e6338d3e9 100644
--- a/forge-gui/res/cardsfolder/n/nevermore.txt
+++ b/forge-gui/res/cardsfolder/n/nevermore.txt
@@ -2,7 +2,7 @@ Name:Nevermore
 ManaCost:1 W W
 Types:Enchantment
 K:ETBReplacement:Other:DBNameCard
-SVar:DBNameCard:DB$ NameCard | Defined$ You | ValidCards$ Card.nonLand | ValidDescription$ nonland | SpellDescription$ As CARDNAME enters the battlefield, choose a nonland card name.
+SVar:DBNameCard:DB$ NameCard | Defined$ You | ValidCards$ Card.nonLand | ValidDescription$ nonland | SpellDescription$ As CARDNAME enters, choose a nonland card name.
 S:Mode$ CantBeCast | ValidCard$ Card.NamedCard | Description$ Spells with the chosen name can't be cast.
 AI:RemoveDeck:Random
-Oracle:As Nevermore enters the battlefield, choose a nonland card name.\nSpells with the chosen name can't be cast.
+Oracle:As Nevermore enters, choose a nonland card name.\nSpells with the chosen name can't be cast.
diff --git a/forge-gui/res/cardsfolder/n/neverwinter_hydra.txt b/forge-gui/res/cardsfolder/n/neverwinter_hydra.txt
index 713a5e7ee19..8cce4e08d69 100644
--- a/forge-gui/res/cardsfolder/n/neverwinter_hydra.txt
+++ b/forge-gui/res/cardsfolder/n/neverwinter_hydra.txt
@@ -3,10 +3,10 @@ ManaCost:X X G G
 Types:Creature Hydra
 PT:0/0
 K:ETBReplacement:Other:RollCounters
-SVar:RollCounters:DB$ RollDice | Amount$ X | ETB$ True | ResultSVar$ Result | SubAbility$ DBCounters | SpellDescription$ As CARDNAME enters the battlefield, roll X d6. It enters the battlefield with a number of +1/+1 counters on it equal to the total of those results.
+SVar:RollCounters:DB$ RollDice | Amount$ X | ETB$ True | ResultSVar$ Result | SubAbility$ DBCounters | SpellDescription$ As CARDNAME enters, roll X d6. It enters with a number of +1/+1 counters on it equal to the total of those results.
 SVar:DBCounters:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ Result | ETB$ True
 K:Trample
 K:Ward:4
 SVar:X:Count$xPaid
 DeckHas:Ability$Counters
-Oracle:As Neverwinter Hydra enters the battlefield, roll X d6. It enters with a number of +1/+1 counters on it equal to the total of those results.\nTrample\nWard {4} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {4}.)
+Oracle:As Neverwinter Hydra enters, roll X d6. It enters with a number of +1/+1 counters on it equal to the total of those results.\nTrample\nWard {4} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {4}.)
diff --git a/forge-gui/res/cardsfolder/n/nevinyrral_urborg_tyrant.txt b/forge-gui/res/cardsfolder/n/nevinyrral_urborg_tyrant.txt
index 8eb25e51289..65f2d9fcf17 100644
--- a/forge-gui/res/cardsfolder/n/nevinyrral_urborg_tyrant.txt
+++ b/forge-gui/res/cardsfolder/n/nevinyrral_urborg_tyrant.txt
@@ -5,7 +5,7 @@ PT:3/6
 K:Hexproof:Card.Artifact:artifacts
 K:Hexproof:Card.Creature:creatures
 K:Hexproof:Card.Enchantment:enchantments
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a tapped 2/2 black Zombie creature token for each creature that died this turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a tapped 2/2 black Zombie creature token for each creature that died this turn.
 SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ b_2_2_zombie | TokenTapped$ True | TokenOwner$ You
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigPayCost | TriggerDescription$ When NICKNAME dies, you may pay {1}. When you do, destroy all artifacts, creatures, and enchantments.
@@ -13,4 +13,4 @@ SVar:TrigPayCost:AB$ ImmediateTrigger | Cost$ 1 | Execute$ TrigDestroy | Trigger
 SVar:TrigDestroy:DB$ DestroyAll | ValidCards$ Artifact,Creature,Enchantment
 DeckHas:Ability$Token
 SVar:NeedsToPlayVar:X GE1
-Oracle:Hexproof from artifacts, creatures, and enchantments\nWhen Nevinyrral, Urborg Tyrant enters the battlefield, create a tapped 2/2 black Zombie creature token for each creature that died this turn.\nWhen Nevinyrral dies, you may pay {1}. When you do, destroy all artifacts, creatures, and enchantments.
+Oracle:Hexproof from artifacts, creatures, and enchantments\nWhen Nevinyrral, Urborg Tyrant enters, create a tapped 2/2 black Zombie creature token for each creature that died this turn.\nWhen Nevinyrral dies, you may pay {1}. When you do, destroy all artifacts, creatures, and enchantments.
diff --git a/forge-gui/res/cardsfolder/n/nevinyrrals_disk.txt b/forge-gui/res/cardsfolder/n/nevinyrrals_disk.txt
index b0473bd9823..e8f111ac2f3 100644
--- a/forge-gui/res/cardsfolder/n/nevinyrrals_disk.txt
+++ b/forge-gui/res/cardsfolder/n/nevinyrrals_disk.txt
@@ -1,8 +1,9 @@
 Name:Nevinyrral's Disk
 ManaCost:4
 Types:Artifact
-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$ DestroyAll | Cost$ 1 T | ValidCards$ Artifact,Creature,Enchantment | SpellDescription$ Destroy all artifacts, creatures, and enchantments.
 SVar:NonStackingEffect:True
 DeckHints:Type$Planeswalker & Name$Nevinyrral, Urborg Tyrant
-Oracle:Nevinyrral's Disk enters the battlefield tapped.\n{1}, {T}: Destroy all artifacts, creatures, and enchantments.
+Oracle:Nevinyrral's Disk enters tapped.\n{1}, {T}: Destroy all artifacts, creatures, and enchantments.
diff --git a/forge-gui/res/cardsfolder/n/new_benalia.txt b/forge-gui/res/cardsfolder/n/new_benalia.txt
index 95f9ab28dab..0ea4ac79fd1 100644
--- a/forge-gui/res/cardsfolder/n/new_benalia.txt
+++ b/forge-gui/res/cardsfolder/n/new_benalia.txt
@@ -1,8 +1,9 @@
 Name:New Benalia
 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}.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 1.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters, scry 1.
 SVar:TrigScry:DB$ Scry | ScryNum$ 1
-Oracle:New Benalia enters the battlefield tapped.\nWhen New Benalia enters the battlefield, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {W}.
+Oracle:New Benalia enters tapped.\nWhen New Benalia enters, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{T}: Add {W}.
diff --git a/forge-gui/res/cardsfolder/n/new_horizons.txt b/forge-gui/res/cardsfolder/n/new_horizons.txt
index ae0ae6fc0d6..d05129bdfd0 100644
--- a/forge-gui/res/cardsfolder/n/new_horizons.txt
+++ b/forge-gui/res/cardsfolder/n/new_horizons.txt
@@ -3,9 +3,9 @@ ManaCost:2 G
 Types:Enchantment Aura
 K:Enchant land
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Land | AILogic$ Pump
-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$ P1P1 | CounterNum$ 1
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddAbility$ NewHorizonsTap | Description$ Enchanted land has "{T}: Add two mana of any one color."
 SVar:NewHorizonsTap:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 2 | SpellDescription$ Add two mana of any one color.
 DeckHas:Ability$Counters
-Oracle:Enchant land\nWhen New Horizons enters the battlefield, put a +1/+1 counter on target creature you control.\nEnchanted land has "{T}: Add two mana of any one color."
+Oracle:Enchant land\nWhen New Horizons enters, put a +1/+1 counter on target creature you control.\nEnchanted land has "{T}: Add two mana of any one color."
diff --git a/forge-gui/res/cardsfolder/n/new_perspectives.txt b/forge-gui/res/cardsfolder/n/new_perspectives.txt
index 3ea4d9403a5..8f9f2831722 100644
--- a/forge-gui/res/cardsfolder/n/new_perspectives.txt
+++ b/forge-gui/res/cardsfolder/n/new_perspectives.txt
@@ -1,8 +1,8 @@
 Name:New Perspectives
 ManaCost:5 U
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw three cards.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw three cards.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 3
 S:Mode$ AlternativeCost | ValidSA$ Activated.Cycling | ValidPlayer$ You | Cost$ Discard<1/CARDNAME> | CostDesc$ 0 | CheckSVar$ X | SVarCompare$ GE7 | Description$ As long as you have seven or more cards in hand, you may pay {0} rather than pay cycling costs.
 SVar:X:Count$InYourHand
-Oracle:When New Perspectives enters the battlefield, draw three cards.\nAs long as you have seven or more cards in hand, you may pay {0} rather than pay cycling costs.
+Oracle:When New Perspectives enters, draw three cards.\nAs long as you have seven or more cards in hand, you may pay {0} rather than pay cycling costs.
diff --git a/forge-gui/res/cardsfolder/n/nexus_wardens.txt b/forge-gui/res/cardsfolder/n/nexus_wardens.txt
index 3527f6e2f0c..f055a901767 100644
--- a/forge-gui/res/cardsfolder/n/nexus_wardens.txt
+++ b/forge-gui/res/cardsfolder/n/nexus_wardens.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Satyr Archer
 PT:1/4
 K:Reach
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Constellation — Whenever an enchantment enters the battlefield under you control, you gain 2 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Constellation — Whenever an enchantment enters under you control, you gain 2 life.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
 DeckNeeds:Type$Enchantment
-Oracle:Reach\nConstellation — Whenever an enchantment enters the battlefield under your control, you gain 2 life.
+Oracle:Reach\nConstellation — Whenever an enchantment you control enters, you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/n/nezumi_freewheeler_hideous_fleshwheeler.txt b/forge-gui/res/cardsfolder/n/nezumi_freewheeler_hideous_fleshwheeler.txt
index ad4b2bb0dbe..6bcdadee270 100644
--- a/forge-gui/res/cardsfolder/n/nezumi_freewheeler_hideous_fleshwheeler.txt
+++ b/forge-gui/res/cardsfolder/n/nezumi_freewheeler_hideous_fleshwheeler.txt
@@ -3,13 +3,13 @@ ManaCost:3 B
 Types:Creature Rat Samurai
 PT:3/3
 K:Menace
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, each player mills three cards.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters, each player mills three cards.
 SVar:TrigMill:DB$ Mill | NumCards$ 3 | Defined$ Player
 A:AB$ SetState | Cost$ 5 WP | Mode$ Transform | SorcerySpeed$ True | SpellDescription$ Transform CARDNAME. Activate only as a sorcery. ({W/P} can be paid with either {W} or 2 life.)
 DeckHas:Ability$Mill
 DeckHints:Color$White
 AlternateMode:DoubleFaced
-Oracle:Menace\nWhen Nezumi Freewheeler enters the battlefield, each player mills three cards. (To mill a card, put the top card of your library into your graveyard.)\n{5}{W/P}: Transform Nezumi Freewheeler. Activate only as a sorcery. ({W/P} can be paid with either {W} or 2 life.)
+Oracle:Menace\nWhen Nezumi Freewheeler enters, each player mills three cards. (To mill a card, put the top card of your library into your graveyard.)\n{5}{W/P}: Transform Nezumi Freewheeler. Activate only as a sorcery. ({W/P} can be paid with either {W} or 2 life.)
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/n/nezumi_informant.txt b/forge-gui/res/cardsfolder/n/nezumi_informant.txt
index 8891f4c7def..d85ea822b09 100644
--- a/forge-gui/res/cardsfolder/n/nezumi_informant.txt
+++ b/forge-gui/res/cardsfolder/n/nezumi_informant.txt
@@ -2,6 +2,6 @@ Name:Nezumi Informant
 ManaCost:1 B
 Types:Creature Rat Rogue
 PT:1/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, each opponent discards a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, each opponent discards a card.
 SVar:TrigDiscard:DB$ Discard | Defined$ Opponent | Mode$ TgtChoose
-Oracle:When Nezumi Informant enters the battlefield, each opponent discards a card.
+Oracle:When Nezumi Informant enters, each opponent discards a card.
diff --git a/forge-gui/res/cardsfolder/n/nezumi_prowler.txt b/forge-gui/res/cardsfolder/n/nezumi_prowler.txt
index ccbf7ce8b50..2448088814e 100644
--- a/forge-gui/res/cardsfolder/n/nezumi_prowler.txt
+++ b/forge-gui/res/cardsfolder/n/nezumi_prowler.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Artifact Creature Rat Ninja
 PT:3/1
 K:Ninjutsu:1 B
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature you control gains deathtouch and lifelink until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature you control gains deathtouch and lifelink until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | KW$ Deathtouch & Lifelink
 DeckHas:Ability$LifeGain
-Oracle:Ninjutsu {1}{B}\nWhen Nezumi Prowler enters the battlefield, target creature you control gains deathtouch and lifelink until end of turn.
+Oracle:Ninjutsu {1}{B}\nWhen Nezumi Prowler enters, target creature you control gains deathtouch and lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/n/niambi_beloved_protector.txt b/forge-gui/res/cardsfolder/n/niambi_beloved_protector.txt
index 0f69d89268c..2c7c1144925 100644
--- a/forge-gui/res/cardsfolder/n/niambi_beloved_protector.txt
+++ b/forge-gui/res/cardsfolder/n/niambi_beloved_protector.txt
@@ -3,7 +3,7 @@ ManaCost:W U
 Types:Legendary Creature Human Cleric
 PT:2/2
 K:Flash
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.wasCastByYou+Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it, choose target nonlegendary creature card in your graveyard that was put there from the battlefield this turn. Return it to the battlefield. It perpetually gains "Whenever this creature becomes the target of a spell or ability, draw a card. This ability triggers only once each turn."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.wasCastByYou+Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, if you cast it, choose target nonlegendary creature card in your graveyard that was put there from the battlefield this turn. Return it to the battlefield. It perpetually gains "Whenever this creature becomes the target of a spell or ability, draw a card. This ability triggers only once each turn."
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn+nonLegendary+ThisTurnEnteredFrom_Battlefield | RememberChanged$ True | TgtPrompt$ Choose target nonlegendary creature card in your graveyard that was put there from the battlefield this turn | ChangeNum$ 1 | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | Triggers$ BecomesTarget | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:BecomesTarget:Mode$ BecomesTarget | ValidTarget$ Card.Self | ActivationLimit$ 1 | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever this creature becomes the target of a spell or ability, draw a card. This ability triggers only once each turn.
@@ -11,4 +11,4 @@ SVar:TrigDraw:DB$ Draw
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Graveyard
 AI:RemoveDeck:Random
-Oracle:Flash\nWhen Niambi, Beloved Protector enters the battlefield, if you cast it, choose target nonlegendary creature card in your graveyard that was put there from the battlefield this turn. Return it to the battlefield. It perpetually gains "Whenever this creature becomes the target of a spell or ability, draw a card. This ability triggers only once each turn."
+Oracle:Flash\nWhen Niambi, Beloved Protector enters, if you cast it, choose target nonlegendary creature card in your graveyard that was put there from the battlefield this turn. Return it to the battlefield. It perpetually gains "Whenever this creature becomes the target of a spell or ability, draw a card. This ability triggers only once each turn."
diff --git a/forge-gui/res/cardsfolder/n/niambi_esteemed_speaker.txt b/forge-gui/res/cardsfolder/n/niambi_esteemed_speaker.txt
index 1aa26397093..09449246c9c 100644
--- a/forge-gui/res/cardsfolder/n/niambi_esteemed_speaker.txt
+++ b/forge-gui/res/cardsfolder/n/niambi_esteemed_speaker.txt
@@ -3,11 +3,11 @@ ManaCost:W U
 Types:Legendary Creature Human Cleric
 PT:2/1
 K:Flash
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may return another target creature you control to its owner's hand. If you do, you gain life equal to that creature's mana value.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may return another target creature you control to its owner's hand. If you do, you gain life equal to that creature's mana value.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another creature you control | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
 SVar:X:Targeted$CardManaCost
 DeckHas:Ability$LifeGain
 A:AB$ Draw | Cost$ 1 W U T Discard<1/Card.Legendary/legendary> | NumCards$ 2 | SpellDescription$ Draw two cards.
 DeckHints:Type$Legendary
-Oracle:Flash\nWhen Niambi, Esteemed Speaker enters the battlefield, you may return another target creature you control to its owner's hand. If you do, you gain life equal to that creature's mana value.\n{1}{W}{U}, {T}, Discard a legendary card: Draw two cards.
+Oracle:Flash\nWhen Niambi, Esteemed Speaker enters, you may return another target creature you control to its owner's hand. If you do, you gain life equal to that creature's mana value.\n{1}{W}{U}, {T}, Discard a legendary card: Draw two cards.
diff --git a/forge-gui/res/cardsfolder/n/niambi_faithful_healer.txt b/forge-gui/res/cardsfolder/n/niambi_faithful_healer.txt
index bc148c0aab9..f68055674be 100644
--- a/forge-gui/res/cardsfolder/n/niambi_faithful_healer.txt
+++ b/forge-gui/res/cardsfolder/n/niambi_faithful_healer.txt
@@ -2,7 +2,7 @@ Name:Niambi, Faithful Healer
 ManaCost:1 W U
 Types:Legendary Creature Human Cleric
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library and/or graveyard for a card named Teferi, Timebender, reveal it, and put it into your hand. If you search your library this way, shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may search your library and/or graveyard for a card named Teferi, Timebender, reveal it, and put it into your hand. If you search your library this way, shuffle.
 SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | OriginAlternative$ Graveyard | Destination$ Hand | ChangeType$ Card.YouOwn+namedTeferi; Timebender | Optional$ True
 DeckNeeds:Name$Teferi, Timebender
-Oracle:When Niambi, Faithful Healer enters the battlefield, you may search your library and/or graveyard for a card named Teferi, Timebender, reveal it, and put it into your hand. If you search your library this way, shuffle.
+Oracle:When Niambi, Faithful Healer enters, you may search your library and/or graveyard for a card named Teferi, Timebender, reveal it, and put it into your hand. If you search your library this way, shuffle.
diff --git a/forge-gui/res/cardsfolder/n/niblis_of_the_mist.txt b/forge-gui/res/cardsfolder/n/niblis_of_the_mist.txt
index d776882acb9..22741f45778 100644
--- a/forge-gui/res/cardsfolder/n/niblis_of_the_mist.txt
+++ b/forge-gui/res/cardsfolder/n/niblis_of_the_mist.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Spirit
 PT:2/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, you may tap target creature.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters, you may tap target creature.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature | TgtPrompt$ Select target creature
 SVar:PlayMain1:TRUE
-Oracle:Flying\nWhen Niblis of the Mist enters the battlefield, you may tap target creature.
+Oracle:Flying\nWhen Niblis of the Mist enters, you may tap target creature.
diff --git a/forge-gui/res/cardsfolder/n/nicol_bolas_the_ravager_nicol_bolas_the_arisen.txt b/forge-gui/res/cardsfolder/n/nicol_bolas_the_ravager_nicol_bolas_the_arisen.txt
index b5155989dfa..9e1677cad45 100644
--- a/forge-gui/res/cardsfolder/n/nicol_bolas_the_ravager_nicol_bolas_the_arisen.txt
+++ b/forge-gui/res/cardsfolder/n/nicol_bolas_the_ravager_nicol_bolas_the_arisen.txt
@@ -3,13 +3,13 @@ ManaCost:1 U B R
 Types:Legendary Creature Elder Dragon
 PT:4/4
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, each opponent discards a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters, each opponent discards a card.
 SVar:TrigDiscard:DB$ Discard | Defined$ Opponent | Mode$ TgtChoose
 A:AB$ ChangeZone | Cost$ 4 U B R | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn | SorcerySpeed$ True | StackDescription$ SpellDescription | SpellDescription$ Exile CARDNAME, then return him to the battlefield transformed under his owner's control. Activate only as a sorcery.
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | ForgetOtherRemembered$ True | SubAbility$ DBCleanup | StackDescription$ None
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AlternateMode:DoubleFaced
-Oracle:Flying\nWhen Nicol Bolas, the Ravager enters the battlefield, each opponent discards a card.\n{4}{U}{B}{R}: Exile Nicol Bolas, the Ravager, then return him to the battlefield transformed under his owner's control. Activate only as a sorcery.
+Oracle:Flying\nWhen Nicol Bolas, the Ravager enters, each opponent discards a card.\n{4}{U}{B}{R}: Exile Nicol Bolas, the Ravager, then return him to the battlefield transformed under his owner's control. Activate only as a sorcery.
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/n/night_clubber.txt b/forge-gui/res/cardsfolder/n/night_clubber.txt
index 9c3c9739ad1..a22cf069c14 100644
--- a/forge-gui/res/cardsfolder/n/night_clubber.txt
+++ b/forge-gui/res/cardsfolder/n/night_clubber.txt
@@ -2,9 +2,9 @@ Name:Night Clubber
 ManaCost:1 B B
 Types:Creature Human Warrior
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME enters the battlefield, creatures your opponents control get -1/-1 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 -1/-1 until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | NumAtt$ -1 | NumDef$ -1 | ValidCards$ Creature.OppCtrl | IsCurse$ True
 K:Blitz:2 B
 SVar:PlayMain1:TRUE
 DeckHas:Ability$Sacrifice
-Oracle:When Night Clubber enters the battlefield, creatures your opponents control get -1/-1 until end of turn.\nBlitz {2}{B} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
+Oracle:When Night Clubber enters, creatures your opponents control get -1/-1 until end of turn.\nBlitz {2}{B} (If you cast this spell for its blitz cost, it gains haste and "When this creature dies, draw a card." Sacrifice it at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/n/night_incarnate.txt b/forge-gui/res/cardsfolder/n/night_incarnate.txt
index 01a5874199e..812384929d5 100644
--- a/forge-gui/res/cardsfolder/n/night_incarnate.txt
+++ b/forge-gui/res/cardsfolder/n/night_incarnate.txt
@@ -8,4 +8,4 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.S
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature | NumAtt$ -3 | NumDef$ -3 | IsCurse$ True
 SVar:NeedsToPlayEvokedVar:Z GE2
 SVar:Z:Count$Valid Creature.OppCtrl+toughnessLE3
-Oracle:Deathtouch\nWhen Night Incarnate leaves the battlefield, all creatures get -3/-3 until end of turn.\nEvoke {3}{B} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters the battlefield.)
+Oracle:Deathtouch\nWhen Night Incarnate leaves the battlefield, all creatures get -3/-3 until end of turn.\nEvoke {3}{B} (You may cast this spell for its evoke cost. If you do, it's sacrificed when it enters.)
diff --git a/forge-gui/res/cardsfolder/n/night_market_aeronaut.txt b/forge-gui/res/cardsfolder/n/night_market_aeronaut.txt
index 65a6eb2d7a7..06ee9235c71 100644
--- a/forge-gui/res/cardsfolder/n/night_market_aeronaut.txt
+++ b/forge-gui/res/cardsfolder/n/night_market_aeronaut.txt
@@ -3,5 +3,5 @@ ManaCost:3 B
 Types:Creature Aetherborn Warrior
 PT:2/2
 K:Flying
-K:etbCounter:P1P1:1:Revolt$ True:Revolt — CARDNAME enters the battlefield with a +1/+1 counter on it if a permanent you controlled left the battlefield this turn.
-Oracle:Flying\nRevolt — Night Market Aeronaut enters the battlefield with a +1/+1 counter on it if a permanent you controlled left the battlefield this turn.
+K:etbCounter:P1P1:1:Revolt$ True:Revolt — CARDNAME enters with a +1/+1 counter on it if a permanent you controlled left the battlefield this turn.
+Oracle:Flying\nRevolt — Night Market Aeronaut enters with a +1/+1 counter on it if a permanent you controlled left the battlefield this turn.
diff --git a/forge-gui/res/cardsfolder/n/night_of_the_sweets_revenge.txt b/forge-gui/res/cardsfolder/n/night_of_the_sweets_revenge.txt
index a990b6e8c0b..a454344eec7 100644
--- a/forge-gui/res/cardsfolder/n/night_of_the_sweets_revenge.txt
+++ b/forge-gui/res/cardsfolder/n/night_of_the_sweets_revenge.txt
@@ -1,7 +1,7 @@
 Name:Night of the Sweets' Revenge
 ManaCost:3 G
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigFood | TriggerDescription$ When CARDNAME enters the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigFood | TriggerDescription$ When CARDNAME enters, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
 SVar:TrigFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
 S:Mode$ Continuous | Affected$ Food.YouCtrl | AddAbility$ AnyMana | Description$ Foods you control have "{T}: Add {G}."
 SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ G | Amount$ 1 | SpellDescription$ Add {G}.
@@ -10,4 +10,4 @@ SVar:X:Count$Valid Food.YouCtrl
 AI:RemoveDeck:Random
 DeckHas:Ability$LifeGain|Token|Sacrifice & Type$Artifact|Food
 DeckHints:Type$Food
-Oracle:When Night of the Sweets' Revenge enters the battlefield, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")\nFoods you control have "{T}: Add {G}."\n{5}{G}{G}, Sacrifice Night of the Sweets' Revenge: Creatures you control get +X/+X until end of turn, where X is the number of Foods you control. Activate only as a sorcery.
+Oracle:When Night of the Sweets' Revenge enters, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")\nFoods you control have "{T}: Add {G}."\n{5}{G}{G}, Sacrifice Night of the Sweets' Revenge: Creatures you control get +X/+X until end of turn, where X is the number of Foods you control. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/n/night_scythe.txt b/forge-gui/res/cardsfolder/n/night_scythe.txt
index f4d63651572..eb1291ea0d0 100644
--- a/forge-gui/res/cardsfolder/n/night_scythe.txt
+++ b/forge-gui/res/cardsfolder/n/night_scythe.txt
@@ -3,8 +3,8 @@ ManaCost:3
 Types:Artifact Vehicle
 PT:3/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Invasion Beams — When CARDNAME enters the battlefield, create a 2/2 black Necron Warrior artifact creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Invasion Beams — When CARDNAME enters, create a 2/2 black Necron Warrior artifact creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ b_2_2_a_necron_warrior
 K:Crew:2
 DeckHas:Type$Necron|Warrior & Ability$Token
-Oracle:Flying\nInvasion Beams — When Night Scythe enters the battlefield, create a 2/2 black Necron Warrior artifact creature token.\nCrew 2 (Tap any number of creatures you control with total power 2 or more: This Vehicle becomes an artifact creature until end of turn.)
+Oracle:Flying\nInvasion Beams — When Night Scythe enters, create a 2/2 black Necron Warrior artifact creature token.\nCrew 2 (Tap any number of creatures you control with total power 2 or more: This Vehicle becomes an artifact creature until end of turn.)
diff --git a/forge-gui/res/cardsfolder/n/nightclub_bouncer.txt b/forge-gui/res/cardsfolder/n/nightclub_bouncer.txt
index 1ca9cd457fc..9dbc068aba8 100644
--- a/forge-gui/res/cardsfolder/n/nightclub_bouncer.txt
+++ b/forge-gui/res/cardsfolder/n/nightclub_bouncer.txt
@@ -3,9 +3,9 @@ ManaCost:2 U U
 Types:Creature Human Rogue
 PT:2/3
 K:Flash
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return target nonland permanent an opponent controls to its owner's hand. It perpetually gains "This spell costs {2} more to cast."
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters, return target nonland permanent an opponent controls to its owner's hand. It perpetually gains "This spell costs {2} more to cast."
 SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Permanent.nonLand+OppCtrl | Origin$ Battlefield | Destination$ Hand | RememberChanged$ True | TgtPrompt$ Select target nonland permanent an opponent controls | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Remembered | staticAbilities$ RaiseCost | Duration$ Perpetual | SubAbility$ DBCleanup
 SVar:RaiseCost:Mode$ RaiseCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 2 | EffectZone$ All | Description$ This spell costs {2} more to cast.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:Flash\nWhen Nightclub Bouncer enters the battlefield, return target nonland permanent an opponent controls to its owner's hand. It perpetually gains "This spell costs {2} more to cast."
+Oracle:Flash\nWhen Nightclub Bouncer enters, return target nonland permanent an opponent controls to its owner's hand. It perpetually gains "This spell costs {2} more to cast."
diff --git a/forge-gui/res/cardsfolder/n/nightdrinker_moroii.txt b/forge-gui/res/cardsfolder/n/nightdrinker_moroii.txt
index f230c301a96..54ef687b849 100644
--- a/forge-gui/res/cardsfolder/n/nightdrinker_moroii.txt
+++ b/forge-gui/res/cardsfolder/n/nightdrinker_moroii.txt
@@ -4,6 +4,6 @@ Types:Creature Vampire
 PT:4/2
 K:Flying
 K:Disguise:B B
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME enters the battlefield, you lose 3 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ When CARDNAME enters, you lose 3 life.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 3
-Oracle:Flying\nWhen Nightdrinker Moroii enters the battlefield, you lose 3 life.\nDisguise {B}{B} (You may cast this card face down for {3} as a 2/2 creature with ward {2}. Turn it face up any time for its disguise cost.)
+Oracle:Flying\nWhen Nightdrinker Moroii enters, you lose 3 life.\nDisguise {B}{B} (You may cast this card face down for {3} as a 2/2 creature with ward {2}. Turn it face up any time for its disguise cost.)
diff --git a/forge-gui/res/cardsfolder/n/nightkin_ambusher.txt b/forge-gui/res/cardsfolder/n/nightkin_ambusher.txt
index 5a9d4aaf994..7bb544a4497 100644
--- a/forge-gui/res/cardsfolder/n/nightkin_ambusher.txt
+++ b/forge-gui/res/cardsfolder/n/nightkin_ambusher.txt
@@ -3,7 +3,7 @@ ManaCost:2 U B
 Types:Creature Mutant Warrior
 PT:4/4
 K:Ward:2
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRadiation | TriggerDescription$ When CARDNAME enters the battlefield, target player gets four rad counters.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRadiation | TriggerDescription$ When CARDNAME enters, target player gets four rad counters.
 SVar:TrigRadiation:DB$ Radiation | ValidTgts$ Player | Num$ 4
 S:Mode$ CantBlockBy | ValidAttacker$ Card.Self | ValidDefender$ Player.Condition Counters.RAD | Description$ CARDNAME can't be blocked as long as defending player has a rad counter.
-Oracle:Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nWhen Nightkin Ambusher enters the battlefield, target player gets four rad counters.\nNightkin Ambusher can't be blocked as long as defending player has a rad counter.
+Oracle:Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nWhen Nightkin Ambusher enters, target player gets four rad counters.\nNightkin Ambusher can't be blocked as long as defending player has a rad counter.
diff --git a/forge-gui/res/cardsfolder/n/nightmare_lash.txt b/forge-gui/res/cardsfolder/n/nightmare_lash.txt
index 497788fad5c..37df311d0e8 100644
--- a/forge-gui/res/cardsfolder/n/nightmare_lash.txt
+++ b/forge-gui/res/cardsfolder/n/nightmare_lash.txt
@@ -6,4 +6,4 @@ S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ X | AddToughness$ X |
 SVar:X:Count$Valid Swamp.YouCtrl
 SVar:BuffedBy:Swamp
 AI:RemoveDeck:Random
-Oracle:Equipped creature gets +1/+1 for each Swamp you control.\nEquip—Pay 3 life. (Pay 3 life: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
+Oracle:Equipped creature gets +1/+1 for each Swamp you control.\nEquip—Pay 3 life. (Pay 3 life: Attach to target creature you control. Equip only as a sorcery. This card enters unattached and stays on the battlefield if the creature leaves.)
diff --git a/forge-gui/res/cardsfolder/n/nightscape_battlemage.txt b/forge-gui/res/cardsfolder/n/nightscape_battlemage.txt
index 6bd90331b3c..229613a03d4 100644
--- a/forge-gui/res/cardsfolder/n/nightscape_battlemage.txt
+++ b/forge-gui/res/cardsfolder/n/nightscape_battlemage.txt
@@ -3,9 +3,9 @@ ManaCost:2 B
 Types:Creature Zombie Wizard
 PT:2/2
 K:Kicker:2 U:2 R
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked 1 | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked with its {2}{U} kicker, return up to two target nonblack creatures to their owners' hands.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked 1 | Execute$ TrigKicker | TriggerDescription$ When CARDNAME enters, if it was kicked with its {2}{U} kicker, return up to two target nonblack creatures to their owners' hands.
 SVar:TrigKicker:DB$ ChangeZone | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | Origin$ Battlefield | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked 2 | Execute$ TrigKicker2 | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked with its {2}{R} kicker, destroy target land.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self+kicked 2 | Execute$ TrigKicker2 | TriggerDescription$ When CARDNAME enters, if it was kicked with its {2}{R} kicker, destroy target land.
 SVar:TrigKicker2:DB$ Destroy | ValidTgts$ Land | TgtPrompt$ Select target land
 SVar:PlayMain1:TRUE
-Oracle:Kicker {2}{U} and/or {2}{R} (You may pay an additional {2}{U} and/or {2}{R} as you cast this spell.)\nWhen Nightscape Battlemage enters the battlefield, if it was kicked with its {2}{U} kicker, return up to two target nonblack creatures to their owners' hands.\nWhen Nightscape Battlemage enters the battlefield, if it was kicked with its {2}{R} kicker, destroy target land.
+Oracle:Kicker {2}{U} and/or {2}{R} (You may pay an additional {2}{U} and/or {2}{R} as you cast this spell.)\nWhen Nightscape Battlemage enters, if it was kicked with its {2}{U} kicker, return up to two target nonblack creatures to their owners' hands.\nWhen Nightscape Battlemage enters, if it was kicked with its {2}{R} kicker, destroy target land.
diff --git a/forge-gui/res/cardsfolder/n/nightshade_assassin.txt b/forge-gui/res/cardsfolder/n/nightshade_assassin.txt
index 70554592572..8aed517d1b7 100644
--- a/forge-gui/res/cardsfolder/n/nightshade_assassin.txt
+++ b/forge-gui/res/cardsfolder/n/nightshade_assassin.txt
@@ -4,10 +4,10 @@ Types:Creature Human Assassin
 PT:2/1
 K:First Strike
 K:Madness:1 B
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigReveal | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may reveal X black cards in your hand. If you do, target creature gets -X/-X until end of turn.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigReveal | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may reveal X black cards in your hand. If you do, target creature gets -X/-X until end of turn.
 SVar:TrigReveal:DB$ Reveal | Defined$ You | RevealValid$ Card.Black | AnyNumber$ True | RememberRevealed$ True | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -X | NumDef$ -X | IsCurse$ True | SubAbility$ DBNightshadeCleanup
 SVar:DBNightshadeCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 AI:RemoveDeck:All
-Oracle:First strike\nWhen Nightshade Assassin enters the battlefield, you may reveal X black cards in your hand. If you do, target creature gets -X/-X until end of turn.\nMadness {1}{B} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)
+Oracle:First strike\nWhen Nightshade Assassin enters, you may reveal X black cards in your hand. If you do, target creature gets -X/-X until end of turn.\nMadness {1}{B} (If you discard this card, discard it into exile. When you do, cast it for its madness cost or put it into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/n/nightshade_harvester.txt b/forge-gui/res/cardsfolder/n/nightshade_harvester.txt
index 973dd493b3b..5eb3e87d2bf 100644
--- a/forge-gui/res/cardsfolder/n/nightshade_harvester.txt
+++ b/forge-gui/res/cardsfolder/n/nightshade_harvester.txt
@@ -2,8 +2,8 @@ Name:Nightshade Harvester
 ManaCost:3 B
 Types:Creature Elf Shaman
 PT:2/2
-T:Mode$ ChangesZone | ValidCard$ Land.OppCtrl | TriggerZones$ Battlefield | Origin$ Any | Destination$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a land enters the battlefield under an opponent's control, that player loses 1 life. Put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | ValidCard$ Land.OppCtrl | TriggerZones$ Battlefield | Origin$ Any | Destination$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever a land enters under an opponent's control, that player loses 1 life. Put a +1/+1 counter on CARDNAME.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredCardController | LifeAmount$ 1 | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
-Oracle:Whenever a land enters the battlefield under an opponent's control, that player loses 1 life. Put a +1/+1 counter on Nightshade Harvester.
+Oracle:Whenever a land enters under an opponent's control, that player loses 1 life. Put a +1/+1 counter on Nightshade Harvester.
diff --git a/forge-gui/res/cardsfolder/n/nightshade_peddler.txt b/forge-gui/res/cardsfolder/n/nightshade_peddler.txt
index c39468a1e33..b9a139ef4c2 100644
--- a/forge-gui/res/cardsfolder/n/nightshade_peddler.txt
+++ b/forge-gui/res/cardsfolder/n/nightshade_peddler.txt
@@ -4,4 +4,4 @@ Types:Creature Human Druid
 PT:1/1
 K:Soulbond
 S:Mode$ Continuous | Affected$ Creature.PairedWith,Creature.Self+Paired | AddKeyword$ Deathtouch | Description$ As long as CARDNAME is paired with another creature, both creatures have deathtouch.
-Oracle:Soulbond (You may pair this creature with another unpaired creature when either enters the battlefield. They remain paired for as long as you control both of them.)\nAs long as Nightshade Peddler is paired with another creature, both creatures have deathtouch.
+Oracle:Soulbond (You may pair this creature with another unpaired creature when either enters. They remain paired for as long as you control both of them.)\nAs long as Nightshade Peddler is paired with another creature, both creatures have deathtouch.
diff --git a/forge-gui/res/cardsfolder/n/nightsquad_commando.txt b/forge-gui/res/cardsfolder/n/nightsquad_commando.txt
index b38db480d3f..9eb182d8cf7 100644
--- a/forge-gui/res/cardsfolder/n/nightsquad_commando.txt
+++ b/forge-gui/res/cardsfolder/n/nightsquad_commando.txt
@@ -2,8 +2,8 @@ Name:Nightsquad Commando
 ManaCost:2 B
 Types:Creature Human Soldier
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, if you attacked this turn, create a 1/1 white Human Soldier creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, if you attacked this turn, create a 1/1 white Human Soldier creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_human_soldier | TokenOwner$ You
 SVar:RaidTest:Count$AttackersDeclared
 DeckHas:Ability$Token
-Oracle:When Nightsquad Commando enters the battlefield, if you attacked this turn, create a 1/1 white Human Soldier creature token.
+Oracle:When Nightsquad Commando enters, if you attacked this turn, create a 1/1 white Human Soldier creature token.
diff --git a/forge-gui/res/cardsfolder/n/nihiloor.txt b/forge-gui/res/cardsfolder/n/nihiloor.txt
index 14e3013e947..1063cccc4ed 100644
--- a/forge-gui/res/cardsfolder/n/nihiloor.txt
+++ b/forge-gui/res/cardsfolder/n/nihiloor.txt
@@ -2,7 +2,7 @@ Name:Nihiloor
 ManaCost:2 W U B
 Types:Legendary Creature Horror
 PT:3/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBRepeat | TriggerDescription$ When CARDNAME enters the battlefield, for each opponent, tap up to one untapped creature you control. When you do, gain control of target creature that player controls with power less than or equal to the tapped creature's power for as long as you control CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBRepeat | TriggerDescription$ When CARDNAME enters, for each opponent, tap up to one untapped creature you control. When you do, gain control of target creature that player controls with power less than or equal to the tapped creature's power for as long as you control CARDNAME.
 SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBChoose | SubAbility$ DBCleanup
 SVar:DBChoose:DB$ ChooseCard | Defined$ You | MinAmount$ 0 | Amount$ 1 | Choices$ Creature.untapped+YouCtrl | ChoiceTitle$ Choose up to one untapped creature you control to tap | ChoiceTitleAppend$ Defined Player.IsRemembered | ChoiceZone$ Battlefield | SubAbility$ DBTap
 SVar:DBTap:DB$ Tap | Defined$ ChosenCard | SubAbility$ DBImmediateTrigger
@@ -14,4 +14,4 @@ T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+OppOwn | TriggerZones$ Battlefield
 SVar:TrigGain:DB$ GainLife | LifeAmount$ 2 | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2 | Defined$ TriggeredAttackerOwner
 DeckHas:Ability$LifeGain
-Oracle:When Nihiloor enters the battlefield, for each opponent, tap up to one untapped creature you control. When you do, gain control of target creature that player controls with power less than or equal to the tapped creature's power for as long as you control Nihiloor.\nWhenever you attack with a creature an opponent owns, you gain 2 life and that player loses 2 life.
+Oracle:When Nihiloor enters, for each opponent, tap up to one untapped creature you control. When you do, gain control of target creature that player controls with power less than or equal to the tapped creature's power for as long as you control Nihiloor.\nWhenever you attack with a creature an opponent owns, you gain 2 life and that player loses 2 life.
diff --git a/forge-gui/res/cardsfolder/n/nikara_lair_scavenger.txt b/forge-gui/res/cardsfolder/n/nikara_lair_scavenger.txt
index c869fd8677c..acb805984fc 100644
--- a/forge-gui/res/cardsfolder/n/nikara_lair_scavenger.txt
+++ b/forge-gui/res/cardsfolder/n/nikara_lair_scavenger.txt
@@ -8,4 +8,4 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creatu
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1
 SVar:X:TriggeredCard$CardCounters.ALL
-Oracle:Partner with Yannik, Scavenging Sentinel (When this creature enters the battlefield, target player may put Yannik into their hand from their library, then shuffle.)\nMenace\nWhenever another creature you control leaves the battlefield, if it had one or more counters on it, you draw a card and you lose 1 life.
+Oracle:Partner with Yannik, Scavenging Sentinel (When this creature enters, target player may put Yannik into their hand from their library, then shuffle.)\nMenace\nWhenever another creature you control leaves the battlefield, if it had one or more counters on it, you draw a card and you lose 1 life.
diff --git a/forge-gui/res/cardsfolder/n/nikko_onna.txt b/forge-gui/res/cardsfolder/n/nikko_onna.txt
index 3fbd47c179f..917347efd83 100644
--- a/forge-gui/res/cardsfolder/n/nikko_onna.txt
+++ b/forge-gui/res/cardsfolder/n/nikko_onna.txt
@@ -2,8 +2,8 @@ Name:Nikko-Onna
 ManaCost:2 W
 Types:Creature Spirit
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target enchantment.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters, destroy target enchantment.
 T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may return CARDNAME to its owner's hand.
 SVar:TrigReturn:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Hand
 SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Enchantment | TgtPrompt$ Choose target enchantment
-Oracle:When Nikko-Onna enters the battlefield, destroy target enchantment.\nWhenever you cast a Spirit or Arcane spell, you may return Nikko-Onna to its owner's hand.
+Oracle:When Nikko-Onna enters, destroy target enchantment.\nWhenever you cast a Spirit or Arcane spell, you may return Nikko-Onna to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/n/niko_aris.txt b/forge-gui/res/cardsfolder/n/niko_aris.txt
index 9fbe6e25069..d2c04b00eff 100644
--- a/forge-gui/res/cardsfolder/n/niko_aris.txt
+++ b/forge-gui/res/cardsfolder/n/niko_aris.txt
@@ -2,7 +2,7 @@ Name:Niko Aris
 ManaCost:X W U U
 Types:Legendary Planeswalker Niko
 Loyalty:3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create X Shard tokens. (They're enchantments with "{2}, Sacrifice this enchantment: Scry 1, then draw a card.")
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create X Shard tokens. (They're enchantments with "{2}, Sacrifice this enchantment: Scry 1, then draw a card.")
 SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ c_e_shard_draw | TokenOwner$ You
 SVar:X:Count$xPaid
 A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | StaticAbilities$ Unblockable | Triggers$ Trig | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StackDescription$ SpellDescription | SpellDescription$ Up to one target creature you control can't be blocked this turn. Whenever that creature deals damage this turn, return it to its owner's hand.
@@ -13,4 +13,4 @@ A:AB$ DealDamage | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$
 SVar:Y:Count$YouDrewThisTurn/Twice
 A:AB$ Token | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ c_e_shard_draw | TokenOwner$ You | SpellDescription$ Create a Shard token.
 DeckHas:Ability$Token|Sacrifice
-Oracle:When Niko Aris enters the battlefield, create X Shard tokens. (They're enchantments with "{2}, Sacrifice this enchantment: Scry 1, then draw a card.")\n[+1]: Up to one target creature you control can't be blocked this turn. Whenever that creature deals damage this turn, return it to its owner's hand.\n[-1]: Niko Aris deals 2 damage to target tapped creature for each card you've drawn this turn.\n[-1]: Create a Shard token.
+Oracle:When Niko Aris enters, create X Shard tokens. (They're enchantments with "{2}, Sacrifice this enchantment: Scry 1, then draw a card.")\n[+1]: Up to one target creature you control can't be blocked this turn. Whenever that creature deals damage this turn, return it to its owner's hand.\n[-1]: Niko Aris deals 2 damage to target tapped creature for each card you've drawn this turn.\n[-1]: Create a Shard token.
diff --git a/forge-gui/res/cardsfolder/n/nimana_sell_sword.txt b/forge-gui/res/cardsfolder/n/nimana_sell_sword.txt
index 351b16de596..64328f93a43 100644
--- a/forge-gui/res/cardsfolder/n/nimana_sell_sword.txt
+++ b/forge-gui/res/cardsfolder/n/nimana_sell_sword.txt
@@ -2,7 +2,7 @@ Name:Nimana Sell-Sword
 ManaCost:3 B
 Types:Creature Human Warrior Ally
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally you control enters, you may put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:BuffedBy:Ally
-Oracle:Whenever Nimana Sell-Sword or another Ally enters the battlefield under your control, you may put a +1/+1 counter on Nimana Sell-Sword.
+Oracle:Whenever Nimana Sell-Sword or another Ally you control enters, you may put a +1/+1 counter on Nimana Sell-Sword.
diff --git a/forge-gui/res/cardsfolder/n/nimana_skydancer.txt b/forge-gui/res/cardsfolder/n/nimana_skydancer.txt
index b62d4bd240e..55c0827ba8e 100644
--- a/forge-gui/res/cardsfolder/n/nimana_skydancer.txt
+++ b/forge-gui/res/cardsfolder/n/nimana_skydancer.txt
@@ -4,7 +4,7 @@ Types:Creature Human Rogue
 PT:2/1
 K:Flash
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, target opponent mills two cards. (They put the top two cards of their library into their graveyard.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters, target opponent mills two cards. (They put the top two cards of their library into their graveyard.)
 SVar:TrigMill:DB$ Mill | NumCards$ 2 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent
 DeckHas:Ability$Mill
-Oracle:Flash\nFlying\nWhen Nimana Skydancer enters the battlefield, target opponent mills two cards. (They put the top two cards of their library into their graveyard.)
+Oracle:Flash\nFlying\nWhen Nimana Skydancer enters, target opponent mills two cards. (They put the top two cards of their library into their graveyard.)
diff --git a/forge-gui/res/cardsfolder/n/nimble_innovator.txt b/forge-gui/res/cardsfolder/n/nimble_innovator.txt
index a14420cffa5..f6f39c92466 100644
--- a/forge-gui/res/cardsfolder/n/nimble_innovator.txt
+++ b/forge-gui/res/cardsfolder/n/nimble_innovator.txt
@@ -2,6 +2,6 @@ Name:Nimble Innovator
 ManaCost:3 U
 Types:Creature Vedalken Artificer
 PT:2/2
-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:When Nimble Innovator enters the battlefield, draw a card.
+Oracle:When Nimble Innovator enters, draw a card.
diff --git a/forge-gui/res/cardsfolder/n/nimble_larcenist.txt b/forge-gui/res/cardsfolder/n/nimble_larcenist.txt
index 1dc561f3230..f351c5ffa8d 100644
--- a/forge-gui/res/cardsfolder/n/nimble_larcenist.txt
+++ b/forge-gui/res/cardsfolder/n/nimble_larcenist.txt
@@ -3,6 +3,6 @@ ManaCost:W U B
 Types:Creature Bird Rogue
 PT:2/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, target opponent reveals their hand. You choose an artifact, instant, or sorcery card from it and exile that card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, target opponent reveals their hand. You choose an artifact, instant, or sorcery card from it and exile that card.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | ValidTgts$ Opponent | DefinedPlayer$ Targeted | Chooser$ You | TgtPrompt$ Select target opponent | ChangeType$ Artifact,Instant,Sorcery | ChangeNum$ 1 | IsCurse$ True
-Oracle:Flying\nWhen Nimble Larcenist enters the battlefield, target opponent reveals their hand. You choose an artifact, instant, or sorcery card from it and exile that card.
+Oracle:Flying\nWhen Nimble Larcenist enters, target opponent reveals their hand. You choose an artifact, instant, or sorcery card from it and exile that card.
diff --git a/forge-gui/res/cardsfolder/n/nimblewright_schematic.txt b/forge-gui/res/cardsfolder/n/nimblewright_schematic.txt
index 33e15551068..8c05d05a6c8 100644
--- a/forge-gui/res/cardsfolder/n/nimblewright_schematic.txt
+++ b/forge-gui/res/cardsfolder/n/nimblewright_schematic.txt
@@ -1,8 +1,8 @@
 Name:Nimblewright Schematic
 ManaCost:2
 Types:Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield or is put into a graveyard from the battlefield, create a 1/1 colorless Construct artifact creature token.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigToken | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield or is put into a graveyard from the battlefield, create a 1/1 colorless Construct artifact creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters or is put into a graveyard from the battlefield, create a 1/1 colorless Construct artifact creature token.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigToken | Secondary$ True | TriggerDescription$ When CARDNAME enters or is put into a graveyard from the battlefield, create a 1/1 colorless Construct artifact creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_a_construct | TokenOwner$ You
 DeckHas:Ability$Token
-Oracle:When Nimblewright Schematic enters the battlefield or is put into a graveyard from the battlefield, create a 1/1 colorless Construct artifact creature token.
+Oracle:When Nimblewright Schematic enters or is put into a graveyard from the battlefield, create a 1/1 colorless Construct artifact creature token.
diff --git a/forge-gui/res/cardsfolder/n/nimbus_swimmer.txt b/forge-gui/res/cardsfolder/n/nimbus_swimmer.txt
index 22bc14dd6bc..09df5b27b40 100644
--- a/forge-gui/res/cardsfolder/n/nimbus_swimmer.txt
+++ b/forge-gui/res/cardsfolder/n/nimbus_swimmer.txt
@@ -6,4 +6,4 @@ K:Flying
 K:etbCounter:P1P1:X
 SVar:X:Count$xPaid
 DeckHas:Ability$Counters
-Oracle:Flying\nNimbus Swimmer enters the battlefield with X +1/+1 counters on it.
+Oracle:Flying\nNimbus Swimmer enters with X +1/+1 counters on it.
diff --git a/forge-gui/res/cardsfolder/n/nimraiser_paladin.txt b/forge-gui/res/cardsfolder/n/nimraiser_paladin.txt
index 08768eecbfb..ee596651a69 100644
--- a/forge-gui/res/cardsfolder/n/nimraiser_paladin.txt
+++ b/forge-gui/res/cardsfolder/n/nimraiser_paladin.txt
@@ -3,7 +3,7 @@ ManaCost:4 B
 Types:Creature Phyrexian Knight
 PT:4/4
 K:Toxic:2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return target creature with mana value 3 or less from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters, return target creature with mana value 3 or less from your graveyard to your hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl+cmcLE3 | TgtPrompt$ Select target creature with mana value 3 or less from your graveyard
 DeckHas:Ability$Graveyard
-Oracle:Toxic 2 (Players dealt combat damage by this creature also get two poison counters.)\nWhen Nimraiser Paladin enters the battlefield, return target creature with mana value 3 or less from your graveyard to your hand.
+Oracle:Toxic 2 (Players dealt combat damage by this creature also get two poison counters.)\nWhen Nimraiser Paladin enters, return target creature with mana value 3 or less from your graveyard to your hand.