diff --git a/forge-gui/res/cardsfolder/a/aquamorph_entity.txt b/forge-gui/res/cardsfolder/a/aquamorph_entity.txt
index c1af4797fcc..445f0065d4f 100644
--- a/forge-gui/res/cardsfolder/a/aquamorph_entity.txt
+++ b/forge-gui/res/cardsfolder/a/aquamorph_entity.txt
@@ -5,7 +5,7 @@ PT:*/*
 K:Morph:2 U
 R:Event$ TurnFaceUp | ValidCard$ Card.Self | ReplaceWith$ MorphChoice | ActiveZones$ Battlefield
 K:ETBReplacement:Other:MorphChoice
-SVar:MorphChoice:DB$ GenericChoice | Defined$ You | Choices$ BigTough,BigPower | SpellDescription$ As CARDNAME enters the battlefield or is turned face up, it becomes your choice of 5/1 or 1/5.
+SVar:MorphChoice:DB$ GenericChoice | Defined$ You | Choices$ BigTough,BigPower | SpellDescription$ As CARDNAME enters or is turned face up, it becomes your choice of 5/1 or 1/5.
 SVar:BigPower:DB$ Animate | Defined$ Self | Duration$ Permanent | Power$ 5 | Toughness$ 1 | SpellDescription$ CARDNAME is 5/1
 SVar:BigTough:DB$ Animate | Defined$ Self | Duration$ Permanent | Power$ 1 | Toughness$ 5 | SpellDescription$ CARDNAME is 1/5
-Oracle:As Aquamorph Entity enters the battlefield or is turned face up, it becomes your choice of 5/1 or 1/5.\nMorph {2}{U} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
+Oracle:As Aquamorph Entity enters or is turned face up, it becomes your choice of 5/1 or 1/5.\nMorph {2}{U} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
diff --git a/forge-gui/res/cardsfolder/a/aquastrand_spider.txt b/forge-gui/res/cardsfolder/a/aquastrand_spider.txt
index 5a569a0ca42..b842739192e 100644
--- a/forge-gui/res/cardsfolder/a/aquastrand_spider.txt
+++ b/forge-gui/res/cardsfolder/a/aquastrand_spider.txt
@@ -7,4 +7,4 @@ A:AB$ Pump | Cost$ G | ValidTgts$ Creature.counters_GE1_P1P1 | TgtPrompt$ Select
 DeckNeeds:Ability$Counters
 DeckHas:Ability$Counters
 SVar:AIGraftPreference:DontMoveCounterIfLethal
-Oracle:Graft 2 (This creature enters the battlefield with two +1/+1 counters on it. Whenever another creature enters the battlefield, you may move a +1/+1 counter from this creature onto it.)\n{G}: Target creature with a +1/+1 counter on it gains reach until end of turn. (It can block creatures with flying.)
+Oracle:Graft 2 (This creature enters with two +1/+1 counters on it. Whenever another creature enters, you may move a +1/+1 counter from this creature onto it.)\n{G}: Target creature with a +1/+1 counter on it gains reach until end of turn. (It can block creatures with flying.)
diff --git a/forge-gui/res/cardsfolder/a/aquatic_incursion.txt b/forge-gui/res/cardsfolder/a/aquatic_incursion.txt
index a293a3a11c6..6ef71737470 100644
--- a/forge-gui/res/cardsfolder/a/aquatic_incursion.txt
+++ b/forge-gui/res/cardsfolder/a/aquatic_incursion.txt
@@ -1,9 +1,9 @@
 Name:Aquatic Incursion
 ManaCost:3 U
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 blue Merfolk creature tokens with hexproof.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create two 1/1 blue Merfolk creature tokens with hexproof.
 SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ u_1_1_merfolk_hexproof
 A:AB$ Effect | Cost$ 3 U | ValidTgts$ Merfolk | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | StaticAbilities$ Unblockable | StackDescription$ {c:Targeted} can't be blocked this turn. | SpellDescription$ Target Merfolk can't be blocked this turn.
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 DeckHints:Type$Merfolk
-Oracle:When Aquatic Incursion enters the battlefield, create two 1/1 blue Merfolk creature tokens with hexproof. (They can't be the targets of spells or abilities your opponents control.)\n{3}{U}: Target Merfolk can't be blocked this turn.
+Oracle:When Aquatic Incursion enters, create two 1/1 blue Merfolk creature tokens with hexproof. (They can't be the targets of spells or abilities your opponents control.)\n{3}{U}: Target Merfolk can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/a/aragorn_and_arwen_wed.txt b/forge-gui/res/cardsfolder/a/aragorn_and_arwen_wed.txt
index 07aa8340d8f..519520e1d3f 100644
--- a/forge-gui/res/cardsfolder/a/aragorn_and_arwen_wed.txt
+++ b/forge-gui/res/cardsfolder/a/aragorn_and_arwen_wed.txt
@@ -3,11 +3,11 @@ ManaCost:4 G W
 Types:Legendary Creature Human Elf Noble
 PT:3/6
 K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounterAll | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, put a +1/+1 counter on each other creature you control. You gain 1 life for each other creature you control.
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPutCounterAll | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, put a +1/+1 counter on each other creature you control. You gain 1 life for each other creature you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounterAll | TriggerDescription$ Whenever CARDNAME enters or attacks, put a +1/+1 counter on each other creature you control. You gain 1 life for each other creature you control.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPutCounterAll | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, put a +1/+1 counter on each other creature you control. You gain 1 life for each other creature you control.
 SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl+StrictlyOther | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
 SVar:X:Count$Valid Creature.YouCtrl+StrictlyOther
 DeckHas:Ability$Counters|LifeGain
 SVar:HasAttackEffect:TRUE
-Oracle:Vigilance\nWhenever Aragorn and Arwen, Wed enters the battlefield or attacks, put a +1/+1 counter on each other creature you control. You gain 1 life for each other creature you control.
+Oracle:Vigilance\nWhenever Aragorn and Arwen, Wed enters or attacks, put a +1/+1 counter on each other creature you control. You gain 1 life for each other creature you control.
diff --git a/forge-gui/res/cardsfolder/a/aragorn_king_of_gondor.txt b/forge-gui/res/cardsfolder/a/aragorn_king_of_gondor.txt
index 0c83e189d6c..ddd8d887126 100644
--- a/forge-gui/res/cardsfolder/a/aragorn_king_of_gondor.txt
+++ b/forge-gui/res/cardsfolder/a/aragorn_king_of_gondor.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Human Noble
 PT:4/4
 K:Vigilance
 K:Lifelink
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters, you become the monarch.
 SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TgtNoBlock | TriggerDescription$ Whenever NICKNAME attacks, up to one target creature can't block this turn. If you're the monarch, creatures can't block this turn.
 SVar:TgtNoBlock:DB$ Pump | SubAbility$ AllNoBlock | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | ValidTgts$ Creature | KW$ HIDDEN CARDNAME can't block. | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target creature | StackDescription$ {c:Targeted} can't block this turn.
@@ -13,4 +13,4 @@ SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield |
 SVar:X:Count$Monarch.1.0
 SVar:HasAttackEffect:TRUE
 DeckHas:Ability$LifeGain
-Oracle:Vigilance, lifelink\nWhen Aragorn, King of Gondor enters the battlefield, you become the monarch.\nWhenever Aragorn attacks, up to one target creature can't block this turn. If you're the monarch, creatures can't block this turn.
+Oracle:Vigilance, lifelink\nWhen Aragorn, King of Gondor enters, you become the monarch.\nWhenever Aragorn attacks, up to one target creature can't block this turn. If you're the monarch, creatures can't block this turn.
diff --git a/forge-gui/res/cardsfolder/a/arashin_cleric.txt b/forge-gui/res/cardsfolder/a/arashin_cleric.txt
index 081458fc1c2..a292c3d8aa6 100644
--- a/forge-gui/res/cardsfolder/a/arashin_cleric.txt
+++ b/forge-gui/res/cardsfolder/a/arashin_cleric.txt
@@ -2,6 +2,6 @@ Name:Arashin Cleric
 ManaCost:1 W
 Types:Creature Human Cleric
 PT:1/3
-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
-Oracle:When Arashin Cleric enters the battlefield, you gain 3 life.
+Oracle:When Arashin Cleric enters, you gain 3 life.
diff --git a/forge-gui/res/cardsfolder/a/arashin_foremost.txt b/forge-gui/res/cardsfolder/a/arashin_foremost.txt
index 12806b44e96..b42c49113ab 100644
--- a/forge-gui/res/cardsfolder/a/arashin_foremost.txt
+++ b/forge-gui/res/cardsfolder/a/arashin_foremost.txt
@@ -3,10 +3,10 @@ ManaCost:1 W W
 Types:Creature Human Warrior
 PT:2/2
 K:Double Strike
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, another target Warrior creature you control gains double strike until end of turn.
-T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, another target Warrior creature you control gains double strike until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME enters or attacks, another target Warrior creature you control gains double strike until end of turn.
+T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters or attacks, another target Warrior creature you control gains double strike until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.Warrior+YouCtrl+Other | TgtPrompt$ Select another target Warrior creature you control | KW$ Double Strike
 SVar:HasAttackEffect:TRUE
 SVar:PlayMain1:TRUE
 DeckHints:Type$Warrior
-Oracle:Double strike\nWhenever Arashin Foremost enters the battlefield or attacks, another target Warrior creature you control gains double strike until end of turn.
+Oracle:Double strike\nWhenever Arashin Foremost enters or attacks, another target Warrior creature you control gains double strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/arbalest_engineers.txt b/forge-gui/res/cardsfolder/a/arbalest_engineers.txt
index 852824b9bca..a537802ea37 100644
--- a/forge-gui/res/cardsfolder/a/arbalest_engineers.txt
+++ b/forge-gui/res/cardsfolder/a/arbalest_engineers.txt
@@ -2,11 +2,11 @@ Name:Arbalest Engineers
 ManaCost:1 R G
 Types:Creature Human Artificer
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ When CARDNAME enters, ABILITY
 SVar:TrigCharm:DB$ Charm | Choices$ DBDealDamage,DBPutCounter,DBPowerstone
 SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target.
 SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | SubAbility$ DBPump | SpellDescription$ Put a +1/+1 counter on target creature. It gains trample and haste until end of turn.
 SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Trample & Haste | StackDescription$ None
 SVar:DBPowerstone:DB$ Token | TokenTapped$ True | TokenScript$ c_a_powerstone | SpellDescription$ Create a tapped Powerstone token. (It's an artifact with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.")
 DeckHas:Ability$Counters|Token & Type$Artifact
-Oracle:When Arbalest Engineers enters the battlefield, choose one —\n• Arbalest Engineers deals 1 damage to any target.\n• Put a +1/+1 counter on target creature. It gains trample and haste until end of turn.\n• Create a tapped Powerstone token. (It's an artifact with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.")
+Oracle:When Arbalest Engineers enters, choose one —\n• Arbalest Engineers deals 1 damage to any target.\n• Put a +1/+1 counter on target creature. It gains trample and haste until end of turn.\n• Create a tapped Powerstone token. (It's an artifact with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.")
diff --git a/forge-gui/res/cardsfolder/a/arbiter_of_knollridge.txt b/forge-gui/res/cardsfolder/a/arbiter_of_knollridge.txt
index a7b1178aa10..cb5cb03f582 100644
--- a/forge-gui/res/cardsfolder/a/arbiter_of_knollridge.txt
+++ b/forge-gui/res/cardsfolder/a/arbiter_of_knollridge.txt
@@ -3,7 +3,7 @@ ManaCost:6 W
 Types:Creature Giant Wizard
 PT:5/5
 K:Vigilance
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigLife | TriggerDescription$ When CARDNAME enters the battlefield, each player's life total becomes the highest life total among all players.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigLife | TriggerDescription$ When CARDNAME enters, each player's life total becomes the highest life total among all players.
 SVar:TrigLife:DB$ SetLife | Defined$ Player | LifeAmount$ X
 SVar:X:PlayerCountPlayers$HighestLifeTotal
-Oracle:Vigilance\nWhen Arbiter of Knollridge enters the battlefield, each player's life total becomes the highest life total among all players.
+Oracle:Vigilance\nWhen Arbiter of Knollridge enters, each player's life total becomes the highest life total among all players.
diff --git a/forge-gui/res/cardsfolder/a/arborback_stomper.txt b/forge-gui/res/cardsfolder/a/arborback_stomper.txt
index 52fe7dc78b4..060ac0a56e3 100644
--- a/forge-gui/res/cardsfolder/a/arborback_stomper.txt
+++ b/forge-gui/res/cardsfolder/a/arborback_stomper.txt
@@ -3,6 +3,6 @@ ManaCost:3 G G
 Types:Creature Beast
 PT:5/4
 K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 5 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters, you gain 5 life.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 5
-Oracle:Trample\nWhen Arborback Stomper enters the battlefield, you gain 5 life.
+Oracle:Trample\nWhen Arborback Stomper enters, you gain 5 life.
diff --git a/forge-gui/res/cardsfolder/a/arborea_pegasus.txt b/forge-gui/res/cardsfolder/a/arborea_pegasus.txt
index 646e66c8b3b..ee6dc0ad135 100644
--- a/forge-gui/res/cardsfolder/a/arborea_pegasus.txt
+++ b/forge-gui/res/cardsfolder/a/arborea_pegasus.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Creature Pegasus
 PT:2/3
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gets +1/+1 and gains flying until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters, target creature gets +1/+1 and gains flying until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 1 | NumDef$ 1 | KW$ Flying
 SVar:PlayMain1:TRUE
-Oracle:Flying\nWhen Arborea Pegasus enters the battlefield, target creature gets +1/+1 and gains flying until end of turn.
+Oracle:Flying\nWhen Arborea Pegasus enters, target creature gets +1/+1 and gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/arboreal_alliance.txt b/forge-gui/res/cardsfolder/a/arboreal_alliance.txt
index 8b494a47517..b52fbdf746e 100644
--- a/forge-gui/res/cardsfolder/a/arboreal_alliance.txt
+++ b/forge-gui/res/cardsfolder/a/arboreal_alliance.txt
@@ -1,11 +1,11 @@
 Name:Arboreal Alliance
 ManaCost:X G G
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create an X/X green Treefolk creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create an X/X green Treefolk creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_x_x_treefolk | TokenPower$ X | TokenToughness$ X
 SVar:X:Count$xPaid
 T:Mode$ AttackersDeclared | ValidAttackers$ Creature.Elf+YouCtrl | Execute$ TrigPopulate | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack with one or more Elves, populate. (Create a token that's a copy of a creature token you control.)
 SVar:TrigPopulate:DB$ CopyPermanent | Choices$ Creature.token+YouCtrl | Populate$ True
 DeckHas:Ability$Token & Type$Treefolk
 DeckHints:Type$Elf
-Oracle:When Arboreal Alliance enters the battlefield, create an X/X green Treefolk creature token.\nWhenever you attack with one or more Elves, populate. (Create a token that's a copy of a creature token you control.)
+Oracle:When Arboreal Alliance enters, create an X/X green Treefolk creature token.\nWhenever you attack with one or more Elves, populate. (Create a token that's a copy of a creature token you control.)
diff --git a/forge-gui/res/cardsfolder/a/arboreal_grazer.txt b/forge-gui/res/cardsfolder/a/arboreal_grazer.txt
index df741911026..a2d25d77c0d 100644
--- a/forge-gui/res/cardsfolder/a/arboreal_grazer.txt
+++ b/forge-gui/res/cardsfolder/a/arboreal_grazer.txt
@@ -3,6 +3,6 @@ ManaCost:G
 Types:Creature Beast
 PT:0/3
 K:Reach
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may put a land card from your hand onto the battlefield tapped.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters, you may put a land card from your hand onto the battlefield tapped.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.YouCtrl
-Oracle:Reach\nWhen Arboreal Grazer enters the battlefield, you may put a land card from your hand onto the battlefield tapped.
+Oracle:Reach\nWhen Arboreal Grazer enters, you may put a land card from your hand onto the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/a/arcades_the_strategist.txt b/forge-gui/res/cardsfolder/a/arcades_the_strategist.txt
index a4a2a0b0494..d13f91b73bf 100644
--- a/forge-gui/res/cardsfolder/a/arcades_the_strategist.txt
+++ b/forge-gui/res/cardsfolder/a/arcades_the_strategist.txt
@@ -6,7 +6,7 @@ K:Flying
 K:Vigilance
 S:Mode$ CombatDamageToughness | ValidCard$ Creature.withDefender+YouCtrl | Description$ Each creature you control with defender assigns combat damage equal to its toughness rather than its power and can attack as though it didn't have defender.
 S:Mode$ CanAttackDefender | ValidCard$ Creature.withDefender+YouCtrl | Secondary$ True | Description$ Each creature you control with defender assigns combat damage equal to its toughness rather than its power and can attack as though it didn't have defender.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.withDefender+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a creature with defender enters the battlefield under your control, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.withDefender+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a creature you control with defender enters, draw a card.
 SVar:TrigDraw:DB$ Draw
 DeckNeeds:Keyword$Defender
-Oracle:Flying, vigilance\nWhenever a creature with defender enters the battlefield under your control, draw a card.\nEach creature you control with defender assigns combat damage equal to its toughness rather than its power and can attack as though it didn't have defender.
+Oracle:Flying, vigilance\nWhenever a creature you control with defender enters, draw a card.\nEach creature you control with defender assigns combat damage equal to its toughness rather than its power and can attack as though it didn't have defender.
diff --git a/forge-gui/res/cardsfolder/a/arcane_adaptation.txt b/forge-gui/res/cardsfolder/a/arcane_adaptation.txt
index 06533bd72da..87aaa238e52 100644
--- a/forge-gui/res/cardsfolder/a/arcane_adaptation.txt
+++ b/forge-gui/res/cardsfolder/a/arcane_adaptation.txt
@@ -2,6 +2,6 @@ Name:Arcane Adaptation
 ManaCost:2 U
 Types:Enchantment
 K:ETBReplacement:Other:DBChooseCreatureType
-SVar:DBChooseCreatureType:DB$ ChooseType | Type$ Creature | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type.
+SVar:DBChooseCreatureType:DB$ ChooseType | Type$ Creature | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters, choose a creature type.
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | AddType$ ChosenType | Description$ Creatures you control are the chosen type in addition to their other types. The same is true for creature spells you control and creature cards you own that aren't on the battlefield.
-Oracle:As Arcane Adaptation enters the battlefield, choose a creature type.\nCreatures you control are the chosen type in addition to their other types. The same is true for creature spells you control and creature cards you own that aren't on the battlefield.
+Oracle:As Arcane Adaptation enters, choose a creature type.\nCreatures you control are the chosen type in addition to their other types. The same is true for creature spells you control and creature cards you own that aren't on the battlefield.
diff --git a/forge-gui/res/cardsfolder/a/arcane_archery.txt b/forge-gui/res/cardsfolder/a/arcane_archery.txt
index 7d1fc9c8391..ae13c6b3f3e 100644
--- a/forge-gui/res/cardsfolder/a/arcane_archery.txt
+++ b/forge-gui/res/cardsfolder/a/arcane_archery.txt
@@ -2,11 +2,11 @@ Name:Arcane Archery
 ManaCost:2 G
 Types:Instant
 A:SP$ Pump | ValidTgts$ Creature | NumAtt$ 3 | NumDef$ 3 | KW$ Reach & Trample | SubAbility$ DBBoon | SpellDescription$ Target creature gets +3/+3 and gains reach and trample until end of turn.
-SVar:DBBoon:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast | StackDescription$ SpellDescription | SpellDescription$ ,,,,,,You get a boon with "When you cast your next creature spell, that creature enters the battlefield with an additional +1/+1 counter, reach counter, and trample counter on it."
-SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ ReplEffAddCounter | TriggerDescription$ When you cast your next creature spell, that creature enters the battlefield with an additional +1/+1 counter, reach counter, and trample counter on it.
+SVar:DBBoon:DB$ Effect | Boon$ True | Duration$ Permanent | Triggers$ SpellCast | StackDescription$ SpellDescription | SpellDescription$ ,,,,,,You get a boon with "When you cast your next creature spell, that creature enters with an additional +1/+1 counter, reach counter, and trample counter on it."
+SVar:SpellCast:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ ReplEffAddCounter | TriggerDescription$ When you cast your next creature spell, that creature enters with an additional +1/+1 counter, reach counter, and trample counter on it.
 SVar:ReplEffAddCounter:DB$ Effect | ReplacementEffects$ ETBAddCounter | RememberObjects$ TriggeredCard
 SVar:ETBAddCounter:Event$ Moved | Origin$ Stack | Destination$ Battlefield | ValidCard$ Card.IsRemembered | ReplaceWith$ ETBAddExtraCounter | ReplacementResult$ Updated
 SVar:ETBAddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterTypes$ P1P1,Reach,Trample | CounterNum$ 1 | SubAbility$ DBRemoveSelf
 SVar:DBRemoveSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 DeckHas:Ability$Counters
-Oracle:Target creature gets +3/+3 and gains reach and trample until end of turn.\nYou get a boon with "When you cast your next creature spell, that creature enters the battlefield with an additional +1/+1 counter, reach counter, and trample counter on it."
+Oracle:Target creature gets +3/+3 and gains reach and trample until end of turn.\nYou get a boon with "When you cast your next creature spell, that creature enters with an additional +1/+1 counter, reach counter, and trample counter on it."
diff --git a/forge-gui/res/cardsfolder/a/arcane_proxy.txt b/forge-gui/res/cardsfolder/a/arcane_proxy.txt
index e67d00dfd07..05d6830d605 100644
--- a/forge-gui/res/cardsfolder/a/arcane_proxy.txt
+++ b/forge-gui/res/cardsfolder/a/arcane_proxy.txt
@@ -3,10 +3,10 @@ ManaCost:7
 Types:Artifact Creature Wizard
 PT:4/3
 K:Prototype:1 U U:2:1
-T:Mode$ ChangesZone | ValidCard$ Card.Self+wasCastByYou | Destination$ Battlefield | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it, exile target instant or sorcery card with mana value less than or equal to CARDNAME's power from your graveyard. Copy that card. You may cast the copy without paying its mana cost.
+T:Mode$ ChangesZone | ValidCard$ Card.Self+wasCastByYou | Destination$ Battlefield | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, if you cast it, exile target instant or sorcery card with mana value less than or equal to CARDNAME's power from your graveyard. Copy that card. You may cast the copy without paying its mana cost.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Select target instant or sorcery card with mana value less than or equal to CARDNAME's power | ValidTgts$ Instant.YouOwn+cmcLEX,Sorcery.YouOwn+cmcLEX | RememberChanged$ True | SubAbility$ DBPlay
 SVar:DBPlay:DB$ Play | Valid$ Card.IsRemembered | ValidZone$ Exile | Controller$ You | CopyCard$ True | WithoutManaCost$ True | ValidSA$ Spell | Optional$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHints:Type$Instant|Sorcery & Color$Blue
 SVar:X:Count$CardPower
-Oracle:Prototype {1}{U}{U} — 2/1 (You may cast this spell with different mana cost, color, and size. It keeps its abilities and types.)\nWhen Arcane Proxy enters the battlefield, if you cast it, exile target instant or sorcery card with mana value less than or equal to Arcane Proxy's power from your graveyard. Copy that card. You may cast the copy without paying its mana cost.
+Oracle:Prototype {1}{U}{U} — 2/1 (You may cast this spell with different mana cost, color, and size. It keeps its abilities and types.)\nWhen Arcane Proxy enters, if you cast it, exile target instant or sorcery card with mana value less than or equal to Arcane Proxy's power from your graveyard. Copy that card. You may cast the copy without paying its mana cost.
diff --git a/forge-gui/res/cardsfolder/a/arcane_sanctum.txt b/forge-gui/res/cardsfolder/a/arcane_sanctum.txt
index 674af2fe14f..c2349b2be3d 100644
--- a/forge-gui/res/cardsfolder/a/arcane_sanctum.txt
+++ b/forge-gui/res/cardsfolder/a/arcane_sanctum.txt
@@ -1,6 +1,7 @@
 Name:Arcane Sanctum
 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 W U B | SpellDescription$ Add {W}, {U}, or {B}.
-Oracle:Arcane Sanctum enters the battlefield tapped.\n{T}: Add {W}, {U}, or {B}.
+Oracle:Arcane Sanctum enters tapped.\n{T}: Add {W}, {U}, or {B}.
diff --git a/forge-gui/res/cardsfolder/a/arcane_savant.txt b/forge-gui/res/cardsfolder/a/arcane_savant.txt
index 76c7646368f..0e4e52d711b 100644
--- a/forge-gui/res/cardsfolder/a/arcane_savant.txt
+++ b/forge-gui/res/cardsfolder/a/arcane_savant.txt
@@ -7,6 +7,6 @@ SVar:DBReveal:DB$ Reveal | RevealDefined$ Self | SubAbility$ DBExile | SpellDesc
 SVar:DBExile:DB$ ChangeZone | Origin$ Sideboard | Destination$ Exile | ChangeType$ Instant.YouOwn,Sorcery.YouOwn | Optional$ True | RememberChanged$ True | SubAbility$ DBPump | ConditionGameTypes$ Draft,QuestDraft | SelectPrompt$ Exile with CARDNAME
 SVar:DBPump:DB$ Pump | NoteCards$ Remembered | NoteCardsFor$ ArcaneSavant | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPlay | TriggerDescription$ When CARDNAME enters the battlefield, copy a card you exiled with cards named Arcane Savant. You may cast the copy without paying its mana cost.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPlay | TriggerDescription$ When CARDNAME enters, copy a card you exiled with cards named Arcane Savant. You may cast the copy without paying its mana cost.
 SVar:TrigPlay:DB$ Play | Valid$ Card.YouOwn+NotedForArcaneSavant | ValidSA$ Spell | ValidZone$ Exile | Amount$ 1 | WithoutManaCost$ True | Optional$ True | CopyCard$ True | SpellDescription$ You may copy the exiled card. If you do, you may cast the copy without paying its mana cost. | SubAbility$ DBCleanup
-Oracle:Before you shuffle your deck to start the game, you may reveal this card from your deck and exile an instant or sorcery card you drafted that isn't in your deck.\nWhen Arcane Savant enters the battlefield, copy a card you exiled with cards named Arcane Savant. You may cast the copy without paying its mana cost.
+Oracle:Before you shuffle your deck to start the game, you may reveal this card from your deck and exile an instant or sorcery card you drafted that isn't in your deck.\nWhen Arcane Savant enters, copy a card you exiled with cards named Arcane Savant. You may cast the copy without paying its mana cost.
diff --git a/forge-gui/res/cardsfolder/a/arcane_teachings.txt b/forge-gui/res/cardsfolder/a/arcane_teachings.txt
index 2b1ad2f4b8f..47d368dfdc8 100644
--- a/forge-gui/res/cardsfolder/a/arcane_teachings.txt
+++ b/forge-gui/res/cardsfolder/a/arcane_teachings.txt
@@ -5,4 +5,4 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 2 R | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddAbility$ Damage | Description$ Enchanted creature gets +2/+2 and has "{T}: This creature deals 1 damage to any target."
 SVar:Damage:AB$ DealDamage | Cost$ T | ValidTgts$ Any | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target.
-Oracle:Enchant creature (Target a creature as you cast this. This card enters the battlefield attached to that creature.)\nEnchanted creature gets +2/+2 and has "{T}: This creature deals 1 damage to any target."
+Oracle:Enchant creature (Target a creature as you cast this. This card enters attached to that creature.)\nEnchanted creature gets +2/+2 and has "{T}: This creature deals 1 damage to any target."
diff --git a/forge-gui/res/cardsfolder/a/arcanists_owl.txt b/forge-gui/res/cardsfolder/a/arcanists_owl.txt
index 82afe001177..cb49de737b6 100644
--- a/forge-gui/res/cardsfolder/a/arcanists_owl.txt
+++ b/forge-gui/res/cardsfolder/a/arcanists_owl.txt
@@ -3,6 +3,6 @@ ManaCost:WU WU WU WU
 Types:Artifact Creature Bird
 PT:3/3
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top four cards of your library. You may reveal an artifact or enchantment card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters, look at the top four cards of your library. You may reveal an artifact or enchantment card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
 SVar:TrigDig:DB$ Dig | DigNum$ 4 | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Artifact,Enchantment | RestRandomOrder$ True
-Oracle:Flying\nWhen Arcanist's Owl enters the battlefield, look at the top four cards of your library. You may reveal an artifact or enchantment card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
+Oracle:Flying\nWhen Arcanist's Owl enters, look at the top four cards of your library. You may reveal an artifact or enchantment card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/a/arcbound_bruiser.txt b/forge-gui/res/cardsfolder/a/arcbound_bruiser.txt
index edc9bdaaf6b..2bb3248dbe7 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_bruiser.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_bruiser.txt
@@ -4,4 +4,4 @@ Types:Artifact Creature Golem
 PT:0/0
 K:Modular:3
 DeckHas:Ability$Counters
-Oracle:Modular 3 (This creature enters the battlefield with three +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:Modular 3 (This creature enters with three +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_condor.txt b/forge-gui/res/cardsfolder/a/arcbound_condor.txt
index bfa6d6a7e91..5a924f980fe 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_condor.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_condor.txt
@@ -4,8 +4,8 @@ Types:Artifact Creature Bird
 PT:0/0
 K:Flying
 K:Modular:3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another artifact enters the battlefield under your control, target creature an opponent controls gets -1/-1 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another artifact you control enters, target creature an opponent controls gets -1/-1 until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls. | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True
 DeckHas:Ability$Counters
 DeckNeeds:Type$Artifact
-Oracle:Flying\nModular 3 (This creature enters the battlefield with three +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)\nWhenever another artifact enters the battlefield under your control, target creature an opponent controls gets -1/-1 until end of turn.
+Oracle:Flying\nModular 3 (This creature enters with three +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)\nWhenever another artifact you control enters, target creature an opponent controls gets -1/-1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/arcbound_crusher.txt b/forge-gui/res/cardsfolder/a/arcbound_crusher.txt
index ff6588a4229..708cbab3efb 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_crusher.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_crusher.txt
@@ -4,9 +4,9 @@ Types:Artifact Creature Juggernaut
 PT:0/0
 K:Trample
 K:Modular:1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another artifact enters the battlefield, put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another artifact enters, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:BuffedBy:Artifact
 DeckHas:Ability$Counters
 DeckNeeds:Type$Artifact
-Oracle:Trample\nWhenever another artifact enters the battlefield, put a +1/+1 counter on Arcbound Crusher.\nModular 1 (This creature enters the battlefield with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:Trample\nWhenever another artifact enters, put a +1/+1 counter on Arcbound Crusher.\nModular 1 (This creature enters with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_fiend.txt b/forge-gui/res/cardsfolder/a/arcbound_fiend.txt
index 578e0ea5ece..55e5618dd17 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_fiend.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_fiend.txt
@@ -7,4 +7,4 @@ K:Fear
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigMoveCounter | TriggerDescription$ At the beginning of your upkeep, you may move a +1/+1 counter from target creature onto CARDNAME.
 SVar:TrigMoveCounter:DB$ MoveCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
-Oracle:Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)\nAt the beginning of your upkeep, you may move a +1/+1 counter from target creature onto Arcbound Fiend.\nModular 3 (This creature enters the battlefield with three +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:Fear (This creature can't be blocked except by artifact creatures and/or black creatures.)\nAt the beginning of your upkeep, you may move a +1/+1 counter from target creature onto Arcbound Fiend.\nModular 3 (This creature enters with three +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_hybrid.txt b/forge-gui/res/cardsfolder/a/arcbound_hybrid.txt
index 6cf42bada1f..7d65595f4f4 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_hybrid.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_hybrid.txt
@@ -5,4 +5,4 @@ PT:0/0
 K:Haste
 K:Modular:2
 DeckHas:Ability$Counters
-Oracle:Haste\nModular 2 (This creature enters the battlefield with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:Haste\nModular 2 (This creature enters with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_javelineer.txt b/forge-gui/res/cardsfolder/a/arcbound_javelineer.txt
index 1d752657d71..07019a360d4 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_javelineer.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_javelineer.txt
@@ -7,4 +7,4 @@ A:AB$ DealDamage | Cost$ T SubCounter<X/P1P1> | ValidTgts$ Creature.attacking,Cr
 SVar:X:Count$xPaid
 DeckHas:Ability$Counters
 DeckHints:Type$Artifact & Ability$Counters|Proliferate
-Oracle:{T}, Remove X +1/+1 counters from Arcbound Javelineer: It deals X damage to target attacking or blocking creature.\nModular 1 (This creature enters the battlefield with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:{T}, Remove X +1/+1 counters from Arcbound Javelineer: It deals X damage to target attacking or blocking creature.\nModular 1 (This creature enters with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_lancer.txt b/forge-gui/res/cardsfolder/a/arcbound_lancer.txt
index 28fc26c2526..d6bd16e6978 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_lancer.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_lancer.txt
@@ -5,4 +5,4 @@ PT:0/0
 K:First Strike
 K:Modular:4
 DeckHas:Ability$Counters
-Oracle:First strike\nModular 4 (This creature enters the battlefield with four +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:First strike\nModular 4 (This creature enters with four +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_mouser.txt b/forge-gui/res/cardsfolder/a/arcbound_mouser.txt
index 7f8f3e488e9..1b41a0690a7 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_mouser.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_mouser.txt
@@ -5,4 +5,4 @@ PT:0/0
 K:Lifelink
 K:Modular:1
 DeckHas:Ability$Counters|LifeGain
-Oracle:Lifelink\nModular 1 (This creature enters the battlefield with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:Lifelink\nModular 1 (This creature enters with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_overseer.txt b/forge-gui/res/cardsfolder/a/arcbound_overseer.txt
index ffed152b39b..f9b09191dc2 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_overseer.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_overseer.txt
@@ -7,4 +7,4 @@ T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | ValidPlayer$ You | E
 SVar:TrigPutCounter:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl+withModular | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
 DeckNeeds:Keyword$Modular
-Oracle:At the beginning of your upkeep, put a +1/+1 counter on each creature with modular you control.\nModular 6 (This creature enters the battlefield with six +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:At the beginning of your upkeep, put a +1/+1 counter on each creature with modular you control.\nModular 6 (This creature enters with six +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_prototype.txt b/forge-gui/res/cardsfolder/a/arcbound_prototype.txt
index 81c86302704..d4591be371c 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_prototype.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_prototype.txt
@@ -4,4 +4,4 @@ Types:Artifact Creature Assembly-Worker
 PT:0/0
 K:Modular:2
 DeckHas:Ability$Counters
-Oracle:Modular 2 (This creature enters the battlefield with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:Modular 2 (This creature enters with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_ravager.txt b/forge-gui/res/cardsfolder/a/arcbound_ravager.txt
index 0fe32f72e0d..71f7f12c3ca 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_ravager.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_ravager.txt
@@ -6,4 +6,4 @@ A:AB$ PutCounter | Cost$ Sac<1/Artifact> | CounterType$ P1P1 | CounterNum$ 1 | S
 K:Modular:1
 SVar:BuffedBy:Artifact
 DeckHas:Ability$Counters
-Oracle:Sacrifice an artifact: Put a +1/+1 counter on Arcbound Ravager.\nModular 1 (This creature enters the battlefield with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:Sacrifice an artifact: Put a +1/+1 counter on Arcbound Ravager.\nModular 1 (This creature enters with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_reclaimer.txt b/forge-gui/res/cardsfolder/a/arcbound_reclaimer.txt
index 78422aae4f2..c820a8f97ed 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_reclaimer.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_reclaimer.txt
@@ -7,4 +7,4 @@ K:Modular:2
 DeckHas:Ability$Counters
 SVar:BuffedBy:Artifact
 AI:RemoveDeck:Random
-Oracle:Remove a +1/+1 counter from Arcbound Reclaimer: Put target artifact card from your graveyard on top of your library.\nModular 2 (This creature enters the battlefield with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:Remove a +1/+1 counter from Arcbound Reclaimer: Put target artifact card from your graveyard on top of your library.\nModular 2 (This creature enters with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_shikari.txt b/forge-gui/res/cardsfolder/a/arcbound_shikari.txt
index 1692e477aff..5e2eb6fbbf6 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_shikari.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_shikari.txt
@@ -3,9 +3,9 @@ ManaCost:1 R W
 Types:Artifact Creature Cat Soldier
 PT:0/0
 K:First Strike
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on each other artifact creature you control.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters, put a +1/+1 counter on each other artifact creature you control.
 SVar:TrigPutCounter:DB$ PutCounterAll | ValidCards$ Creature.Artifact+StrictlyOther+YouCtrl | CounterType$ P1P1 | CounterNum$ 1
 K:Modular:2
 DeckHas:Ability$Counters
 SVar:PlayMain1:TRUE
-Oracle:First strike\nWhen Arcbound Shikari enters the battlefield, put a +1/+1 counter on each other artifact creature you control.\nModular 2 (This creature enters the battlefield with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:First strike\nWhen Arcbound Shikari enters, put a +1/+1 counter on each other artifact creature you control.\nModular 2 (This creature enters with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_slasher.txt b/forge-gui/res/cardsfolder/a/arcbound_slasher.txt
index 8a41c7d8e52..5859304ebbb 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_slasher.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_slasher.txt
@@ -5,4 +5,4 @@ PT:0/0
 K:Modular:4
 K:Riot
 DeckHas:Ability$Counters
-Oracle:Modular 4 (This creature enters the battlefield with four +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)\nRiot (This creature enters the battlefield with your choice of an additional +1/+1 counter or haste.)
+Oracle:Modular 4 (This creature enters with four +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)\nRiot (This creature enters with your choice of an additional +1/+1 counter or haste.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_slith.txt b/forge-gui/res/cardsfolder/a/arcbound_slith.txt
index 0ebc960a72f..d0693240f9f 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_slith.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_slith.txt
@@ -6,4 +6,4 @@ K:Modular:1
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, put a +1/+1 counter on it.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
-Oracle:Whenever Arcbound Slith deals combat damage to a player, put a +1/+1 counter on it.\nModular 1 (This creature enters the battlefield with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:Whenever Arcbound Slith deals combat damage to a player, put a +1/+1 counter on it.\nModular 1 (This creature enters with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_stinger.txt b/forge-gui/res/cardsfolder/a/arcbound_stinger.txt
index 97420887c39..bb02b0b38ed 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_stinger.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_stinger.txt
@@ -5,4 +5,4 @@ PT:0/0
 K:Flying
 K:Modular:1
 DeckHas:Ability$Counters
-Oracle:Flying\nModular 1 (This creature enters the battlefield with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:Flying\nModular 1 (This creature enters with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_tracker.txt b/forge-gui/res/cardsfolder/a/arcbound_tracker.txt
index 6d6a0636445..1ec750943c9 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_tracker.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_tracker.txt
@@ -8,4 +8,4 @@ T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | ValidActivatingPlayer$ You | Trigg
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters
 DeckHints:Type$Artifact
-Oracle:Menace\nModular 2 (This creature enters the battlefield with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)\nWhenever you cast a spell other than your first spell each turn, put a +1/+1 counter on Arcbound Tracker.
+Oracle:Menace\nModular 2 (This creature enters with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)\nWhenever you cast a spell other than your first spell each turn, put a +1/+1 counter on Arcbound Tracker.
diff --git a/forge-gui/res/cardsfolder/a/arcbound_wanderer.txt b/forge-gui/res/cardsfolder/a/arcbound_wanderer.txt
index 824573cb4ef..71f19f62fc6 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_wanderer.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_wanderer.txt
@@ -6,4 +6,4 @@ K:Modular:Sunburst
 DeckHas:Ability$Counters
 DeckHints:Ability$Proliferate
 AI:RemoveDeck:Random
-Oracle:Modular—Sunburst (This creature enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:Modular—Sunburst (This creature enters with a +1/+1 counter on it for each color of mana spent to cast it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_whelp.txt b/forge-gui/res/cardsfolder/a/arcbound_whelp.txt
index e42ef06d4d9..ccf0bdab0f4 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_whelp.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_whelp.txt
@@ -6,4 +6,4 @@ K:Flying
 K:Modular:2
 A:AB$ Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 DeckHas:Ability$Counters
-Oracle:Flying\n{R}: Arcbound Whelp gets +1/+0 until end of turn.\nModular 2 (This creature enters the battlefield with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:Flying\n{R}: Arcbound Whelp gets +1/+0 until end of turn.\nModular 2 (This creature enters with two +1/+1 counters on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/arcbound_worker.txt b/forge-gui/res/cardsfolder/a/arcbound_worker.txt
index d4fb2abf5f6..81d10df6d03 100644
--- a/forge-gui/res/cardsfolder/a/arcbound_worker.txt
+++ b/forge-gui/res/cardsfolder/a/arcbound_worker.txt
@@ -4,4 +4,4 @@ Types:Artifact Creature Construct
 PT:0/0
 K:Modular:1
 DeckHas:Ability$Counters
-Oracle:Modular 1 (This creature enters the battlefield with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
+Oracle:Modular 1 (This creature enters with a +1/+1 counter on it. When it dies, you may put its +1/+1 counters on target artifact creature.)
diff --git a/forge-gui/res/cardsfolder/a/archaeomancer.txt b/forge-gui/res/cardsfolder/a/archaeomancer.txt
index 5f0f67e36e4..d38d5985ac9 100644
--- a/forge-gui/res/cardsfolder/a/archaeomancer.txt
+++ b/forge-gui/res/cardsfolder/a/archaeomancer.txt
@@ -2,6 +2,6 @@ Name:Archaeomancer
 ManaCost:2 U U
 Types:Creature Human Wizard
 PT:1/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target instant or sorcery card from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, return target instant or sorcery card from your graveyard to your hand.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Instant.YouCtrl,Sorcery.YouCtrl
-Oracle:When Archaeomancer enters the battlefield, return target instant or sorcery card from your graveyard to your hand.
+Oracle:When Archaeomancer enters, return target instant or sorcery card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/a/archaeomancers_map.txt b/forge-gui/res/cardsfolder/a/archaeomancers_map.txt
index 3e70dc04dda..1ff850adb0e 100644
--- a/forge-gui/res/cardsfolder/a/archaeomancers_map.txt
+++ b/forge-gui/res/cardsfolder/a/archaeomancers_map.txt
@@ -1,8 +1,8 @@
 Name:Archaeomancer's Map
 ManaCost:2 W
 Types:Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When CARDNAME enters the battlefield, search your library for up to two basic Plains cards, reveal them, put them into your hand, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | TriggerDescription$ When CARDNAME enters, search your library for up to two basic Plains cards, reveal them, put them into your hand, then shuffle.
 SVar:TrigSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Plains.Basic | ChangeNum$ 2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.OppCtrl+ControllerControlsMoreLand | TriggerZones$ Battlefield | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ Whenever a land enters the battlefield under an opponent's control, if that player controls more lands than you, you may put a land card from your hand onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.OppCtrl+ControllerControlsMoreLand | TriggerZones$ Battlefield | Execute$ TrigChangeZone | OptionalDecider$ You | TriggerDescription$ Whenever a land enters under an opponent's control, if that player controls more lands than you, you may put a land card from your hand onto the battlefield.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land.YouCtrl
-Oracle:When Archaeomancer's Map enters the battlefield, search your library for up to two basic Plains cards, reveal them, put them into your hand, then shuffle.\nWhenever a land enters the battlefield under an opponent's control, if that player controls more lands than you, you may put a land card from your hand onto the battlefield.
+Oracle:When Archaeomancer's Map enters, search your library for up to two basic Plains cards, reveal them, put them into your hand, then shuffle.\nWhenever a land enters under an opponent's control, if that player controls more lands than you, you may put a land card from your hand onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/a/archaeomender.txt b/forge-gui/res/cardsfolder/a/archaeomender.txt
index 779da581458..c8b67e1873f 100644
--- a/forge-gui/res/cardsfolder/a/archaeomender.txt
+++ b/forge-gui/res/cardsfolder/a/archaeomender.txt
@@ -2,7 +2,7 @@ Name:Archaeomender
 ManaCost:2 U
 Types:Creature Human Wizard
 PT:2/3
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target artifact card from your graveyard to your hand.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, return target artifact card from your graveyard to your hand.
 SVar:TrigChangeZone:DB$ ChangeZone | ValidTgts$ Artifact.YouCtrl | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Select target artifact from your graveyard
 DeckHints:Type$Artifact
-Oracle:When Archaeomender enters the battlefield, return target artifact card from your graveyard to your hand.
+Oracle:When Archaeomender enters, return target artifact card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/a/archangel_avacyn_avacyn_the_purifier.txt b/forge-gui/res/cardsfolder/a/archangel_avacyn_avacyn_the_purifier.txt
index 2d1140de4b4..165362f044f 100644
--- a/forge-gui/res/cardsfolder/a/archangel_avacyn_avacyn_the_purifier.txt
+++ b/forge-gui/res/cardsfolder/a/archangel_avacyn_avacyn_the_purifier.txt
@@ -5,13 +5,13 @@ PT:4/4
 K:Flash
 K:Flying
 K:Vigilance
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME enters the battlefield, creatures you control gain indestructible until end of turn.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpAll | TriggerDescription$ When CARDNAME enters, creatures you control gain indestructible until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Indestructible
 T:Mode$ ChangesZone | ValidCard$ Creature.nonAngel+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDelayTransform | TriggerZones$ Battlefield | TriggerDescription$ When a non-Angel creature you control dies, transform CARDNAME at the beginning of the next upkeep.
 SVar:TrigDelayTransform:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | Execute$ TrigTransform | TriggerDescription$ CARDNAME — Transform it at the beginning of the next end step.
 SVar:TrigTransform:DB$ SetState | Defined$ Self | Mode$ Transform
 AlternateMode:DoubleFaced
-Oracle:Flash\nFlying, vigilance\nWhen Archangel Avacyn enters the battlefield, creatures you control gain indestructible until end of turn.\nWhen a non-Angel creature you control dies, transform Archangel Avacyn at the beginning of the next upkeep.
+Oracle:Flash\nFlying, vigilance\nWhen Archangel Avacyn enters, creatures you control gain indestructible until end of turn.\nWhen a non-Angel creature you control dies, transform Archangel Avacyn at the beginning of the next upkeep.
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/a/archangel_of_strife.txt b/forge-gui/res/cardsfolder/a/archangel_of_strife.txt
index 9c6d127d480..f2e1728046f 100644
--- a/forge-gui/res/cardsfolder/a/archangel_of_strife.txt
+++ b/forge-gui/res/cardsfolder/a/archangel_of_strife.txt
@@ -4,10 +4,10 @@ Types:Creature Angel
 PT:6/6
 K:Flying
 K:ETBReplacement:Other:ChooseEach
-SVar:ChooseEach:DB$ GenericChoice | Defined$ Player | TempRemember$ Chooser | Choices$ WarChoice,PeaceChoice | ShowChoice$ ExceptSelf | SpellDescription$ As CARDNAME enters the battlefield, each player chooses war or peace.
+SVar:ChooseEach:DB$ GenericChoice | Defined$ Player | TempRemember$ Chooser | Choices$ WarChoice,PeaceChoice | ShowChoice$ ExceptSelf | SpellDescription$ As CARDNAME enters, each player chooses war or peace.
 SVar:WarChoice:DB$ Pump | Defined$ Remembered | NoteCards$ Self | NoteCardsFor$ War | SpellDescription$ War
 SVar:PeaceChoice:DB$ Pump | Defined$ Remembered | NoteCards$ Self | NoteCardsFor$ Peace | SpellDescription$ Peace
 S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Creature.ControlledBy Player.NotedForWar | AddPower$ 3 | Description$ Creatures controlled by players who chose war get +3/+0.
 S:Mode$ Continuous | AffectedZone$ Battlefield | Affected$ Creature.ControlledBy Player.NotedForPeace | AddToughness$ 3 | Description$ Creatures controlled by players who chose peace get +0/+3.
 AI:RemoveDeck:Random
-Oracle:Flying\nAs Archangel of Strife enters the battlefield, each player chooses war or peace.\nCreatures controlled by players who chose war get +3/+0.\nCreatures controlled by players who chose peace get +0/+3.
+Oracle:Flying\nAs Archangel of Strife enters, each player chooses war or peace.\nCreatures controlled by players who chose war get +3/+0.\nCreatures controlled by players who chose peace get +0/+3.
diff --git a/forge-gui/res/cardsfolder/a/archangel_of_wrath.txt b/forge-gui/res/cardsfolder/a/archangel_of_wrath.txt
index 5572d3c9283..d339d27bd21 100644
--- a/forge-gui/res/cardsfolder/a/archangel_of_wrath.txt
+++ b/forge-gui/res/cardsfolder/a/archangel_of_wrath.txt
@@ -5,9 +5,9 @@ PT:3/4
 K:Kicker:B:R
 K:Flying
 K:Lifelink
-T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked | Origin$ Any | Destination$ Battlefield | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked, it deals 2 damage to any target.
-T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked | Origin$ Any | Destination$ Battlefield | CheckSVar$ X | SVarCompare$ EQ2 | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters the battlefield, if it was kicked twice, it deals 2 damage to any target.
+T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked | Origin$ Any | Destination$ Battlefield | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters, if it was kicked, it deals 2 damage to any target.
+T:Mode$ ChangesZone | ValidCard$ Card.Self+kicked | Origin$ Any | Destination$ Battlefield | CheckSVar$ X | SVarCompare$ EQ2 | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters, if it was kicked twice, it deals 2 damage to any target.
 SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ 2
 SVar:X:Count$TimesKicked
 DeckHints:Color$Black|Red
-Oracle:Kicker {B} and/or {R} (You may pay an additional {B} and/or {R} as you cast this spell.)\nFlying, lifelink\nWhen Archangel of Wrath enters the battlefield, if it was kicked, it deals 2 damage to any target.\nWhen Archangel of Wrath enters the battlefield, if it was kicked twice, it deals 2 damage to any target.
+Oracle:Kicker {B} and/or {R} (You may pay an additional {B} and/or {R} as you cast this spell.)\nFlying, lifelink\nWhen Archangel of Wrath enters, if it was kicked, it deals 2 damage to any target.\nWhen Archangel of Wrath enters, if it was kicked twice, it deals 2 damage to any target.
diff --git a/forge-gui/res/cardsfolder/a/archdruids_charm.txt b/forge-gui/res/cardsfolder/a/archdruids_charm.txt
index 871afe21337..bdf7fb80594 100644
--- a/forge-gui/res/cardsfolder/a/archdruids_charm.txt
+++ b/forge-gui/res/cardsfolder/a/archdruids_charm.txt
@@ -2,7 +2,7 @@ Name:Archdruid's Charm
 ManaCost:G G G
 Types:Instant
 A:SP$ Charm | Choices$ DBTutor,DBPutCounter,DBAntiquate
-SVar:DBTutor:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Creature,Land | ChangeNum$ 1 | Reveal$ True | Shuffle$ False | RememberChanged$ True | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a creature or land card and reveal it. Put it into the battlefield tapped if it's a land card. Otherwise, put it into your hand. Then shuffle.
+SVar:DBTutor:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Creature,Land | ChangeNum$ 1 | Reveal$ True | Shuffle$ False | RememberChanged$ True | SubAbility$ DBChangeZone | SpellDescription$ Search your library for a creature or land card and reveal it. Put it onto the battlefield tapped if it's a land card. Otherwise, put it into your hand. Then shuffle.
 SVar:DBChangeZone:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Battlefield | Tapped$ True | ConditionDefined$ Remembered | ConditionPresent$ Card.Land | ForgetChanged$ True | SubAbility$ DBChangeZone2
 SVar:DBChangeZone2:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Hand | SubAbility$ DBShuffle
 SVar:DBShuffle:DB$ Shuffle | Defined$ You | SubAbility$ DBCleanup
@@ -11,4 +11,4 @@ SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | CounterType$ P1
 SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | NumDmg$ X | DamageSource$ ParentTarget | AILogic$ PowerDmg | StackDescription$ Then {c:ParentTarget} deals damage equal to its power to {c:ThisTargetedCard}.
 SVar:X:ParentTargeted$CardPower
 SVar:DBAntiquate:DB$ ChangeZone | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target artifact or enchantment.
-Oracle:Choose one —\n• Search your library for a creature or land card and reveal it. Put it into the battlefield tapped if it's a land card. Otherwise, put it into your hand. Then shuffle.\n• Put a +1/+1 counter on target creature you control. Then that creature deals damage equal to its power to target creature you don't control.\n• Exile target artifact or enchantment.
+Oracle:Choose one —\n• Search your library for a creature or land card and reveal it. Put it onto the battlefield tapped if it's a land card. Otherwise, put it into your hand. Then shuffle.\n• Put a +1/+1 counter on target creature you control. Then that creature deals damage equal to its power to target creature you don't control.\n• Exile target artifact or enchantment.
diff --git a/forge-gui/res/cardsfolder/a/archelos_lagoon_mystic.txt b/forge-gui/res/cardsfolder/a/archelos_lagoon_mystic.txt
index d3fdd4d5b59..f6e74331ec1 100644
--- a/forge-gui/res/cardsfolder/a/archelos_lagoon_mystic.txt
+++ b/forge-gui/res/cardsfolder/a/archelos_lagoon_mystic.txt
@@ -2,8 +2,8 @@ Name:Archelos, Lagoon Mystic
 ManaCost:1 B G U
 Types:Legendary Creature Turtle Shaman
 PT:2/4
-R:Event$ Moved | ValidCard$ Permanent | Destination$ Battlefield | IsPresent$ Card.Self+tapped | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ As long as CARDNAME is tapped, other permanents enter the battlefield tapped.
+R:Event$ Moved | ValidCard$ Permanent | Destination$ Battlefield | IsPresent$ Card.Self+tapped | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ As long as CARDNAME is tapped, other permanents enter tapped.
 SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
-R:Event$ Moved | ValidCard$ Permanent | Destination$ Battlefield | IsPresent$ Card.Self+untapped | ReplaceWith$ ETBUntapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ As long as NICKNAME is untapped, other permanents enter the battlefield untapped.
+R:Event$ Moved | ValidCard$ Permanent | Destination$ Battlefield | IsPresent$ Card.Self+untapped | ReplaceWith$ ETBUntapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ As long as NICKNAME is untapped, other permanents enter untapped.
 SVar:ETBUntapped:DB$ Untap | ETB$ True | Defined$ ReplacedCard
-Oracle:As long as Archelos, Lagoon Mystic is tapped, other permanents enter the battlefield tapped.\nAs long as Archelos is untapped, other permanents enter the battlefield untapped.
+Oracle:As long as Archelos, Lagoon Mystic is tapped, other permanents enter tapped.\nAs long as Archelos is untapped, other permanents enter untapped.
diff --git a/forge-gui/res/cardsfolder/a/archfiend_of_sorrows.txt b/forge-gui/res/cardsfolder/a/archfiend_of_sorrows.txt
index e4416bc4eb7..a1f70178778 100644
--- a/forge-gui/res/cardsfolder/a/archfiend_of_sorrows.txt
+++ b/forge-gui/res/cardsfolder/a/archfiend_of_sorrows.txt
@@ -3,8 +3,8 @@ ManaCost:5 B B
 Types:Creature Demon
 PT:4/5
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMassacre | TriggerDescription$ When CARDNAME enters the battlefield, creatures your opponents control get -2/-2 until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMassacre | TriggerDescription$ When CARDNAME enters, creatures your opponents control get -2/-2 until end of turn.
 SVar:TrigMassacre:DB$ PumpAll | NumAtt$ -2 | NumDef$ -2 | ValidCards$ Creature.OppCtrl | IsCurse$ True
 K:Unearth:3 B B
 SVar:PlayMain1:TRUE
-Oracle:Flying\nWhen Archfiend of Sorrows enters the battlefield, creatures your opponents control get -2/-2 until end of turn.\nUnearth {3}{B}{B} ({3}{B}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
+Oracle:Flying\nWhen Archfiend of Sorrows enters, creatures your opponents control get -2/-2 until end of turn.\nUnearth {3}{B}{B} ({3}{B}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/a/archfiend_of_the_dross.txt b/forge-gui/res/cardsfolder/a/archfiend_of_the_dross.txt
index 64a1e8bba02..2dd8135bd35 100644
--- a/forge-gui/res/cardsfolder/a/archfiend_of_the_dross.txt
+++ b/forge-gui/res/cardsfolder/a/archfiend_of_the_dross.txt
@@ -11,4 +11,4 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
 SVar:TrigLoseLife:DB$ LoseLife | LifeAmount$ 2 | Defined$ TriggeredCardController
 DeckHas:Ability$Counters
 AI:RemoveDeck:Random
-Oracle:Flying\nArchfiend of the Dross enters the battlefield with four oil counters on it.\nAt the beginning of your upkeep, remove an oil counter from Archfiend of the Dross. Then if it has no oil counters on it, you lose the game.\nWhenever a creature an opponent controls dies, its controller loses 2 life.
+Oracle:Flying\nArchfiend of the Dross enters with four oil counters on it.\nAt the beginning of your upkeep, remove an oil counter from Archfiend of the Dross. Then if it has no oil counters on it, you lose the game.\nWhenever a creature an opponent controls dies, its controller loses 2 life.
diff --git a/forge-gui/res/cardsfolder/a/archfiends_vessel.txt b/forge-gui/res/cardsfolder/a/archfiends_vessel.txt
index 0e9a6bfe54a..4aca4e11526 100644
--- a/forge-gui/res/cardsfolder/a/archfiends_vessel.txt
+++ b/forge-gui/res/cardsfolder/a/archfiends_vessel.txt
@@ -3,10 +3,10 @@ ManaCost:B
 Types:Creature Human Cleric
 PT:1/1
 K:Lifelink
-T:Mode$ ChangesZone | Origin$ Graveyard | Destination$ Battlefield | ValidCard$ Card.Self+YouOwn | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, if it entered from your graveyard or you cast it from your graveyard, exile it. If you do, create a 5/5 black Demon creature token with flying.
-T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self+wasCastFromYourGraveyardByYou | Execute$ TrigExile | Secondary$ True | TriggerDescription$ When CARDNAME enters the battlefield, if it entered from your graveyard or you cast it from your graveyard, exile it. If you do, create a 5/5 black Demon creature token with flying.
+T:Mode$ ChangesZone | Origin$ Graveyard | Destination$ Battlefield | ValidCard$ Card.Self+YouOwn | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters, if it entered from your graveyard or you cast it from your graveyard, exile it. If you do, create a 5/5 black Demon creature token with flying.
+T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self+wasCastFromYourGraveyardByYou | Execute$ TrigExile | Secondary$ True | TriggerDescription$ When CARDNAME enters, if it entered from your graveyard or you cast it from your graveyard, exile it. If you do, create a 5/5 black Demon creature token with flying.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | Defined$ Self | SubAbility$ DBToken | RememberChanged$ True
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_5_5_demon_flying | TokenOwner$ You | ConditionDefined$ Remembered | ConditionPresent$ Card.Self | ConditionCompare$ GE1
 DeckHas:Ability$Token
 DeckHints:Ability$Graveyard
-Oracle:Lifelink (Damage dealt by this creature also causes you to gain that much life.)\nWhen Archfiend's Vessel enters the battlefield, if it entered from your graveyard or you cast it from your graveyard, exile it. If you do, create a 5/5 black Demon creature token with flying.
+Oracle:Lifelink (Damage dealt by this creature also causes you to gain that much life.)\nWhen Archfiend's Vessel enters, if it entered from your graveyard or you cast it from your graveyard, exile it. If you do, create a 5/5 black Demon creature token with flying.
diff --git a/forge-gui/res/cardsfolder/a/architect_of_the_untamed.txt b/forge-gui/res/cardsfolder/a/architect_of_the_untamed.txt
index bb9f91e654b..b2c2fb8613c 100644
--- a/forge-gui/res/cardsfolder/a/architect_of_the_untamed.txt
+++ b/forge-gui/res/cardsfolder/a/architect_of_the_untamed.txt
@@ -2,7 +2,7 @@ Name:Architect of the Untamed
 ManaCost:2 G
 Types:Creature Elf Artificer Druid
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Land.YouCtrl | Execute$ TrigEnergy | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, you get {E} (an energy counter).
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Land.YouCtrl | Execute$ TrigEnergy | TriggerDescription$ Landfall — Whenever a land you control enters, you get {E} (an energy counter).
 SVar:TrigEnergy:DB$ PutCounter | Defined$ You | CounterType$ ENERGY | CounterNum$ 1
 A:AB$ Token | Cost$ PayEnergy<8> | TokenAmount$ 1 | TokenScript$ c_6_6_a_beast | TokenOwner$ You | SpellDescription$ Create a 6/6 colorless Beast artifact creature token.
-Oracle:Landfall — Whenever a land enters the battlefield under your control, you get {E} (an energy counter).\nPay {E}{E}{E}{E}{E}{E}{E}{E}: Create a 6/6 colorless Beast artifact creature token.
+Oracle:Landfall — Whenever a land you control enters, you get {E} (an energy counter).\nPay {E}{E}{E}{E}{E}{E}{E}{E}: Create a 6/6 colorless Beast artifact creature token.
diff --git a/forge-gui/res/cardsfolder/a/architects_of_will.txt b/forge-gui/res/cardsfolder/a/architects_of_will.txt
index 72d9fffef0f..34b5919ad15 100644
--- a/forge-gui/res/cardsfolder/a/architects_of_will.txt
+++ b/forge-gui/res/cardsfolder/a/architects_of_will.txt
@@ -3,6 +3,6 @@ ManaCost:2 U B
 Types:Artifact Creature Human Wizard
 PT:3/3
 K:Cycling:UB
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRearrange | TriggerDescription$ When CARDNAME enters the battlefield, look at the top three cards of target player's library, then put them back in any order.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRearrange | TriggerDescription$ When CARDNAME enters, look at the top three cards of target player's library, then put them back in any order.
 SVar:TrigRearrange:DB$ RearrangeTopOfLibrary | ValidTgts$ Player | TgtPrompt$ Choose target player. | NumCards$ 3
-Oracle:When Architects of Will enters the battlefield, look at the top three cards of target player's library, then put them back in any order.\nCycling {U/B} ({U/B}, Discard this card: Draw a card.)
+Oracle:When Architects of Will enters, look at the top three cards of target player's library, then put them back in any order.\nCycling {U/B} ({U/B}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/a/archive_dragon.txt b/forge-gui/res/cardsfolder/a/archive_dragon.txt
index 6c93e7c6b51..c32fe2528b1 100644
--- a/forge-gui/res/cardsfolder/a/archive_dragon.txt
+++ b/forge-gui/res/cardsfolder/a/archive_dragon.txt
@@ -4,6 +4,6 @@ Types:Creature Dragon Wizard
 PT:4/6
 K:Flying
 K:Ward:2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 2.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters, scry 2.
 SVar:TrigScry:DB$ Scry | ScryNum$ 2
-Oracle:Flying\nWard {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nWhen Archive Dragon enters the battlefield, scry 2.
+Oracle:Flying\nWard {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nWhen Archive Dragon enters, scry 2.
diff --git a/forge-gui/res/cardsfolder/a/archon_of_coronation.txt b/forge-gui/res/cardsfolder/a/archon_of_coronation.txt
index bbf3af872cc..f26376419a4 100644
--- a/forge-gui/res/cardsfolder/a/archon_of_coronation.txt
+++ b/forge-gui/res/cardsfolder/a/archon_of_coronation.txt
@@ -3,7 +3,7 @@ ManaCost:4 W W
 Types:Creature Archon
 PT:5/5
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters the battlefield, you become the monarch.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMonarch | TriggerDescription$ When CARDNAME enters, you become the monarch.
 SVar:TrigMonarch:DB$ BecomeMonarch | Defined$ You
 S:Mode$ Continuous | Affected$ You | Condition$ Monarch | AddKeyword$ Damage doesn't cause you to lose life. | Description$ As long as you're the monarch, damage doesn't cause you to lose life. (When a creature deals combat damage to you, its controller still becomes the monarch.)
-Oracle:Flying\nWhen Archon of Coronation enters the battlefield, you become the monarch.\nAs long as you're the monarch, damage doesn't cause you to lose life. (When a creature deals combat damage to you, its controller still becomes the monarch.)
+Oracle:Flying\nWhen Archon of Coronation enters, you become the monarch.\nAs long as you're the monarch, damage doesn't cause you to lose life. (When a creature deals combat damage to you, its controller still becomes the monarch.)
diff --git a/forge-gui/res/cardsfolder/a/archon_of_cruelty.txt b/forge-gui/res/cardsfolder/a/archon_of_cruelty.txt
index ff06d7b5109..e7d9927fbc4 100644
--- a/forge-gui/res/cardsfolder/a/archon_of_cruelty.txt
+++ b/forge-gui/res/cardsfolder/a/archon_of_cruelty.txt
@@ -3,12 +3,12 @@ ManaCost:6 B B
 Types:Creature Archon
 PT:6/6
 K:Flying
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, target opponent sacrifices a creature or planeswalker, discards a card, and loses 3 life. You draw a card and gain 3 life.
-T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, target opponent sacrifices a creature or planeswalker, discards a card, and loses 3 life. You draw a card and gain 3 life.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME enters or attacks, target opponent sacrifices a creature or planeswalker, discards a card, and loses 3 life. You draw a card and gain 3 life.
+T:Mode$ Attacks | ValidCard$ Card.Self | Secondary$ True | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME enters or attacks, target opponent sacrifices a creature or planeswalker, discards a card, and loses 3 life. You draw a card and gain 3 life.
 SVar:TrigSac:DB$ Sacrifice | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | SacValid$ Creature,Planeswalker | SacMessage$ creature or planeswalker | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ Targeted | Mode$ TgtChoose | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | Defined$ Targeted | LifeAmount$ 3 | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3
 DeckHas:Ability$LifeGain
-Oracle:Flying\nWhenever Archon of Cruelty enters the battlefield or attacks, target opponent sacrifices a creature or planeswalker, discards a card, and loses 3 life. You draw a card and gain 3 life.
+Oracle:Flying\nWhenever Archon of Cruelty enters or attacks, target opponent sacrifices a creature or planeswalker, discards a card, and loses 3 life. You draw a card and gain 3 life.
diff --git a/forge-gui/res/cardsfolder/a/archon_of_emeria.txt b/forge-gui/res/cardsfolder/a/archon_of_emeria.txt
index de161f526d8..5b71e56f55f 100644
--- a/forge-gui/res/cardsfolder/a/archon_of_emeria.txt
+++ b/forge-gui/res/cardsfolder/a/archon_of_emeria.txt
@@ -4,8 +4,8 @@ Types:Creature Archon
 PT:2/3
 K:Flying
 S:Mode$ CantBeCast | ValidCard$ Card | Caster$ Player | NumLimitEachTurn$ 1 | Description$ Each player can't cast more than one spell each turn.
-R:Event$ Moved | ValidCard$ Land.OppCtrl+nonBasic | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Nonbasic lands your opponents control enter the battlefield tapped.
+R:Event$ Moved | ValidCard$ Land.OppCtrl+nonBasic | Destination$ Battlefield | ReplaceWith$ ETBTapped | ReplacementResult$ Updated | ActiveZones$ Battlefield | Description$ Nonbasic lands your opponents control enter tapped.
 SVar:ETBTapped:DB$ Tap | ETB$ True | Defined$ ReplacedCard
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
-Oracle:Flying\nEach player can't cast more than one spell each turn.\nNonbasic lands your opponents control enter the battlefield tapped.
+Oracle:Flying\nEach player can't cast more than one spell each turn.\nNonbasic lands your opponents control enter tapped.
diff --git a/forge-gui/res/cardsfolder/a/archon_of_redemption.txt b/forge-gui/res/cardsfolder/a/archon_of_redemption.txt
index 383668b2407..09dc7ed846d 100644
--- a/forge-gui/res/cardsfolder/a/archon_of_redemption.txt
+++ b/forge-gui/res/cardsfolder/a/archon_of_redemption.txt
@@ -3,7 +3,7 @@ ManaCost:3 W W
 Types:Creature Archon
 PT:3/4
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Creature.Other+YouCtrl+withFlying | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME or another creature with flying enters the battlefield under your control, you may gain life equal to that creature's power.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Creature.Other+YouCtrl+withFlying | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME or another creature you control with flying enters, you may gain life equal to that creature's power.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
 SVar:X:TriggeredCard$CardPower
-Oracle:Flying\nWhenever Archon of Redemption or another creature with flying enters the battlefield under your control, you may gain life equal to that creature's power.
+Oracle:Flying\nWhenever Archon of Redemption or another creature you control with flying enters, you may gain life equal to that creature's power.
diff --git a/forge-gui/res/cardsfolder/a/archon_of_suns_grace.txt b/forge-gui/res/cardsfolder/a/archon_of_suns_grace.txt
index 88a7fd1a5d2..75f3775dfb5 100644
--- a/forge-gui/res/cardsfolder/a/archon_of_suns_grace.txt
+++ b/forge-gui/res/cardsfolder/a/archon_of_suns_grace.txt
@@ -6,9 +6,9 @@ K:Flying
 K:Lifelink
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+Pegasus | AddKeyword$ Lifelink | Description$ Pegasus creatures you control have lifelink.
 SVar:PlayMain1:TRUE
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Constellation — Whenever an enchantment enters the battlefield under your control, create a 2/2 white Pegasus creature token with flying.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Enchantment.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Constellation — Whenever an enchantment you control enters, create a 2/2 white Pegasus creature token with flying.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_2_2_pegasus_flying | TokenOwner$ You
 DeckHas:Ability$Token
 DeckNeeds:Type$Enchantment
 DeckHints:Type$Pegasus
-Oracle:Flying, lifelink\nPegasus creatures you control have lifelink.\nConstellation — Whenever an enchantment enters the battlefield under your control, create a 2/2 white Pegasus creature token with flying.
+Oracle:Flying, lifelink\nPegasus creatures you control have lifelink.\nConstellation — Whenever an enchantment you control enters, create a 2/2 white Pegasus creature token with flying.
diff --git a/forge-gui/res/cardsfolder/a/archon_of_valors_reach.txt b/forge-gui/res/cardsfolder/a/archon_of_valors_reach.txt
index 62abf3d5f6b..e11f36322d1 100644
--- a/forge-gui/res/cardsfolder/a/archon_of_valors_reach.txt
+++ b/forge-gui/res/cardsfolder/a/archon_of_valors_reach.txt
@@ -6,8 +6,8 @@ K:Flying
 K:Vigilance
 K:Trample
 K:ETBReplacement:Other:ChooseT
-SVar:ChooseT:DB$ ChooseType | Type$ Card | ValidTypes$ Artifact,Enchantment,Instant,Sorcery,Planeswalker | SpellDescription$ As CARDNAME enters the battlefield, choose artifact, enchantment, instant, sorcery, or planeswalker.
+SVar:ChooseT:DB$ ChooseType | Type$ Card | ValidTypes$ Artifact,Enchantment,Instant,Sorcery,Planeswalker | SpellDescription$ As CARDNAME enters, choose artifact, enchantment, instant, sorcery, or planeswalker.
 S:Mode$ CantBeCast | ValidCard$ Card.ChosenType | Description$ Players can't cast spells of the chosen type.
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
-Oracle:Flying, vigilance, trample\nAs Archon of Valor's Reach enters the battlefield, choose artifact, enchantment, instant, sorcery, or planeswalker.\nPlayers can't cast spells of the chosen type.
+Oracle:Flying, vigilance, trample\nAs Archon of Valor's Reach enters, choose artifact, enchantment, instant, sorcery, or planeswalker.\nPlayers can't cast spells of the chosen type.
diff --git a/forge-gui/res/cardsfolder/a/archpriest_of_shadows.txt b/forge-gui/res/cardsfolder/a/archpriest_of_shadows.txt
index ccb063ad085..f57c6a262ca 100644
--- a/forge-gui/res/cardsfolder/a/archpriest_of_shadows.txt
+++ b/forge-gui/res/cardsfolder/a/archpriest_of_shadows.txt
@@ -10,4 +10,4 @@ T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player,Battle | Execu
 SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature from your graveyard | Origin$ Graveyard | Destination$ Battlefield
 DeckHas:Ability$Counters|Graveyard
 DeckHints:Ability$Discard|Sacrifice
-Oracle:Backup 1 (When this creature enters the battlefield, put a +1/+1 counter on target creature. If that's another creature, it gains the following abilities until end of turn.)\nDeathtouch\nWhenever this creature deals combat damage to a player or battle, return target creature card from your graveyard to the battlefield.
+Oracle:Backup 1 (When this creature enters, put a +1/+1 counter on target creature. If that's another creature, it gains the following abilities until end of turn.)\nDeathtouch\nWhenever this creature deals combat damage to a player or battle, return target creature card from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/a/archway_angel.txt b/forge-gui/res/cardsfolder/a/archway_angel.txt
index 10f754bfcd1..33341777c5c 100644
--- a/forge-gui/res/cardsfolder/a/archway_angel.txt
+++ b/forge-gui/res/cardsfolder/a/archway_angel.txt
@@ -3,9 +3,9 @@ ManaCost:5 W
 Types:Creature Angel
 PT:3/4
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 2 life for each Gate you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters, you gain 2 life for each Gate you control.
 SVar:TrigGainLife:DB$ GainLife | LifeAmount$ X
 SVar:X:Count$Valid Gate.YouCtrl/Times.2
 DeckHas:Ability$LifeGain
 DeckHints:Type$Gate
-Oracle:Flying\nWhen Archway Angel enters the battlefield, you gain 2 life for each Gate you control.
+Oracle:Flying\nWhen Archway Angel enters, you gain 2 life for each Gate you control.
diff --git a/forge-gui/res/cardsfolder/a/archway_commons.txt b/forge-gui/res/cardsfolder/a/archway_commons.txt
index aceadb05e5b..bea32377cca 100644
--- a/forge-gui/res/cardsfolder/a/archway_commons.txt
+++ b/forge-gui/res/cardsfolder/a/archway_commons.txt
@@ -1,9 +1,10 @@
 Name:Archway Commons
 ManaCost:no cost
 Types:Land
-K:CARDNAME enters the battlefield tapped.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you pay {1}.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters, sacrifice it unless you pay {1}.
 SVar:TrigSac:DB$ Sacrifice | UnlessCost$ 1 | UnlessPayer$ You
 A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
 SVar:NeedsToPlay:Land.untapped+YouCtrl
-Oracle:Archway Commons enters the battlefield tapped.\nWhen Archway Commons enters the battlefield, sacrifice it unless you pay {1}.\n{T}: Add one mana of any color.
+Oracle:Archway Commons enters tapped.\nWhen Archway Commons enters, sacrifice it unless you pay {1}.\n{T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/a/archway_of_innovation.txt b/forge-gui/res/cardsfolder/a/archway_of_innovation.txt
index 0baa990be08..4109765857b 100644
--- a/forge-gui/res/cardsfolder/a/archway_of_innovation.txt
+++ b/forge-gui/res/cardsfolder/a/archway_of_innovation.txt
@@ -1,11 +1,11 @@
 Name:Archway of Innovation
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Island.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control an Island.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you control an Island.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Island.YouCtrl | ConditionCompare$ EQ0
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
 A:AB$ Effect | Cost$ U T | StaticAbilities$ GrantImprovise | Triggers$ ExileEffect | SpellDescription$ The next spell you cast this turn has improvise. (Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.)
 SVar:GrantImprovise:Mode$ Continuous | EffectZone$ Command | Affected$ Card.YouCtrl | AffectedZone$ Stack | AddKeyword$ Improvise | Description$ The next spell you cast this turn has improvise. (Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.)
 SVar:ExileEffect:Mode$ SpellCast | EffectZone$ Command | ValidCard$ Card.YouCtrl | Execute$ RemoveEffect | Static$ True
 SVar:RemoveEffect:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self
-Oracle:Archway of Innovation enters the battlefield tapped unless you control an Island.\n{T}: Add {U}.\n{U}, {T}: The next spell you cast this turn has improvise. (Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.)
+Oracle:Archway of Innovation enters tapped unless you control an Island.\n{T}: Add {U}.\n{U}, {T}: The next spell you cast this turn has improvise. (Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.)
diff --git a/forge-gui/res/cardsfolder/a/arco_flagellant.txt b/forge-gui/res/cardsfolder/a/arco_flagellant.txt
index 756c77a5bb9..e7cab924073 100644
--- a/forge-gui/res/cardsfolder/a/arco_flagellant.txt
+++ b/forge-gui/res/cardsfolder/a/arco_flagellant.txt
@@ -6,4 +6,4 @@ K:Squad:2
 K:CARDNAME can't block.
 A:AB$ Pump | PrecostDesc$ Endurant — | Cost$ PayLife<3> | KW$ Indestructible | Defined$ Self | SpellDescription$ CARDNAME gains indestructible until end of turn.
 DeckHas:Ability$Token
-Oracle:Squad {2} (As an additional cost to cast this spell, you may pay {2} any number of times. When this creature enters the battlefield, create that many tokens that are copies of it.)\nArco-Flagellant can't block.\nEndurant — Pay 3 life: Arco-Flagellant gains indestructible until end of turn.
+Oracle:Squad {2} (As an additional cost to cast this spell, you may pay {2} any number of times. When this creature enters, create that many tokens that are copies of it.)\nArco-Flagellant can't block.\nEndurant — Pay 3 life: Arco-Flagellant gains indestructible until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/arctic_flats.txt b/forge-gui/res/cardsfolder/a/arctic_flats.txt
index 3bf2f6978f6..a9fcee77741 100644
--- a/forge-gui/res/cardsfolder/a/arctic_flats.txt
+++ b/forge-gui/res/cardsfolder/a/arctic_flats.txt
@@ -1,6 +1,7 @@
 Name:Arctic Flats
 ManaCost:no cost
 Types:Snow 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 W G | SpellDescription$ Add {W} or {G}.
-Oracle:Arctic Flats enters the battlefield tapped.\n{T}: Add {G} or {W}.
+Oracle:Arctic Flats enters tapped.\n{T}: Add {G} or {W}.
diff --git a/forge-gui/res/cardsfolder/a/arctic_merfolk.txt b/forge-gui/res/cardsfolder/a/arctic_merfolk.txt
index c837e7ac5b2..9eba84e4e96 100644
--- a/forge-gui/res/cardsfolder/a/arctic_merfolk.txt
+++ b/forge-gui/res/cardsfolder/a/arctic_merfolk.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Merfolk
 PT:1/1
 K:Kicker:Return<1/Creature>
-K:etbCounter:P1P1:1:CheckSVar$ WasKicked:If CARDNAME was kicked, it enters the battlefield with a +1/+1 counter on it.
+K:etbCounter:P1P1:1:CheckSVar$ WasKicked:If CARDNAME was kicked, it enters with a +1/+1 counter on it.
 SVar:WasKicked:Count$Kicked.1.0
 AI:RemoveDeck:All
-Oracle:Kicker—Return a creature you control to its owner's hand. (You may return a creature you control to its owner's hand in addition to any other costs as you cast this spell.)\nIf Arctic Merfolk was kicked, it enters the battlefield with a +1/+1 counter on it.
+Oracle:Kicker—Return a creature you control to its owner's hand. (You may return a creature you control to its owner's hand in addition to any other costs as you cast this spell.)\nIf Arctic Merfolk was kicked, it enters with a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/a/arctic_treeline.txt b/forge-gui/res/cardsfolder/a/arctic_treeline.txt
index 7f1cf84a790..4d287690ece 100644
--- a/forge-gui/res/cardsfolder/a/arctic_treeline.txt
+++ b/forge-gui/res/cardsfolder/a/arctic_treeline.txt
@@ -1,5 +1,6 @@
 Name:Arctic Treeline
 ManaCost:no cost
 Types:Snow Land Forest Plains
-K:CARDNAME enters the battlefield tapped.
-Oracle:({T}: Add {G} or {W}.)\nArctic Treeline enters the battlefield tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+Oracle:({T}: Add {G} or {W}.)\nArctic Treeline enters tapped.
diff --git a/forge-gui/res/cardsfolder/a/arctic_wolves.txt b/forge-gui/res/cardsfolder/a/arctic_wolves.txt
index ee7ad22ed1b..5070fab40fa 100644
--- a/forge-gui/res/cardsfolder/a/arctic_wolves.txt
+++ b/forge-gui/res/cardsfolder/a/arctic_wolves.txt
@@ -3,6 +3,6 @@ ManaCost:3 G G
 Types:Creature Wolf
 PT:4/5
 K:Cumulative upkeep: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:Cumulative upkeep {2} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nWhen Arctic Wolves enters the battlefield, draw a card.
+Oracle:Cumulative upkeep {2} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nWhen Arctic Wolves enters, draw a card.
diff --git a/forge-gui/res/cardsfolder/a/arcums_astrolabe.txt b/forge-gui/res/cardsfolder/a/arcums_astrolabe.txt
index 7ea048e9f0f..6164f1d0fc2 100644
--- a/forge-gui/res/cardsfolder/a/arcums_astrolabe.txt
+++ b/forge-gui/res/cardsfolder/a/arcums_astrolabe.txt
@@ -1,8 +1,8 @@
 Name:Arcum's Astrolabe
 ManaCost:S
 Types:Snow Artifact
-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
 A:AB$ Mana | Cost$ 1 T | Produced$ Any | SpellDescription$ Add one mana of any color.
 AI:RemoveDeck:All
-Oracle:({S} can be paid with one mana from a snow source.)\nWhen Arcum's Astrolabe enters the battlefield, draw a card.\n{1}, {T}: Add one mana of any color.
+Oracle:({S} can be paid with one mana from a snow source.)\nWhen Arcum's Astrolabe enters, draw a card.\n{1}, {T}: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/a/ardent_electromancer.txt b/forge-gui/res/cardsfolder/a/ardent_electromancer.txt
index fb70a8bd81f..9b5c46f0078 100644
--- a/forge-gui/res/cardsfolder/a/ardent_electromancer.txt
+++ b/forge-gui/res/cardsfolder/a/ardent_electromancer.txt
@@ -2,9 +2,9 @@ Name:Ardent Electromancer
 ManaCost:2 R
 Types:Creature Human Wizard
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters the battlefield, add {R} for each creature in your party. (Your party consists of up to one each of Cleric, Rogue, Warrior, and Wizard.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMana | TriggerDescription$ When CARDNAME enters, add {R} for each creature in your party. (Your party consists of up to one each of Cleric, Rogue, Warrior, and Wizard.)
 SVar:TrigMana:DB$ Mana | Produced$ R | Amount$ X
 SVar:X:Count$Party
 DeckHas:Ability$Party
 DeckHints:Type$Cleric|Rogue|Warrior
-Oracle:When Ardent Electromancer enters the battlefield, add {R} for each creature in your party. (Your party consists of up to one each of Cleric, Rogue, Warrior, and Wizard.)
+Oracle:When Ardent Electromancer enters, add {R} for each creature in your party. (Your party consists of up to one each of Cleric, Rogue, Warrior, and Wizard.)
diff --git a/forge-gui/res/cardsfolder/a/ardent_elementalist.txt b/forge-gui/res/cardsfolder/a/ardent_elementalist.txt
index 222b6ef02f2..7d5c92efa29 100644
--- a/forge-gui/res/cardsfolder/a/ardent_elementalist.txt
+++ b/forge-gui/res/cardsfolder/a/ardent_elementalist.txt
@@ -2,7 +2,7 @@ Name:Ardent Elementalist
 ManaCost:3 R
 Types:Creature Human Shaman
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return target instant or sorcery card from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters, return target instant or sorcery card from your graveyard to your hand.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn | TgtPrompt$ Select target instant or sorcery card in your graveyard
 DeckNeeds:Type$Instant|Sorcery
-Oracle:When Ardent Elementalist enters the battlefield, return target instant or sorcery card from your graveyard to your hand.
+Oracle:When Ardent Elementalist enters, return target instant or sorcery card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/a/ardent_soldier.txt b/forge-gui/res/cardsfolder/a/ardent_soldier.txt
index 4a80536d4cc..94415384ab8 100644
--- a/forge-gui/res/cardsfolder/a/ardent_soldier.txt
+++ b/forge-gui/res/cardsfolder/a/ardent_soldier.txt
@@ -4,6 +4,6 @@ Types:Creature Human Soldier
 PT:1/2
 K:Vigilance
 K:Kicker:2
-K:etbCounter:P1P1:1:CheckSVar$ WasKicked:If CARDNAME was kicked, it enters the battlefield with a +1/+1 counter on it.
+K:etbCounter:P1P1:1:CheckSVar$ WasKicked:If CARDNAME was kicked, it enters with a +1/+1 counter on it.
 SVar:WasKicked:Count$Kicked.1.0
-Oracle:Kicker {2} (You may pay an additional {2} as you cast this spell.)\nVigilance\nIf Ardent Soldier was kicked, it enters the battlefield with a +1/+1 counter on it.
+Oracle:Kicker {2} (You may pay an additional {2} as you cast this spell.)\nVigilance\nIf Ardent Soldier was kicked, it enters with a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/a/ardenvale_paladin.txt b/forge-gui/res/cardsfolder/a/ardenvale_paladin.txt
index c42d5efd188..d4aab5b6903 100644
--- a/forge-gui/res/cardsfolder/a/ardenvale_paladin.txt
+++ b/forge-gui/res/cardsfolder/a/ardenvale_paladin.txt
@@ -2,7 +2,7 @@ Name:Ardenvale Paladin
 ManaCost:3 W
 Types:Creature Human Knight
 PT:2/5
-K:etbCounter:P1P1:1:Adamant$ White:Adamant — If at least three white mana was spent to cast this spell, CARDNAME enters the battlefield with a +1/+1 counter on it.
+K:etbCounter:P1P1:1:Adamant$ White:Adamant — If at least three white mana was spent to cast this spell, CARDNAME enters with a +1/+1 counter on it.
 SVar:AIManaPref:W
 DeckHas:Ability$Counters
-Oracle:Adamant — If at least three white mana was spent to cast this spell, Ardenvale Paladin enters the battlefield with a +1/+1 counter on it.
+Oracle:Adamant — If at least three white mana was spent to cast this spell, Ardenvale Paladin enters with a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/a/ardoz_cobbler_of_war.txt b/forge-gui/res/cardsfolder/a/ardoz_cobbler_of_war.txt
index 10459783635..b43bac1b753 100644
--- a/forge-gui/res/cardsfolder/a/ardoz_cobbler_of_war.txt
+++ b/forge-gui/res/cardsfolder/a/ardoz_cobbler_of_war.txt
@@ -3,9 +3,9 @@ ManaCost:1 R
 Types:Legendary Creature Goblin Shaman
 PT:1/1
 K:Haste
-T:Mode$ ChangesZone | ValidCard$ Creature.Other+YouCtrl,Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another creature enters the battlefield under your control, that creature gets +2/+0 until end of turn.
+T:Mode$ ChangesZone | ValidCard$ Creature.Other+YouCtrl,Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another creature you control enters, that creature gets +2/+0 until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ TriggeredCardLKICopy | NumAtt$ +2
 A:AB$ Token | Cost$ 3 R | TokenAmount$ 1 | TokenScript$ r_1_1_goblin_haste | TokenOwner$ You | SorcerySpeed$ True | SpellDescription$ Create a 1/1 red Goblin creature token with haste. Activate only as a sorcery.
 SVar:BuffedBy:Creature
 DeckHas:Ability$Token
-Oracle:Haste\nWhenever Ardoz, Cobbler of War or another creature enters the battlefield under your control, that creature gets +2/+0 until end of turn.\n{3}{R}: Create a 1/1 red Goblin creature token with haste. Activate only as a sorcery.
+Oracle:Haste\nWhenever Ardoz, Cobbler of War or another creature you control enters, that creature gets +2/+0 until end of turn.\n{3}{R}: Create a 1/1 red Goblin creature token with haste. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/a/arek_false_goldwarden.txt b/forge-gui/res/cardsfolder/a/arek_false_goldwarden.txt
index 3e9b26f5555..4fd9fba6ad0 100644
--- a/forge-gui/res/cardsfolder/a/arek_false_goldwarden.txt
+++ b/forge-gui/res/cardsfolder/a/arek_false_goldwarden.txt
@@ -3,10 +3,10 @@ ManaCost:W B
 Types:Legendary Creature Human Cleric
 PT:2/2
 K:Starting intensity:0
-T:Mode$ ChangesZone | ValidCard$ Creature.YouCtrl+Other | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigIntensify | TriggerDescription$ Whenever another creature enters the battlefield under your control, perpetually increase the intensity of NICKNAME and all cards named Arek, False Goldwarden in your graveyard, hand and library by 1.
+T:Mode$ ChangesZone | ValidCard$ Creature.YouCtrl+Other | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigIntensify | TriggerDescription$ Whenever another creature you control enters, perpetually increase the intensity of NICKNAME and all cards named Arek, False Goldwarden in your graveyard, hand and library by 1.
 SVar:TrigIntensify:DB$ Intensify | AllDefined$ Card.Self,Card.inZoneGraveyard+namedArek; False Goldwarden+YouOwn,Card.inZoneHand+namedArek; False Goldwarden+YouOwn,Card.inZoneLibrary+namedArek; False Goldwarden+YouOwn
 A:AB$ LoseLife | Cost$ 3 W B T Sac<1/NICKNAME> | ValidTgts$ Opponent | LifeAmount$ X | SubAbility$ DBGainLife | SpellDescription$ Target opponent loses X life and you gain X life, where X is NICKNAME's Intensity.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X
 SVar:X:Count$Intensity
 DeckHas:Ability$LifeGain|Sacrifice
-Oracle:Starting intensity 0\nWhenever another creature enters the battlefield under your control, perpetually increase the intensity of Arek and all cards named Arek, False Goldwarden in your graveyard, hand and library by 1. \n{3}{W}{B}, {T}: Sacrifice Arek: Target opponent loses X life and you gain X life, where X is Arek's Intensity.
+Oracle:Starting intensity 0\nWhenever another creature you control enters, perpetually increase the intensity of Arek and all cards named Arek, False Goldwarden in your graveyard, hand and library by 1. \n{3}{W}{B}, {T}: Sacrifice Arek: Target opponent loses X life and you gain X life, where X is Arek's Intensity.
diff --git a/forge-gui/res/cardsfolder/a/arena_of_glory.txt b/forge-gui/res/cardsfolder/a/arena_of_glory.txt
index cf4bab8bad6..6001d2ab853 100644
--- a/forge-gui/res/cardsfolder/a/arena_of_glory.txt
+++ b/forge-gui/res/cardsfolder/a/arena_of_glory.txt
@@ -1,8 +1,8 @@
 Name:Arena of Glory
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Mountain.YouCtrl | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a Mountain.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you control a Mountain.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Mountain.YouCtrl | ConditionCompare$ EQ0
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
 A:AB$ Mana | Cost$ R T Exert<1/CARDNAME> | Produced$ R R | AddsKeywords$ Haste | AddsKeywordsValid$ Spell.Creature | AddsKeywordsUntil$ UntilEOT | SpellDescription$ Add {R}{R}. If that mana is spent on a creature spell, it gains haste until end of turn. (An exerted permanent won't untap during your next untap step.)
-Oracle:Arena of Glory enters the battlefield tapped unless you control a Mountain.\n{T}: Add {R}.\n{R}, {T}, Exert Arena of Glory: Add {R}{R}. If that mana is spent on a creature spell, it gains haste until end of turn. (An exerted permanent won't untap during your next untap step.)
+Oracle:Arena of Glory enters tapped unless you control a Mountain.\n{T}: Add {R}.\n{R}, {T}, Exert Arena of Glory: Add {R}{R}. If that mana is spent on a creature spell, it gains haste until end of turn. (An exerted permanent won't untap during your next untap step.)
diff --git a/forge-gui/res/cardsfolder/a/arena_of_the_ancients.txt b/forge-gui/res/cardsfolder/a/arena_of_the_ancients.txt
index 07ebf6c4ac9..5ab643daf4c 100644
--- a/forge-gui/res/cardsfolder/a/arena_of_the_ancients.txt
+++ b/forge-gui/res/cardsfolder/a/arena_of_the_ancients.txt
@@ -2,8 +2,8 @@ Name:Arena of the Ancients
 ManaCost:3
 Types:Artifact
 S:Mode$ Continuous | Affected$ Creature.Legendary | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Legendary creatures don't untap during their controllers' untap steps.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTapAll | TriggerDescription$ When CARDNAME enters the battlefield, tap all legendary creatures.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTapAll | TriggerDescription$ When CARDNAME enters, tap all legendary creatures.
 SVar:TrigTapAll:DB$ TapAll | ValidCards$ Creature.Legendary
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
-Oracle:Legendary creatures don't untap during their controllers' untap steps.\nWhen Arena of the Ancients enters the battlefield, tap all legendary creatures.
+Oracle:Legendary creatures don't untap during their controllers' untap steps.\nWhen Arena of the Ancients enters, tap all legendary creatures.
diff --git a/forge-gui/res/cardsfolder/a/argent_dais.txt b/forge-gui/res/cardsfolder/a/argent_dais.txt
index 5f6436ec113..8d3eda02416 100644
--- a/forge-gui/res/cardsfolder/a/argent_dais.txt
+++ b/forge-gui/res/cardsfolder/a/argent_dais.txt
@@ -8,4 +8,4 @@ A:AB$ ChangeZone | Cost$ 2 T SubCounter<2/OIL> | ValidTgts$ Permanent.Other+nonL
 SVar:DBDraw:DB$ Draw | NumCards$ 2 | Defined$ RememberedController | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Counters
-Oracle:Argent Dais enters the battlefield with two oil counters on it.\nWhenever two or more creatures attack, put an oil counter on Argent Dais.\n{2}, {T}, Remove two oil counters from Argent Dais: Exile another target nonland permanent. Its controller draws two cards.
+Oracle:Argent Dais enters with two oil counters on it.\nWhenever two or more creatures attack, put an oil counter on Argent Dais.\n{2}, {T}, Remove two oil counters from Argent Dais: Exile another target nonland permanent. Its controller draws two cards.
diff --git a/forge-gui/res/cardsfolder/a/argivian_cavalier.txt b/forge-gui/res/cardsfolder/a/argivian_cavalier.txt
index c9292f98081..67f66923a76 100644
--- a/forge-gui/res/cardsfolder/a/argivian_cavalier.txt
+++ b/forge-gui/res/cardsfolder/a/argivian_cavalier.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Orc Knight
 PT:2/2
 K:Enlist
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 white Soldier creature token.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 1/1 white Soldier creature token.
 SVar:TrigToken:DB$ Token | TokenScript$ w_1_1_soldier
 DeckHas:Ability$Token & Type$Soldier
-Oracle:Enlist (As this creature attacks, you may tap a nonattacking creature you control without summoning sickness. When you do, add its power to this creature's until end of turn.)\nWhen Argivian Cavalier enters the battlefield, create a 1/1 white Soldier creature token.
+Oracle:Enlist (As this creature attacks, you may tap a nonattacking creature you control without summoning sickness. When you do, add its power to this creature's until end of turn.)\nWhen Argivian Cavalier enters, create a 1/1 white Soldier creature token.
diff --git a/forge-gui/res/cardsfolder/a/argoth_sanctum_of_nature.txt b/forge-gui/res/cardsfolder/a/argoth_sanctum_of_nature.txt
index fa863e2d777..811c179ae8b 100644
--- a/forge-gui/res/cardsfolder/a/argoth_sanctum_of_nature.txt
+++ b/forge-gui/res/cardsfolder/a/argoth_sanctum_of_nature.txt
@@ -1,8 +1,8 @@
 Name:Argoth, Sanctum of Nature
 ManaCost:no cost
 Types:Land
-K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Creature.Legendary+YouCtrl+Green | ConditionCompare$ EQ0 | SpellDescription$ CARDNAME enters the battlefield tapped unless you control a legendary green creature.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped unless you control a legendary green creature.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionPresent$ Creature.Legendary+YouCtrl+Green | ConditionCompare$ EQ0
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
 A:AB$ Token | Cost$ 2 G G T | TokenScript$ g_2_2_bear | SorcerySpeed$ True | SubAbility$ DBMill | SpellDescription$ Create a 2/2 green Bear creature token, then mill three cards. Activate only as a sorcery.
 SVar:DBMill:DB$ Mill | NumCards$ 3 | Defined$ You
@@ -10,4 +10,4 @@ DeckHas:Ability$Token & Type$Bear
 DeckNeeds:Name$Titania, Voice of Gaea
 MeldPair:Titania, Voice of Gaea
 AlternateMode:Meld
-Oracle:Argoth, Sanctum of Nature enters the battlefield tapped unless you control a legendary green creature.\n{T}: Add {G}.\n{2}{G}{G}, {T}:Create a 2/2 green Bear creature token, then mill three cards. Activate only as a sorcery.
+Oracle:Argoth, Sanctum of Nature enters tapped unless you control a legendary green creature.\n{T}: Add {G}.\n{2}{G}{G}, {T}:Create a 2/2 green Bear creature token, then mill three cards. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/a/argothian_opportunist.txt b/forge-gui/res/cardsfolder/a/argothian_opportunist.txt
index 7eed784d158..1cf305e01bb 100644
--- a/forge-gui/res/cardsfolder/a/argothian_opportunist.txt
+++ b/forge-gui/res/cardsfolder/a/argothian_opportunist.txt
@@ -2,7 +2,7 @@ Name:Argothian Opportunist
 ManaCost:2 G
 Types:Creature Human Scout
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a tapped Powerstone token. (It's an artifact with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.")
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a tapped Powerstone token. (It's an artifact with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.")
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenTapped$ True | TokenScript$ c_a_powerstone
 DeckHas:Ability$Token & Type$Artifact
-Oracle:When Argothian Opportunist enters the battlefield, create a tapped Powerstone token. (It's an artifact with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.")
+Oracle:When Argothian Opportunist enters, create a tapped Powerstone token. (It's an artifact with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.")
diff --git a/forge-gui/res/cardsfolder/a/argothian_wurm.txt b/forge-gui/res/cardsfolder/a/argothian_wurm.txt
index cd833307091..62e7d4d235d 100644
--- a/forge-gui/res/cardsfolder/a/argothian_wurm.txt
+++ b/forge-gui/res/cardsfolder/a/argothian_wurm.txt
@@ -3,6 +3,6 @@ ManaCost:3 G
 Types:Creature Wurm
 PT:6/6
 K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters the battlefield, any player may sacrifice a land. If a player does, put CARDNAME on top of its owner's library.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters, any player may sacrifice a land. If a player does, put CARDNAME on top of its owner's library.
 SVar:TrigSac:DB$ ChangeZone | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | Defined$ Self | UnlessCost$ Sac<1/Land> | UnlessPayer$ Player | UnlessSwitched$ True
-Oracle:Trample\nWhen Argothian Wurm enters the battlefield, any player may sacrifice a land. If a player does, put Argothian Wurm on top of its owner's library.
+Oracle:Trample\nWhen Argothian Wurm enters, any player may sacrifice a land. If a player does, put Argothian Wurm on top of its owner's library.
diff --git a/forge-gui/res/cardsfolder/a/aria_of_flame.txt b/forge-gui/res/cardsfolder/a/aria_of_flame.txt
index 4e84a3b4994..f53a6d8719c 100644
--- a/forge-gui/res/cardsfolder/a/aria_of_flame.txt
+++ b/forge-gui/res/cardsfolder/a/aria_of_flame.txt
@@ -1,11 +1,11 @@
 Name:Aria of Flame
 ManaCost:2 R
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, each opponent gains 10 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters, each opponent gains 10 life.
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast an instant or sorcery spell, put a verse counter on CARDNAME, then it deals damage equal to the number of verse counters on it to target player or planeswalker.
 SVar:TrigGainLife:DB$ GainLife | Defined$ Player.Opponent | LifeAmount$ 10
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ VERSE | CounterNum$ 1 | SubAbility$ DBDealDamage
 SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select any player or planeswalker | NumDmg$ X
 SVar:X:Count$CardCounters.VERSE
 SVar:BuffedBy:Instant,Sorcery
-Oracle:When Aria of Flame enters the battlefield, each opponent gains 10 life.\nWhenever you cast an instant or sorcery spell, put a verse counter on Aria of Flame, then it deals damage equal to the number of verse counters on it to target player or planeswalker.
+Oracle:When Aria of Flame enters, each opponent gains 10 life.\nWhenever you cast an instant or sorcery spell, put a verse counter on Aria of Flame, then it deals damage equal to the number of verse counters on it to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/a/arid_archway.txt b/forge-gui/res/cardsfolder/a/arid_archway.txt
index 2a55f20b964..023727f9a94 100644
--- a/forge-gui/res/cardsfolder/a/arid_archway.txt
+++ b/forge-gui/res/cardsfolder/a/arid_archway.txt
@@ -1,11 +1,12 @@
 Name:Arid Archway
 ManaCost:no cost
 Types:Land Desert
-K:CARDNAME enters the battlefield tapped.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ CARDNAME enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
 A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 2 | SpellDescription$ Add {C}{C}.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand. If another Desert was returned this way, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters, return a land you control to its owner's hand. If another Desert was returned this way, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl | RememberLKI$ True | AILogic$ NeverBounceItself | SubAbility$ DBSurveil
 SVar:DBSurveil:DB$ Surveil | Defined$ You | Amount$ 1 | ConditionDefined$ RememberedLKI | ConditionPresent$ Desert.Other | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHints:Type$Desert
-Oracle:Arid Archway enters the battlefield tapped.\nWhen Arid Archway enters the battlefield, return a land you control to its owner's hand. If another Desert was returned this way, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)\n{T}: Add {C}{C}.
+Oracle:Arid Archway enters tapped.\nWhen Arid Archway enters, return a land you control to its owner's hand. If another Desert was returned this way, surveil 1. (Look at the top card of your library. You may put it into your graveyard.)\n{T}: Add {C}{C}.
diff --git a/forge-gui/res/cardsfolder/a/arixmethes_slumbering_isle.txt b/forge-gui/res/cardsfolder/a/arixmethes_slumbering_isle.txt
index 5d70f96525e..4655da8396e 100644
--- a/forge-gui/res/cardsfolder/a/arixmethes_slumbering_isle.txt
+++ b/forge-gui/res/cardsfolder/a/arixmethes_slumbering_isle.txt
@@ -2,11 +2,11 @@ Name:Arixmethes, Slumbering Isle
 ManaCost:2 G U
 Types:Legendary Creature Kraken
 PT:12/12
-K:ETBReplacement:Other:LandTapped
-SVar:LandTapped:DB$ Tap | Defined$ Self | SubAbility$ DBAddCounter | ETB$ True | SpellDescription$ CARDNAME enters the battlefield tapped with five slumber counters on it.
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ CARDNAME enters tapped with five slumber counters on it.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | SubAbility$ DBAddCounter
 SVar:DBAddCounter:DB$ PutCounter | Defined$ Self | ETB$ True | CounterType$ SLUMBER | CounterNum$ 5
 S:Mode$ Continuous | Affected$ Card.Self+counters_GE1_SLUMBER | AddType$ Land | RemoveCardTypes$ True | Description$ As long as NICKNAME has a slumber counter on it, it's a land. (It's not a creature.)
 T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ You | Execute$ TrigRemoveCounter | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever you cast a spell, you may remove a slumber counter from NICKNAME.
 SVar:TrigRemoveCounter:DB$ RemoveCounter | Defined$ Self | CounterType$ SLUMBER | CounterNum$ 1 | AILogic$ Always
 A:AB$ Mana | Cost$ T | Produced$ G U | SpellDescription$ Add {G}{U}.
-Oracle:Arixmethes, Slumbering Isle enters the battlefield tapped with five slumber counters on it.\nAs long as Arixmethes has a slumber counter on it, it's a land. (It's not a creature.)\nWhenever you cast a spell, you may remove a slumber counter from Arixmethes.\n{T}: Add {G}{U}.
+Oracle:Arixmethes, Slumbering Isle enters tapped with five slumber counters on it.\nAs long as Arixmethes has a slumber counter on it, it's a land. (It's not a creature.)\nWhenever you cast a spell, you may remove a slumber counter from Arixmethes.\n{T}: Add {G}{U}.
diff --git a/forge-gui/res/cardsfolder/a/arlinn_the_packs_hope_arlinn_the_moons_fury.txt b/forge-gui/res/cardsfolder/a/arlinn_the_packs_hope_arlinn_the_moons_fury.txt
index b33449b192f..2a65ba06bee 100644
--- a/forge-gui/res/cardsfolder/a/arlinn_the_packs_hope_arlinn_the_moons_fury.txt
+++ b/forge-gui/res/cardsfolder/a/arlinn_the_packs_hope_arlinn_the_moons_fury.txt
@@ -3,14 +3,14 @@ ManaCost:2 R G
 Types:Legendary Planeswalker Arlinn
 Loyalty:4
 K:Daybound
-A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Duration$ UntilYourNextTurn | StaticAbilities$ WithFlash | ReplacementEffects$ ExtraETBCounter | SpellDescription$ Until your next turn, you may cast creature spells as though they had flash, and each creature you control enters the battlefield with an additional +1/+1 counter on it.
-SVar:WithFlash:Mode$ CastWithFlash | ValidCard$ Creature | ValidSA$ Spell | EffectZone$ Command | Caster$ You | Description$ Until your next turn, you may cast creature spells as though they had flash, and each creature you control enters the battlefield with an additional +1/+1 counter on it.
-SVar:ExtraETBCounter:Event$ Moved | ReplacementResult$ Updated | ActiveZones$ Command | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | ReplaceWith$ AddExtraCounter | Secondary$ True | Description$ Until your next turn, you may cast creature spells as though they had flash, and each creature you control enters the battlefield with an additional +1/+1 counter on it.
+A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Duration$ UntilYourNextTurn | StaticAbilities$ WithFlash | ReplacementEffects$ ExtraETBCounter | SpellDescription$ Until your next turn, you may cast creature spells as though they had flash, and each creature you control enters with an additional +1/+1 counter on it.
+SVar:WithFlash:Mode$ CastWithFlash | ValidCard$ Creature | ValidSA$ Spell | EffectZone$ Command | Caster$ You | Description$ Until your next turn, you may cast creature spells as though they had flash, and each creature you control enters with an additional +1/+1 counter on it.
+SVar:ExtraETBCounter:Event$ Moved | ReplacementResult$ Updated | ActiveZones$ Command | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | ReplaceWith$ AddExtraCounter | Secondary$ True | Description$ Until your next turn, you may cast creature spells as though they had flash, and each creature you control enters with an additional +1/+1 counter on it.
 SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 1
 A:AB$ Token | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | TokenAmount$ 2 | TokenScript$ g_2_2_wolf | SpellDescription$ Create two 2/2 green Wolf creature tokens.
 DeckHas:Ability$Token|Counters & Type$Wolf
 AlternateMode:DoubleFaced
-Oracle:Daybound (If a player casts no spells during their own turn, it becomes night next turn.)\n[+1]: Until your next turn, you may cast creature spells as though they had flash, and each creature you control enters the battlefield with an additional +1/+1 counter on it.\n[-3]: Create two 2/2 green Wolf creature tokens.
+Oracle:Daybound (If a player casts no spells during their own turn, it becomes night next turn.)\n[+1]: Until your next turn, you may cast creature spells as though they had flash, and each creature you control enters with an additional +1/+1 counter on it.\n[-3]: Create two 2/2 green Wolf creature tokens.
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/a/arlinn_voice_of_the_pack.txt b/forge-gui/res/cardsfolder/a/arlinn_voice_of_the_pack.txt
index 1a902bb6ca0..fd7a1052b2f 100644
--- a/forge-gui/res/cardsfolder/a/arlinn_voice_of_the_pack.txt
+++ b/forge-gui/res/cardsfolder/a/arlinn_voice_of_the_pack.txt
@@ -3,9 +3,9 @@ ManaCost:4 G G
 Types:Legendary Planeswalker Arlinn
 Loyalty:7
 K:ETBReplacement:Other:AddExtraCounter:Mandatory:Battlefield:Creature.Wolf+YouCtrl,Creature.Werewolf+YouCtrl
-SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Each creature you control that's a Wolf or a Werewolf enters the battlefield with an additional +1/+1 counter on it.
+SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Each creature you control that's a Wolf or a Werewolf enters with an additional +1/+1 counter on it.
 SVar:PlayMain1:TRUE
 A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ g_2_2_wolf | TokenOwner$ You | SpellDescription$ Create a 2/2 green Wolf creature token.
 DeckHints:Type$Wolf|Werewolf
 DeckHas:Ability$Counters|Token
-Oracle:Each creature you control that's a Wolf or a Werewolf enters the battlefield with an additional +1/+1 counter on it.\n[-2]: Create a 2/2 green Wolf creature token.
+Oracle:Each creature you control that's a Wolf or a Werewolf enters with an additional +1/+1 counter on it.\n[-2]: Create a 2/2 green Wolf creature token.
diff --git a/forge-gui/res/cardsfolder/a/armada_wurm.txt b/forge-gui/res/cardsfolder/a/armada_wurm.txt
index fdd0964ed6b..56fc8c14ac1 100644
--- a/forge-gui/res/cardsfolder/a/armada_wurm.txt
+++ b/forge-gui/res/cardsfolder/a/armada_wurm.txt
@@ -3,6 +3,6 @@ ManaCost:2 G G W W
 Types:Creature Wurm
 PT:5/5
 K:Trample
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 5/5 green Wurm creature token with trample.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters, create a 5/5 green Wurm creature token with trample.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ g_5_5_wurm_trample | TokenOwner$ TriggeredCardController
-Oracle:Trample\nWhen Armada Wurm enters the battlefield, create a 5/5 green Wurm creature token with trample.
+Oracle:Trample\nWhen Armada Wurm enters, create a 5/5 green Wurm creature token with trample.
diff --git a/forge-gui/res/cardsfolder/a/armament_corps.txt b/forge-gui/res/cardsfolder/a/armament_corps.txt
index adf80f81a67..a98a8efd3f4 100644
--- a/forge-gui/res/cardsfolder/a/armament_corps.txt
+++ b/forge-gui/res/cardsfolder/a/armament_corps.txt
@@ -2,8 +2,8 @@ Name:Armament Corps
 ManaCost:2 W B G
 Types:Creature Human Soldier
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, distribute two +1/+1 counters among one or two target creatures you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters, distribute two +1/+1 counters among one or two target creatures you control.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature to distribute counters to | CounterType$ P1P1 | CounterNum$ 2 | TargetMin$ 1 | TargetMax$ 2 | DividedAsYouChoose$ 2
 SVar:PlayMain1:TRUE
 DeckHas:Ability$Counters
-Oracle:When Armament Corps enters the battlefield, distribute two +1/+1 counters among one or two target creatures you control.
+Oracle:When Armament Corps enters, distribute two +1/+1 counters among one or two target creatures you control.
diff --git a/forge-gui/res/cardsfolder/a/armed_with_proof.txt b/forge-gui/res/cardsfolder/a/armed_with_proof.txt
index 15c28a4b8d4..e2a258474bd 100644
--- a/forge-gui/res/cardsfolder/a/armed_with_proof.txt
+++ b/forge-gui/res/cardsfolder/a/armed_with_proof.txt
@@ -2,10 +2,10 @@ Name:Armed with Proof
 ManaCost:2 W
 Types:Enchantment
 Oracle:
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When CARDNAME enters the battlefield, investigate twice. (To investigate, create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigInvestigate | TriggerDescription$ When CARDNAME enters, investigate twice. (To investigate, create a colorless Clue artifact token with "{2}, Sacrifice this artifact: Draw a card.")
 SVar:TrigInvestigate:DB$ Investigate | Num$ 2
 S:Mode$ Continuous | Affected$ Clue.YouCtrl | AddType$ Equipment | AddStaticAbility$ TreasureEquip | AddKeyword$ Equip:2 | Description$ Clues you control are Equipment in addition to their other types and have "Equipped creature gets +2/+0" and equip {2}.
 SVar:TreasureEquip:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | Description$ Equipped creature gets +2/+0.
 DeckHas:Ability$Token & Type$Clue|Artifact
 DeckHints:Type$Clue
-Oracle:When Armed with Proof enters the battlefield, investigate twice. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\nClues you control are Equipment in addition to their other types and have "Equipped creature gets +2/+0" and equip {2}.
+Oracle:When Armed with Proof enters, investigate twice. (To investigate, create a Clue token. It's an artifact with "{2}, Sacrifice this artifact: Draw a card.")\nClues you control are Equipment in addition to their other types and have "Equipped creature gets +2/+0" and equip {2}.
diff --git a/forge-gui/res/cardsfolder/a/armorcraft_judge.txt b/forge-gui/res/cardsfolder/a/armorcraft_judge.txt
index 2e8e429e2e1..71615308e32 100644
--- a/forge-gui/res/cardsfolder/a/armorcraft_judge.txt
+++ b/forge-gui/res/cardsfolder/a/armorcraft_judge.txt
@@ -2,8 +2,8 @@ Name:Armorcraft Judge
 ManaCost:3 G
 Types:Creature Elf Artificer
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card for each creature you control with a +1/+1 counter on it.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters, draw a card for each creature you control with a +1/+1 counter on it.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ X
 SVar:X:Count$Valid Creature.YouCtrl+counters_GE1_P1P1
 DeckHints:Ability$Counters
-Oracle:When Armorcraft Judge enters the battlefield, draw a card for each creature you control with a +1/+1 counter on it.
+Oracle:When Armorcraft Judge enters, draw a card for each creature you control with a +1/+1 counter on it.
diff --git a/forge-gui/res/cardsfolder/a/armored_kincaller.txt b/forge-gui/res/cardsfolder/a/armored_kincaller.txt
index 49fb5908e7b..5c39d162d59 100644
--- a/forge-gui/res/cardsfolder/a/armored_kincaller.txt
+++ b/forge-gui/res/cardsfolder/a/armored_kincaller.txt
@@ -2,11 +2,11 @@ Name:Armored Kincaller
 ManaCost:2 G
 Types:Creature Dinosaur
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReveal | TriggerDescription$ When CARDNAME enters the battlefield, you may reveal a Dinosaur card from your hand. If you do or if you control another Dinosaur, you gain 3 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReveal | TriggerDescription$ When CARDNAME enters, you may reveal a Dinosaur card from your hand. If you do or if you control another Dinosaur, you gain 3 life.
 SVar:TrigReveal:DB$ Reveal | RevealValid$ Dinosaur | RememberRevealed$ True | Optional$ True | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | ConditionCheckSVar$ Count$RememberedSize/Plus.DinoControlled | LifeAmount$ 3 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:DinoControlled:Count$Valid Dinosaur.Other+YouCtrl
 DeckHints:Type$Dinosaur
 DeckHas:Ability$LifeGain
-Oracle:When Armored Kincaller enters the battlefield, you may reveal a Dinosaur card from your hand. If you do or if you control another Dinosaur, you gain 3 life.
+Oracle:When Armored Kincaller enters, you may reveal a Dinosaur card from your hand. If you do or if you control another Dinosaur, you gain 3 life.
diff --git a/forge-gui/res/cardsfolder/a/armored_skaab.txt b/forge-gui/res/cardsfolder/a/armored_skaab.txt
index 48721130759..635f3503d47 100644
--- a/forge-gui/res/cardsfolder/a/armored_skaab.txt
+++ b/forge-gui/res/cardsfolder/a/armored_skaab.txt
@@ -2,6 +2,6 @@ Name:Armored Skaab
 ManaCost:2 U
 Types:Creature Zombie Warrior
 PT:1/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, mill four cards.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters, mill four cards.
 SVar:TrigMill:DB$ Mill | NumCards$ 4 | Defined$ You
-Oracle:When Armored Skaab enters the battlefield, mill four cards.
+Oracle:When Armored Skaab enters, mill four cards.
diff --git a/forge-gui/res/cardsfolder/a/armory_automaton.txt b/forge-gui/res/cardsfolder/a/armory_automaton.txt
index faf31d09df8..e92ca684951 100644
--- a/forge-gui/res/cardsfolder/a/armory_automaton.txt
+++ b/forge-gui/res/cardsfolder/a/armory_automaton.txt
@@ -2,9 +2,9 @@ Name:Armory Automaton
 ManaCost:3
 Types:Artifact Creature Construct
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBAttach | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you may attach any number of target Equipment to it. (Control of the Equipment doesn't change.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBAttach | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME enters or attacks, you may attach any number of target Equipment to it. (Control of the Equipment doesn't change.)
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DBAttach | TriggerZones$ Battlefield | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks, you may attach any number of target Equipment to it. (Control of the Equipment doesn't change.)
 SVar:DBAttach:DB$ Attach | ValidTgts$ Equipment | TargetMin$ 0 | TargetMax$ MaxTargets | Object$ Targeted | Defined$ Self
 SVar:MaxTargets:Count$Valid Equipment
 SVar:HasAttackEffect:TRUE
-Oracle:Whenever Armory Automaton enters the battlefield or attacks, you may attach any number of target Equipment to it. (Control of the Equipment doesn't change.)
+Oracle:Whenever Armory Automaton enters or attacks, you may attach any number of target Equipment to it. (Control of the Equipment doesn't change.)
diff --git a/forge-gui/res/cardsfolder/a/arni_metalbrow.txt b/forge-gui/res/cardsfolder/a/arni_metalbrow.txt
index 9850eab0a9d..120e098a13a 100644
--- a/forge-gui/res/cardsfolder/a/arni_metalbrow.txt
+++ b/forge-gui/res/cardsfolder/a/arni_metalbrow.txt
@@ -2,10 +2,10 @@ Name:Arni Metalbrow
 ManaCost:2 R
 Types:Legendary Creature Human Berserker
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+attacking | TriggerZones$ Battlefield | Execute$ TrigChangeZoneBis | TriggerDescription$ Whenever a creature you control attacks or a creature enters the battlefield under your control attacking, you may pay {1}{R}. If you do, you may put a creature card with mana value less than that creature's mana value from your hand onto the battlefield tapped and attacking.
-T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigChangeZone | Secondary$ True | TriggerDescription$ Whenever a creature you control attacks or a creature enters the battlefield under your control attacking, you may pay {1}{R}. If you do, you may put a creature card with mana value less than that creature's mana value from your hand onto the battlefield tapped and attacking.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+attacking | TriggerZones$ Battlefield | Execute$ TrigChangeZoneBis | TriggerDescription$ Whenever a creature you control attacks or a creature you control enters attacking, you may pay {1}{R}. If you do, you may put a creature card with mana value less than that creature's mana value from your hand onto the battlefield tapped and attacking.
+T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigChangeZone | Secondary$ True | TriggerDescription$ Whenever a creature you control attacks or a creature you control enters attacking, you may pay {1}{R}. If you do, you may put a creature card with mana value less than that creature's mana value from your hand onto the battlefield tapped and attacking.
 SVar:TrigChangeZone:AB$ ChangeZone | Cost$ 1 R | Origin$ Hand | ChangeNum$ 1 | Destination$ Battlefield | ChangeType$ Creature.cmcLTX+YouCtrl | ChangeNum$ 1 | Tapped$ True | Attacking$ True
 SVar:TrigChangeZoneBis:AB$ ChangeZone | Cost$ 1 R | Origin$ Hand | ChangeNum$ 1 | Destination$ Battlefield | ChangeType$ Creature.cmcLTY+YouCtrl | ChangeNum$ 1 | Tapped$ True | Attacking$ True
 SVar:X:TriggeredAttacker$CardManaCost
 SVar:Y:TriggeredCard$CardManaCost
-Oracle:Whenever a creature you control attacks or a creature enters the battlefield under your control attacking, you may pay {1}{R}. If you do, you may put a creature card with mana value less than that creature's mana value from your hand onto the battlefield tapped and attacking.
+Oracle:Whenever a creature you control attacks or a creature you control enters attacking, you may pay {1}{R}. If you do, you may put a creature card with mana value less than that creature's mana value from your hand onto the battlefield tapped and attacking.
diff --git a/forge-gui/res/cardsfolder/a/arrogant_outlaw.txt b/forge-gui/res/cardsfolder/a/arrogant_outlaw.txt
index 083e64201ec..e5867abf1a0 100644
--- a/forge-gui/res/cardsfolder/a/arrogant_outlaw.txt
+++ b/forge-gui/res/cardsfolder/a/arrogant_outlaw.txt
@@ -2,9 +2,9 @@ Name:Arrogant Outlaw
 ManaCost:2 B
 Types:Creature Vampire Noble
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigDrain | TriggerDescription$ When CARDNAME enters the battlefield, if an opponent lost life this turn, each opponent loses 2 life and you gain 2 life.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigDrain | TriggerDescription$ When CARDNAME enters, if an opponent lost life this turn, each opponent loses 2 life and you gain 2 life.
 SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
 DeckHas:Ability$LifeGain
 SVar:X:Count$LifeOppsLostThisTurn
-Oracle:When Arrogant Outlaw enters the battlefield, if an opponent lost life this turn, each opponent loses 2 life and you gain 2 life.
+Oracle:When Arrogant Outlaw enters, if an opponent lost life this turn, each opponent loses 2 life and you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/a/arsenal_thresher.txt b/forge-gui/res/cardsfolder/a/arsenal_thresher.txt
index 353b71a0dd5..e2f4b3dbf07 100644
--- a/forge-gui/res/cardsfolder/a/arsenal_thresher.txt
+++ b/forge-gui/res/cardsfolder/a/arsenal_thresher.txt
@@ -3,9 +3,9 @@ ManaCost:2 WB U
 Types:Artifact Creature Construct
 PT:2/2
 K:ETBReplacement:Other:DBReveal
-SVar:DBReveal:DB$ Reveal | RevealValid$ Card.Artifact+YouCtrl | AnyNumber$ True | RememberRevealed$ True | SubAbility$ DBPutCounters | SpellDescription$ As CARDNAME enters the battlefield, you may reveal any number of other artifact cards from your hand. CARDNAME enters the battlefield with a +1/+1 counter on it for each card revealed this way.
+SVar:DBReveal:DB$ Reveal | RevealValid$ Card.Artifact+YouCtrl | AnyNumber$ True | RememberRevealed$ True | SubAbility$ DBPutCounters | SpellDescription$ As CARDNAME enters, you may reveal any number of other artifact cards from your hand. CARDNAME enters with a +1/+1 counter on it for each card revealed this way.
 SVar:DBPutCounters:DB$ PutCounter | ETB$ True | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 AI:RemoveDeck:All
-Oracle:As Arsenal Thresher enters the battlefield, you may reveal any number of other artifact cards from your hand. Arsenal Thresher enters the battlefield with a +1/+1 counter on it for each card revealed this way.
+Oracle:As Arsenal Thresher enters, you may reveal any number of other artifact cards from your hand. Arsenal Thresher enters with a +1/+1 counter on it for each card revealed this way.