diff --git a/forge-gui/res/cardsfolder/a/academy_at_tolaria_west.txt b/forge-gui/res/cardsfolder/a/academy_at_tolaria_west.txt
index 18c29be0598..710eaee9b99 100644
--- a/forge-gui/res/cardsfolder/a/academy_at_tolaria_west.txt
+++ b/forge-gui/res/cardsfolder/a/academy_at_tolaria_west.txt
@@ -6,5 +6,5 @@ SVar:AcademicDraw:DB$ Draw | Defined$ You | NumCards$ 7
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ TrigDiscard | TriggerDescription$ Whenever chaos ensues, discard your hand.
 SVar:TrigDiscard:DB$ Discard | Mode$ Hand | Defined$ You
 SVar:AIRollPlanarDieParams:Mode$ Always | LowPriority$ True | CardsInHandLE$ 2
-Deckhas:Ability$Discard
+DeckHas:Ability$Discard
 Oracle:At the beginning of your end step, if you have no cards in hand, draw seven cards.\nWhenever chaos ensues, discard your hand.
diff --git a/forge-gui/res/cardsfolder/a/all_will_be_one.txt b/forge-gui/res/cardsfolder/a/all_will_be_one.txt
index 3173b0026e6..ead9e205ec6 100644
--- a/forge-gui/res/cardsfolder/a/all_will_be_one.txt
+++ b/forge-gui/res/cardsfolder/a/all_will_be_one.txt
@@ -2,7 +2,7 @@ Name:All Will Be One
 ManaCost:3 R R
 Types:Enchantment
 T:Mode$ CounterPlayerAddedAll | ValidObject$ Permanent.inRealZoneBattlefield,Player | TriggerZones$ Battlefield | ValidSource$ You | Execute$ TrigDamage | TriggerDescription$ Whenever you put one or more counters on a permanent or player, CARDNAME deals that much damage to target opponent, creature an opponent controls, or planeswalker an opponent controls
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl,Planeswalker.OppCtrl,Opponent | TgtPrompt$ Select target opponent, creature an opponent controls, or planeswalker an opponent controls.| NumDmg$ X
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl,Planeswalker.OppCtrl,Opponent | TgtPrompt$ Select target opponent, creature an opponent controls, or planeswalker an opponent controls. | NumDmg$ X
 SVar:X:TriggerCount$Amount
 DeckNeeds:Ability$Counters
 Oracle:Whenever you put one or more counters on a permanent or player, All Will Be One deals that much damage to target opponent, creature an opponent controls, or planeswalker an opponent controls.
diff --git a/forge-gui/res/cardsfolder/a/angel_of_flight_alabaster.txt b/forge-gui/res/cardsfolder/a/angel_of_flight_alabaster.txt
index 3930f9f8cd7..b0b1a3ecf32 100644
--- a/forge-gui/res/cardsfolder/a/angel_of_flight_alabaster.txt
+++ b/forge-gui/res/cardsfolder/a/angel_of_flight_alabaster.txt
@@ -3,6 +3,6 @@ ManaCost:4 W
 Types:Creature Angel
 PT:4/4
 K:Flying
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You |TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, return target Spirit card from your graveyard to your hand.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, return target Spirit card from your graveyard to your hand.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Mandatory$ True | TgtPrompt$ Select target Spirit card in your graveyard | ValidTgts$ Spirit.YouCtrl
 Oracle:Flying\nAt the beginning of your upkeep, return target Spirit card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/b/besieged_viking_village.txt b/forge-gui/res/cardsfolder/b/besieged_viking_village.txt
index b4e35d958e4..57d4a38998b 100644
--- a/forge-gui/res/cardsfolder/b/besieged_viking_village.txt
+++ b/forge-gui/res/cardsfolder/b/besieged_viking_village.txt
@@ -4,6 +4,6 @@ Types:Plane Earth
 S:Mode$ Continuous | Affected$ Creature | AddAbility$ ABBoast | EffectZone$ Command | Description$ All creatures have "Boast — {1}: Put a +1/+1 counter on this creature." (Activate only if that creature attacked this turn and only once each turn.)
 SVar:ABBoast:AB$ PutCounter | Cost$ 1 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | Boast$ True | Description$ Boast - Put a +1/+1 counter on this creature." (Activate only if that creature attacked this turn and only once each turn.)
 T:Mode$ ChaosEnsues | TriggerZones$ Command | Execute$ TrigPutCounter | TriggerDescription$ Whenever chaos ensues, put an indestructible counter on target creature you control that attacked this turn.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl+attackedThisTurn |TgtPrompt$ Select target creature you control that attacked this turn | CounterType$ Indestructible | CounterNum$ 1
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl+attackedThisTurn | TgtPrompt$ Select target creature you control that attacked this turn | CounterType$ Indestructible | CounterNum$ 1
 DeckHas:Ability$Counters
-Oracle:All creatures have "Boast — {1}: Put a +1/+1 counter on this creature." (Activate only if that creature attacked this turn and only once each turn.)\nWhenever chaos ensues, put an indestructible counter on target creature you control that attacked this turn.
\ No newline at end of file
+Oracle:All creatures have "Boast — {1}: Put a +1/+1 counter on this creature." (Activate only if that creature attacked this turn and only once each turn.)\nWhenever chaos ensues, put an indestructible counter on target creature you control that attacked this turn.
diff --git a/forge-gui/res/cardsfolder/b/bitter_downfall.txt b/forge-gui/res/cardsfolder/b/bitter_downfall.txt
index a13dd693453..8a07d318a65 100644
--- a/forge-gui/res/cardsfolder/b/bitter_downfall.txt
+++ b/forge-gui/res/cardsfolder/b/bitter_downfall.txt
@@ -3,6 +3,6 @@ ManaCost:3 B
 Types:Instant
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 3 | ValidTarget$ Creature.wasDealtDamageThisTurn | EffectZone$ All | Description$ This spell costs {3} less to cast if it targets a creature that was dealt damage this turn.
 A:SP$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target creature | AlwaysRemember$ True | RememberLKI$ True | SubAbility$ DBLoseLife | SpellDescription$ Destroy target creature. Its controller loses 2 life.
-SVar:DBLoseLife:DB$ LoseLife | Defined$ RememberedController | LifeAmount$ 2 |SubAbility$ DBCleanup
+SVar:DBLoseLife:DB$ LoseLife | Defined$ RememberedController | LifeAmount$ 2 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Oracle:This spell costs {3} less to cast if it targets a creature that was dealt damage this turn.\nDestroy target creature. Its controller loses 2 life.
\ No newline at end of file
+Oracle:This spell costs {3} less to cast if it targets a creature that was dealt damage this turn.\nDestroy target creature. Its controller loses 2 life.
diff --git a/forge-gui/res/cardsfolder/b/breath_of_fury.txt b/forge-gui/res/cardsfolder/b/breath_of_fury.txt
index 7bf1f8a78c6..44e051fe14c 100644
--- a/forge-gui/res/cardsfolder/b/breath_of_fury.txt
+++ b/forge-gui/res/cardsfolder/b/breath_of_fury.txt
@@ -6,7 +6,7 @@ A:SP$ Attach | Cost$ 2 R R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select tar
 T:Mode$ DamageDone | ValidSource$ Card.AttachedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigSacrifice | TriggerZones$ Battlefield | TriggerDescription$ When enchanted creature deals combat damage to a player, sacrifice it and attach CARDNAME to a creature you control. If you do, untap all creatures you control and after this phase, there is an additional combat phase.
 SVar:TrigSacrifice:DB$ SacrificeAll | ValidCards$ Card.EnchantedBy | SubAbility$ StillFurious
 SVar:StillFurious:DB$ Attach | Object$ Self | Choices$ Creature.YouCtrl | ChoiceTitle$ Choose a creature you control to attach Breath of Fury to | RememberAttached$ True | SubAbility$ CatchBreath
-SVar:CatchBreath:DB$ UntapAll | ValidCards$ Creature.YouCtrl | SubAbility$ TheFuryContinues | ConditionDefined$ Rememembered | ConditionPresent$ Card
+SVar:CatchBreath:DB$ UntapAll | ValidCards$ Creature.YouCtrl | SubAbility$ TheFuryContinues | ConditionDefined$ Remembered | ConditionPresent$ Card
 SVar:TheFuryContinues:DB$ AddPhase | ExtraPhase$ Combat | AfterPhase$ EndCombat | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ Cleanup
 SVar:Cleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/c/change_the_equation.txt b/forge-gui/res/cardsfolder/c/change_the_equation.txt
index c32d55f8f3e..64d0c8bd401 100644
--- a/forge-gui/res/cardsfolder/c/change_the_equation.txt
+++ b/forge-gui/res/cardsfolder/c/change_the_equation.txt
@@ -3,5 +3,5 @@ ManaCost:1 U
 Types:Instant
 A:SP$ Charm | Choices$ DBCounter,DBCounterBis
 SVar:DBCounter:DB$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell with mana value 2 or less | ValidTgts$ Card.cmcLE2 | SpellDescription$ Counter target spell with mana value 2 or less.
-SVar:DBCounterBis:DB$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell with mana value 2 or less | ValidTgts$ Card.cmcLE6+Red,Card.cmcLE6+Green| SpellDescription$ Counter target red or green spell with mana value 6 or less.
-Oracle:Choose one —\n• Counter target spell with mana value 2 or less.\n• Counter target red or green spell with mana value 6 or less.
\ No newline at end of file
+SVar:DBCounterBis:DB$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell with mana value 2 or less | ValidTgts$ Card.cmcLE6+Red,Card.cmcLE6+Green | SpellDescription$ Counter target red or green spell with mana value 6 or less.
+Oracle:Choose one —\n• Counter target spell with mana value 2 or less.\n• Counter target red or green spell with mana value 6 or less.
diff --git a/forge-gui/res/cardsfolder/c/churning_reservoir.txt b/forge-gui/res/cardsfolder/c/churning_reservoir.txt
index a75fcb16827..2fcea2ffc8c 100644
--- a/forge-gui/res/cardsfolder/c/churning_reservoir.txt
+++ b/forge-gui/res/cardsfolder/c/churning_reservoir.txt
@@ -6,5 +6,5 @@ SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Artifact.nonToken+YouCtrl+Other,
 A:AB$ Token | Cost$ 2 T | TokenScript$ r_1_1_phyrexian_goblin | CheckSVar$ CountCountersRemoved | CheckSVarCompare$ GE1 | SpellDescription$ Create a 1/1 red Phyrexian Goblin creature token. Activate only if an oil counter was removed from a permanent you controlled this turn or a permanent with an oil counter on it was put into a graveyard this turn.
 SVar:CountCountersRemoved:Count$CountersRemovedThisTurn OIL Card.YouCtrl+inRealZoneBattlefield/Plus.X
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Permanent.counters_GE1_OIL
-DeckHas:Ability$Token/Counters & Type$Goblin|Phyrexian
+DeckHas:Ability$Token|Counters & Type$Goblin|Phyrexian
 Oracle:At the beginning of your upkeep, put an oil counter on another target nontoken artifact or creature you control.\n{2}, {T}: Create a 1/1 red Phyrexian Goblin creature token. Activate only if an oil counter was removed from a permanent you controlled this turn or a permanent with an oil counter on it was put into a graveyard this turn.
diff --git a/forge-gui/res/cardsfolder/c/clavileno_first_of_the_blessed.txt b/forge-gui/res/cardsfolder/c/clavileno_first_of_the_blessed.txt
index fa34553a2c9..80c932f44d7 100644
--- a/forge-gui/res/cardsfolder/c/clavileno_first_of_the_blessed.txt
+++ b/forge-gui/res/cardsfolder/c/clavileno_first_of_the_blessed.txt
@@ -3,7 +3,7 @@ ManaCost:1 W B
 Types:Legendary Creature Vampire Cleric
 PT:2/2
 T:Mode$ AttackersDeclared | Execute$ TrigAnimate | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack, target attacking Vampire that isn't a Demon becomes a Demon in addition to its other types. It gains "When this creature dies, draw a card and create a tapped 4/3 white and black Vampire Demon creature token with flying."
-SVar:TrigAnimate:DB$Animate| ValidTgts$ Creature.Vampire+YouCtrl+attacking+nonDemon | TgtPrompt$ Select target attacking Vampire that isn't a Demon | Types$ Demon | Triggers$ TrigDie | Duration$ Permanent
+SVar:TrigAnimate:DB$Animate | ValidTgts$ Creature.Vampire+YouCtrl+attacking+nonDemon | TgtPrompt$ Select target attacking Vampire that isn't a Demon | Types$ Demon | Triggers$ TrigDie | Duration$ Permanent
 SVar:TrigDie:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When this creature dies, draw a card and create a tapped 4/3 white and black Vampire Demon creature token with flying.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ TrigToken
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ wb_4_3_vampire_demon_flying | TokenOwner$ You | TokenTapped$ True
diff --git a/forge-gui/res/cardsfolder/c/consecrate_land.txt b/forge-gui/res/cardsfolder/c/consecrate_land.txt
index 65d394d017a..1a1da27a4ad 100644
--- a/forge-gui/res/cardsfolder/c/consecrate_land.txt
+++ b/forge-gui/res/cardsfolder/c/consecrate_land.txt
@@ -7,5 +7,5 @@ S:Mode$ Continuous | Affected$ Land.EnchantedBy | AddKeyword$ Indestructible | D
 S:Mode$ CantAttach | ValidCard$ Aura.Other | Target$ Land.EnchantedBy | Description$ Enchanted land can't be enchanted by other Auras.
 AI:RemoveDeck:Random
 SVar:NonStackingAttachEffect:True
-DeckHas:Keyword$Indesctructible
+DeckHas:Keyword$Indestructible
 Oracle:Enchant land\nEnchanted land has indestructible and can't be enchanted by other Auras.
diff --git a/forge-gui/res/cardsfolder/d/dark_heart_of_the_wood.txt b/forge-gui/res/cardsfolder/d/dark_heart_of_the_wood.txt
index 043cbcb1093..d0db6f14542 100644
--- a/forge-gui/res/cardsfolder/d/dark_heart_of_the_wood.txt
+++ b/forge-gui/res/cardsfolder/d/dark_heart_of_the_wood.txt
@@ -4,5 +4,5 @@ Types:Enchantment
 A:AB$ GainLife | Cost$ Sac<1/Forest> | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
 AI:RemoveDeck:All
 SVar:NonStackingEffect:True
-SVar:DeckHas:Ability$Sacrifice|LifeGain
+DeckHas:Ability$Sacrifice|LifeGain
 Oracle:Sacrifice a Forest: You gain 3 life.
diff --git a/forge-gui/res/cardsfolder/d/denethor_ruling_steward.txt b/forge-gui/res/cardsfolder/d/denethor_ruling_steward.txt
index ba8e71a7d70..456cd11ea98 100644
--- a/forge-gui/res/cardsfolder/d/denethor_ruling_steward.txt
+++ b/forge-gui/res/cardsfolder/d/denethor_ruling_steward.txt
@@ -7,5 +7,5 @@ SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_human_soldier | T
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouCtrl
 A:AB$ LoseLife | Cost$ 2 Sac<1/Creature.Other/another creature> | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainLife | SpellDescription$ Each opponent loses 1 life and you gain 1 life.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-DeckHas:Ability$Token|LifeGain|Sacrifice & type$Soldier
-Oracle:At the beginning of your end step, if a creature died under your control this turn, create a 1/1 white Human Soldier creature token.\n{2}, Sacrifice another creature: Each opponent loses 1 life and you gain 1 life.
\ No newline at end of file
+DeckHas:Ability$Token|LifeGain|Sacrifice & Type$Soldier
+Oracle:At the beginning of your end step, if a creature died under your control this turn, create a 1/1 white Human Soldier creature token.\n{2}, Sacrifice another creature: Each opponent loses 1 life and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/e/east_mark_cavalier.txt b/forge-gui/res/cardsfolder/e/east_mark_cavalier.txt
index b66800023f6..9bc7761c600 100644
--- a/forge-gui/res/cardsfolder/e/east_mark_cavalier.txt
+++ b/forge-gui/res/cardsfolder/e/east_mark_cavalier.txt
@@ -3,6 +3,6 @@ ManaCost:1 W
 Types:Creature Human Knight
 PT:2/2
 K:Vigilance
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Goblin,Orc| TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME deals damage to a Goblin or Orc, destroy that creature.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Goblin,Orc | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME deals damage to a Goblin or Orc, destroy that creature.
 SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredTargetLKICopy
-Oracle:Vigilance\nWhenever East-Mark Cavalier deals damage to a Goblin or Orc, destroy that creature.
\ No newline at end of file
+Oracle:Vigilance\nWhenever East-Mark Cavalier deals damage to a Goblin or Orc, destroy that creature.
diff --git a/forge-gui/res/cardsfolder/e/elusive_otter_groves_bounty.txt b/forge-gui/res/cardsfolder/e/elusive_otter_groves_bounty.txt
index 5ff07f9fe55..cd539770c7e 100644
--- a/forge-gui/res/cardsfolder/e/elusive_otter_groves_bounty.txt
+++ b/forge-gui/res/cardsfolder/e/elusive_otter_groves_bounty.txt
@@ -14,6 +14,6 @@ ALTERNATE
 Name:Grove's Bounty
 ManaCost:X G
 Types:Sorcery Adventure
-A:SP$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select any number of target creatures you control | CounterType$ P1P1 | CounterNum$ X | TargetMin$ 0 | TargetMax$ X | DividedAsYouChoose$ X| SpellDescription$ Distribute X +1/+1 counters among any number of target creatures you control. (Then exile this card. You may cast the creature later from exile.)
+A:SP$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select any number of target creatures you control | CounterType$ P1P1 | CounterNum$ X | TargetMin$ 0 | TargetMax$ X | DividedAsYouChoose$ X | SpellDescription$ Distribute X +1/+1 counters among any number of target creatures you control. (Then exile this card. You may cast the creature later from exile.)
 SVar:X:Count$xPaid
 Oracle:Distribute X +1/+1 counters among any number of target creatures you control. (Then exile this card. You may cast the creature later from exile.)
diff --git a/forge-gui/res/cardsfolder/e/eye_of_malcator.txt b/forge-gui/res/cardsfolder/e/eye_of_malcator.txt
index 04ef57b93e7..5cb7c18c8c1 100644
--- a/forge-gui/res/cardsfolder/e/eye_of_malcator.txt
+++ b/forge-gui/res/cardsfolder/e/eye_of_malcator.txt
@@ -5,5 +5,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
 SVar:TrigScry:DB$ Scry | ScryNum$ 2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ Whenever another artifact enters the battlefield under your control, CARDNAME becomes a 4/4 Phyrexian Eye artifact creature until end of turn.
 SVar:TrigAnimate:DB$ Animate | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Phyrexian,Eye | RemoveCreatureTypes$ True
-DeckHas:Type$Eye|Phryexian
+DeckHas:Type$Eye|Phyrexian
 Oracle:When Eye of Malcator enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom and the rest on top in any order.)\nWhenever another artifact enters the battlefield under your control, Eye of Malcator becomes a 4/4 Phyrexian Eye artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/f/fallaji_wayfarer.txt b/forge-gui/res/cardsfolder/f/fallaji_wayfarer.txt
index 61309157266..c849cf65f85 100644
--- a/forge-gui/res/cardsfolder/f/fallaji_wayfarer.txt
+++ b/forge-gui/res/cardsfolder/f/fallaji_wayfarer.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Human Scout
 PT:2/4
 S:Mode$ Continuous | EffectZone$ All | Affected$ Card.Self | CharacteristicDefining$ False | SetColor$ All | Description$ CARDNAME is all colors. This ability doesn't affect its color identity. (It can be in any deck whose commander's color identity includes green.)
-S:Mode$ Continuous | Affected$ Card.YouCtrl+MultiColor| AffectedZone$ Stack | AddKeyword$ Convoke | Description$ Multicolored spells you cast have convoke. (Your creatures can help cast those spells. Each creature you tap while casting a multicolored spell pays for {1} or one mana of a color that creature is.)
+S:Mode$ Continuous | Affected$ Card.YouCtrl+MultiColor | AffectedZone$ Stack | AddKeyword$ Convoke | Description$ Multicolored spells you cast have convoke. (Your creatures can help cast those spells. Each creature you tap while casting a multicolored spell pays for {1} or one mana of a color that creature is.)
 AI:RemoveDeck:Random
 SVar:BuffedBy:Card.MultiColor
 Oracle:Fallaji Wayfarer is all colors. This ability doesn't affect its color identity. (It can be in any deck whose commander's color identity includes green.)\nMulticolored spells you cast have convoke. (Your creatures can help cast those spells. Each creature you tap while casting a multicolored spell pays for {1} or one mana of a color that creature is.)
diff --git a/forge-gui/res/cardsfolder/f/foray_of_orcs.txt b/forge-gui/res/cardsfolder/f/foray_of_orcs.txt
index 8e567d928a7..fb9c171a27e 100644
--- a/forge-gui/res/cardsfolder/f/foray_of_orcs.txt
+++ b/forge-gui/res/cardsfolder/f/foray_of_orcs.txt
@@ -2,9 +2,9 @@ Name:Foray of Orcs
 ManaCost:3 R
 Types:Sorcery
 A:SP$ Amass | Type$ Orc | Num$ 2 | RememberAmass$ True | SubAbility$ DBImmediateTrig | SpellDescription$ Amass Orcs 2. When you do, CARDNAME deals X damage to target creature an opponent controls, where X is the amassed Army's power. (To amass Orcs 2, put two +1/+1 counters on an Army you control. It's also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
-SVar:DBImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 |Execute$ TrigDealDamage | RememberObjects$ Remembered | SubAbility$ DBCleanup | TriggerDescription$ When you do, CARDNAME deals X damage to target creature an opponent controls, where X is the amassed Army's power. (To amass Orcs 2, put two +1/+1 counters on an Army you control. It's also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
+SVar:DBImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | Execute$ TrigDealDamage | RememberObjects$ Remembered | SubAbility$ DBCleanup | TriggerDescription$ When you do, CARDNAME deals X damage to target creature an opponent controls, where X is the amassed Army's power. (To amass Orcs 2, put two +1/+1 counters on an Army you control. It's also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | NumDmg$ X
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:TriggerRemembered$CardPower
 DeckHas:Ability$Token|Counters & Type$Orc|Army
-Oracle:Amass Orcs 2. When you do, Foray of Orcs deals X damage to target creature an opponent controls, where X is the amassed Army's power. (To amass Orcs 2, put two +1/+1 counters on an Army you control. It's also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
\ No newline at end of file
+Oracle:Amass Orcs 2. When you do, Foray of Orcs deals X damage to target creature an opponent controls, where X is the amassed Army's power. (To amass Orcs 2, put two +1/+1 counters on an Army you control. It's also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
diff --git a/forge-gui/res/cardsfolder/f/frankensteins_monster.txt b/forge-gui/res/cardsfolder/f/frankensteins_monster.txt
index 3d2cb826a96..413c29ef704 100644
--- a/forge-gui/res/cardsfolder/f/frankensteins_monster.txt
+++ b/forge-gui/res/cardsfolder/f/frankensteins_monster.txt
@@ -18,6 +18,6 @@ SVar:CheckExiled:Count$ValidExile Card.IsRemembered
 SVar:CheckYard:Count$ValidGraveyard Creature.YouOwn+NotDefinedReplacedSimultaneousETB
 SVar:NeedsToPlayVar:CheckYard GE1
 DeckHints:Ability$Mill|Graveyard
-DeckHas:Ability$Gravyard|Counters
+DeckHas:Ability$Graveyard|Counters
 AI:RemoveDeck:Random
 Oracle:As Frankenstein's Monster enters the battlefield, exile X creature cards from your graveyard. If you can't, put Frankenstein's Monster into its owner's graveyard instead of onto the battlefield. For each creature card exiled this way, Frankenstein's Monster enters the battlefield with a +2/+0, +1/+1, or +0/+2 counter on it.
diff --git a/forge-gui/res/cardsfolder/f/frodo_determined_hero.txt b/forge-gui/res/cardsfolder/f/frodo_determined_hero.txt
index 0c4a05fc52b..26875d84340 100644
--- a/forge-gui/res/cardsfolder/f/frodo_determined_hero.txt
+++ b/forge-gui/res/cardsfolder/f/frodo_determined_hero.txt
@@ -5,7 +5,7 @@ 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 target Equipment you control with mana value 2 or 3 to NICKNAME.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ DBAttach | TriggerZones$ Battlefield | OptionalDecider$ You | Secondary$ True | TriggerDescription$ Whenever CARDNAME attacks, you may attach target Equipment you control with mana value 2 or 3 to NICKNAME
 SVar:DBAttach:DB$ Attach | ValidTgts$ Equipment.cmcEQ2+YouCtrl,Equipment.cmcEQ3+YouCtrl | Object$ Targeted | Defined$ Self
-R:Event$ DamageDone | ActiveZones$ Battlefield | Prevent$ True | ValidTarget$ Card.Self| PlayerTurn$ True | Description$ As long as it's your turn, prevent all damage that would be dealt to NICKNAME.
+R:Event$ DamageDone | ActiveZones$ Battlefield | Prevent$ True | ValidTarget$ Card.Self | PlayerTurn$ True | Description$ As long as it's your turn, prevent all damage that would be dealt to NICKNAME.
 DeckHints:Type$Equipment
 SVar:HasAttackEffect:TRUE
 Oracle:Whenever Frodo, Determined Hero enters the battlefield or attacks, you may attach target Equipment you control with mana value 2 or 3 to Frodo.\nAs long as it's your turn, prevent all damage that would be dealt to Frodo.
diff --git a/forge-gui/res/cardsfolder/g/gale_conduit_of_the_arcane.txt b/forge-gui/res/cardsfolder/g/gale_conduit_of_the_arcane.txt
index 8cb53220da3..84ebd2be3d2 100644
--- a/forge-gui/res/cardsfolder/g/gale_conduit_of_the_arcane.txt
+++ b/forge-gui/res/cardsfolder/g/gale_conduit_of_the_arcane.txt
@@ -67,6 +67,6 @@ Types:Legendary Creature Human Wizard
 PT:4/5
 T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever you cast an instant or sorcery spell, put two +1/+1 counters on target creature.
 SVar:TrigCounter:DB$ PutCounter | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ 2
-DeckHas:Ability$Counter
+DeckHas:Ability$Counters
 DeckHints:Type$Instant|Sorcery
 Oracle:Whenever you cast an instant or sorcery spell, put two +1/+1 counters on target creature.
diff --git a/forge-gui/res/cardsfolder/g/gallifrey_council_chamber.txt b/forge-gui/res/cardsfolder/g/gallifrey_council_chamber.txt
index db7201d2a09..b796a996783 100644
--- a/forge-gui/res/cardsfolder/g/gallifrey_council_chamber.txt
+++ b/forge-gui/res/cardsfolder/g/gallifrey_council_chamber.txt
@@ -4,7 +4,7 @@ Types:Legendary Land
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters the battlefield, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
 SVar:TrigSurveil:DB$ Surveil | Amount$ 1
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Mana | Cost$ T | Produced$ Any| RestrictValid$ Spell.Time Lord,Spell.Alien,Activated.Time Lord+inZoneBattlefield,Activated.Alien+inZoneBattlefield | SpellDescription$ Add one mana of any color. Spend this mana only to cast a Time Lord or Alien spell or activate an ability of a Time Lord or Alien.
+A:AB$ Mana | Cost$ T | Produced$ Any | RestrictValid$ Spell.Time Lord,Spell.Alien,Activated.Time Lord+inZoneBattlefield,Activated.Alien+inZoneBattlefield | SpellDescription$ Add one mana of any color. Spend this mana only to cast a Time Lord or Alien spell or activate an ability of a Time Lord or Alien.
 DeckHas:Ability$Surveil|Graveyard
 DeckNeeds:Type$Time Lord|Alien
-Oracle:When Gallifrey Council Chamber enters the battlefield, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)\n{T}: Add {C}.\n{T}: Add one mana of any color. Spend this mana only to cast a Time Lord or Alien spell or activate an ability of a Time Lord or Alien.
\ No newline at end of file
+Oracle:When Gallifrey Council Chamber enters the battlefield, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)\n{T}: Add {C}.\n{T}: Add one mana of any color. Spend this mana only to cast a Time Lord or Alien spell or activate an ability of a Time Lord or Alien.
diff --git a/forge-gui/res/cardsfolder/g/gleeful_demolition.txt b/forge-gui/res/cardsfolder/g/gleeful_demolition.txt
index 3cac090c98b..16ee9b86bef 100644
--- a/forge-gui/res/cardsfolder/g/gleeful_demolition.txt
+++ b/forge-gui/res/cardsfolder/g/gleeful_demolition.txt
@@ -4,5 +4,5 @@ Types:Sorcery
 A:SP$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ DBToken | RememberLKI$ True | AlwaysRemember$ True | SpellDescription$ Destroy target artifact. If you controlled that artifact, creature three 1/1 red Phyrexian Goblin creature tokens.
 SVar:DBToken:DB$ Token | TokenAmount$ 3 | TokenScript$ r_1_1_phyrexian_goblin | TokenOwner$ You | ConditionDefined$ RememberedLKI | ConditionPresent$ Card.YouCtrl | SubAbility$ DBCleanup | SpellDescription$ If you controlled that artifact, creature three 1/1 red Phyrexian Goblin creature tokens.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Type$Goblin|Phryexian & Ability$Token
+DeckHas:Type$Goblin|Phyrexian & Ability$Token
 Oracle:Destroy target artifact. If you controlled that artifact, creature three 1/1 red Phyrexian Goblin creature tokens.
diff --git a/forge-gui/res/cardsfolder/g/godtoucher.txt b/forge-gui/res/cardsfolder/g/godtoucher.txt
index 1052967e2fe..018e1c2cd3f 100644
--- a/forge-gui/res/cardsfolder/g/godtoucher.txt
+++ b/forge-gui/res/cardsfolder/g/godtoucher.txt
@@ -2,7 +2,7 @@ Name:Godtoucher
 ManaCost:3 G
 Types:Creature Elf Cleric
 PT:2/2
-A:AB$ Effect | Cost$ 1 W T | ValidTgts$ Creature.powerGE5 | TgtPrompt$ Select target creature with power 5 or greater | ReplacementEffects$ RPrevent| RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ Prevent all damage that would be dealt to target creature with power 5 or greater this turn.
+A:AB$ Effect | Cost$ 1 W T | ValidTgts$ Creature.powerGE5 | TgtPrompt$ Select target creature with power 5 or greater | ReplacementEffects$ RPrevent | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ Prevent all damage that would be dealt to target creature with power 5 or greater this turn.
 SVar:RPrevent:Event$ DamageDone | Prevent$ True | ValidTarget$ Card.IsRemembered | Description$ Prevent all damage that would be dealt to that creature this turn.
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/h/hidetsugu_devouring_chaos.txt b/forge-gui/res/cardsfolder/h/hidetsugu_devouring_chaos.txt
index 32c4a2c6bac..a1943c3f8cb 100644
--- a/forge-gui/res/cardsfolder/h/hidetsugu_devouring_chaos.txt
+++ b/forge-gui/res/cardsfolder/h/hidetsugu_devouring_chaos.txt
@@ -10,5 +10,5 @@ SVar:DBImmediateTrigger:DB$ ImmediateTrigger | ConditionDefined$ Remembered | Co
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ X
 SVar:X:TriggerRemembered$CardManaCost
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-Deckhas:Ability$Sacrifice
+DeckHas:Ability$Sacrifice
 Oracle:{B}, Sacrifice a creature: Scry 2.\n{2}{R}, {T}: Exile the top card of your library. You may play that card this turn. When you exile a nonland card this way, Hidetsugu, Devouring Chaos deals damage equal to the exiled card's mana value to any target.
diff --git a/forge-gui/res/cardsfolder/h/hylda_of_the_icy_crown.txt b/forge-gui/res/cardsfolder/h/hylda_of_the_icy_crown.txt
index 31afb7bf8db..73d14f52386 100644
--- a/forge-gui/res/cardsfolder/h/hylda_of_the_icy_crown.txt
+++ b/forge-gui/res/cardsfolder/h/hylda_of_the_icy_crown.txt
@@ -5,7 +5,7 @@ PT:3/4
 T:Mode$ Taps | ValidCard$ Creature.OppCtrl | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigImmediateTrig | TriggerDescription$ Whenever you tap an untapped creature an opponent controls, you may pay {1}. When you do, ABILITY
 SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ 1 | Execute$ TrigCharm
 SVar:TrigCharm:DB$ Charm | Choices$ DBToken,DBPutCounterAll,DBScry
-SVar:DBToken:DB$ Token | TokenScript$ wu_4_4_elemental |SpellDescription$ Create a 4/4 white and blue Elemental creature token.
+SVar:DBToken:DB$ Token | TokenScript$ wu_4_4_elemental | SpellDescription$ Create a 4/4 white and blue Elemental creature token.
 SVar:DBPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on each creature you control.
 SVar:DBScry:DB$ Scry | ScryNum$ 2 | SubAbility$ DBDraw | SpellDescription$ Scry 2, then draw a card.
 SVar:DBDraw:DB$ Draw
diff --git a/forge-gui/res/cardsfolder/i/into_the_fray.txt b/forge-gui/res/cardsfolder/i/into_the_fray.txt
index 4eaf44caa20..caf6d3234c2 100644
--- a/forge-gui/res/cardsfolder/i/into_the_fray.txt
+++ b/forge-gui/res/cardsfolder/i/into_the_fray.txt
@@ -2,7 +2,7 @@ Name:Into the Fray
 ManaCost:R
 Types:Instant Arcane
 K:Splice:Arcane:R
-A:SP$ Effect | ValidTgts$ Creature | StaticAbilities$ MustAttack| RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ Target creature attacks this turn if able.
+A:SP$ Effect | ValidTgts$ Creature | StaticAbilities$ MustAttack | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | SpellDescription$ Target creature attacks this turn if able.
 SVar:MustAttack:Mode$ MustAttack | ValidCreature$ Card.IsRemembered | Description$ This creature attacks this turn if able.
 AI:RemoveDeck:All
 Oracle:Target creature attacks this turn if able.\nSplice onto Arcane {R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
diff --git a/forge-gui/res/cardsfolder/k/karn_living_legacy.txt b/forge-gui/res/cardsfolder/k/karn_living_legacy.txt
index 3fa744b5a4d..45730783be8 100644
--- a/forge-gui/res/cardsfolder/k/karn_living_legacy.txt
+++ b/forge-gui/res/cardsfolder/k/karn_living_legacy.txt
@@ -8,7 +8,7 @@ SVar:DBDig:DB$ Dig | DigNum$ X | ChangeNum$ 1 | RestRandomOrder$ True | UnlessCo
 A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | AILogic$ Always | Stackable$ False | Name$ Emblem - Karn, Living Legacy | Image$ emblem_karn_living_legacy | Duration$ Permanent | Abilities$ KarnPing | SpellDescription$ You get an emblem with "Tap an untapped artifact you control: This emblem deals 1 damage to any target."
 SVar:KarnPing:AB$ DealDamage | Cost$ tapXType<1/Artifact> | ActivationZone$ Command | ValidTgts$ Any | NumDmg$ 1
 SVar:PlayMain1:TRUE
-DeckHas:Ability$Token & Type|Artifact
+DeckHas:Ability$Token & Type$Artifact
 DeckNeeds:Type$Artifact
 SVar:X:Count$ChosenNumber
 Oracle:[+1]: Create a tapped Powerstone token. (It's an artifact with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.")\n[−1]: Pay any amount of mana. Look at that many cards from the top of your library, then put one of those cards into your hand and the rest on the bottom of your library in a random order.\n[−7]: You get an emblem with "Tap an untapped artifact you control: This emblem deals 1 damage to any target."
diff --git a/forge-gui/res/cardsfolder/k/katilda_and_lier.txt b/forge-gui/res/cardsfolder/k/katilda_and_lier.txt
index 0fa48a2c1f5..8c483a56859 100644
--- a/forge-gui/res/cardsfolder/k/katilda_and_lier.txt
+++ b/forge-gui/res/cardsfolder/k/katilda_and_lier.txt
@@ -2,7 +2,7 @@ Name:Katilda and Lier
 ManaCost:G W U
 Types:Legendary Creature Human
 PT:3/3
-T:Mode$ SpellCast | ValidCard$ Human | ValidActivatingPlayer$ You | Execute$ TrigFlashback| TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a Human spell, target instant or sorcery card in your graveyard gains flashback until end of turn. The flashback cost is equal to its mana cost. (You may cast that card from your graveyard for its flashback cost. Then exile it.)
+T:Mode$ SpellCast | ValidCard$ Human | ValidActivatingPlayer$ You | Execute$ TrigFlashback | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a Human spell, target instant or sorcery card in your graveyard gains flashback until end of turn. The flashback cost is equal to its mana cost. (You may cast that card from your graveyard for its flashback cost. Then exile it.)
 SVar:TrigFlashback:DB$ Pump | ValidTgts$ Instant.YouOwn,Sorcery.YouOwn | TgtZone$ Graveyard | TgtPrompt$ Select target instant or sorcery card in your graveyard | KW$ Flashback | PumpZone$ Graveyard | AILogic$ ReplaySpell
 DeckHas:Ability$Graveyard & Keyword$Flashback
 DeckNeeds:Type$Human
diff --git a/forge-gui/res/cardsfolder/k/kaya_the_inexorable.txt b/forge-gui/res/cardsfolder/k/kaya_the_inexorable.txt
index 57870569e13..1effad8aaf8 100644
--- a/forge-gui/res/cardsfolder/k/kaya_the_inexorable.txt
+++ b/forge-gui/res/cardsfolder/k/kaya_the_inexorable.txt
@@ -10,7 +10,7 @@ SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | Tok
 A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SpellDescription$ Exile target nonland permanent.
 A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Kaya the Inexorable | Image$ emblem_kaya_the_inexorable | Duration$ Permanent | Triggers$ Upkeep | SpellDescription$ You get an emblem with "At the beginning of your upkeep, you may cast a legendary spell from your hand, from your graveyard, or from among cards you own in exile without paying its mana cost."
 SVar:Upkeep:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | OptionalDecider$ You | Execute$ TrigCast | TriggerDescription$ At the beginning of your upkeep, you may cast a legendary spell from your hand, from your graveyard, or from among cards you own in exile without paying its mana cost.
-SVar:TrigCast:DB$ Play | Valid$ Card.Legendary+YouOwn| ValidSA$ Spell | ValidZone$ Hand,Graveyard,Exile | WithoutManaCost$ True
+SVar:TrigCast:DB$ Play | Valid$ Card.Legendary+YouOwn | ValidSA$ Spell | ValidZone$ Hand,Graveyard,Exile | WithoutManaCost$ True
 DeckHas:Ability$Token|Counters
 DeckHints:Type$Legendary
 Oracle:[+1]: Put a ghostform counter on up to one target nontoken creature. It gains "When this creature dies or is put into exile, return it to its owner's hand and create a 1/1 white Spirit creature token with flying."\n[-3]: Exile target nonland permanent.\n[-7]: You get an emblem with "At the beginning of your upkeep, you may cast a legendary spell from your hand, from your graveyard, or from among cards you own in exile without paying its mana cost."
diff --git a/forge-gui/res/cardsfolder/k/king_of_the_oathbreakers.txt b/forge-gui/res/cardsfolder/k/king_of_the_oathbreakers.txt
index 4bcf6b309f6..9e400b406ba 100644
--- a/forge-gui/res/cardsfolder/k/king_of_the_oathbreakers.txt
+++ b/forge-gui/res/cardsfolder/k/king_of_the_oathbreakers.txt
@@ -3,10 +3,10 @@ ManaCost:2 W B
 Types:Legendary Creature Spirit Noble
 PT:3/3
 K:Flying
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self,Spirit.YouCtrl+Other | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigPhaseOut| TriggerDescription$ Whenever CARDNAME or another Spirit you control becomes the target of a spell, it phases out. (Treat it and anything attached to it as though they don't exist until your next turn.)
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self,Spirit.YouCtrl+Other | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigPhaseOut | TriggerDescription$ Whenever CARDNAME or another Spirit you control becomes the target of a spell, it phases out. (Treat it and anything attached to it as though they don't exist until your next turn.)
 SVar:TrigPhaseOut:DB$ Phases | Defined$ TriggeredTargetLKICopy
 T:Mode$ PhaseIn | ValidCard$ Card.Self,Spirit.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another Spirit you control phases in, create a tapped 1/1 white Spirit creature token with flying.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You | TokenTapped$ True
 DeckHints:Type$Spirit
 DeckHas:Ability$Token
-Oracle:Flying\nWhenever King of the Oathbreakers or another Spirit you control becomes the target of a spell, it phases out. (Treat it and anything attached to it as though they don't exist until your next turn.)\nWhenever King of the Oathbreakers or another Spirit you control phases in, create a tapped 1/1 white Spirit creature token with flying.
\ No newline at end of file
+Oracle:Flying\nWhenever King of the Oathbreakers or another Spirit you control becomes the target of a spell, it phases out. (Treat it and anything attached to it as though they don't exist until your next turn.)\nWhenever King of the Oathbreakers or another Spirit you control phases in, create a tapped 1/1 white Spirit creature token with flying.
diff --git a/forge-gui/res/cardsfolder/k/kumenas_speaker.txt b/forge-gui/res/cardsfolder/k/kumenas_speaker.txt
index 9de98ed0037..c5be9be6022 100644
--- a/forge-gui/res/cardsfolder/k/kumenas_speaker.txt
+++ b/forge-gui/res/cardsfolder/k/kumenas_speaker.txt
@@ -2,7 +2,7 @@ Name:Kumena's Speaker
 ManaCost:G
 Types:Creature Merfolk Shaman
 PT:1/1
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | IsPresent$ Island.YouCtrl,Creature.Merfolk+Other+YouCtrl| PresentCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control another Merfolk or an Island.
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | IsPresent$ Island.YouCtrl,Creature.Merfolk+Other+YouCtrl | PresentCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control another Merfolk or an Island.
 SVar:BuffedBy:Island
 SVar:BuffedBy:Merfolk
 Oracle:Kumena's Speaker gets +1/+1 as long as you control another Merfolk or an Island.
diff --git a/forge-gui/res/cardsfolder/l/lost_isle_calling.txt b/forge-gui/res/cardsfolder/l/lost_isle_calling.txt
index f05909792da..ae33e7f654b 100644
--- a/forge-gui/res/cardsfolder/l/lost_isle_calling.txt
+++ b/forge-gui/res/cardsfolder/l/lost_isle_calling.txt
@@ -1,10 +1,10 @@
 Name:Lost Isle Calling
 ManaCost:1 U
 Types:Enchantment
-T:Mode$ Scry | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter |TriggerDescription$ Whenever you scry, put a verse counter on CARDNAME.
+T:Mode$ Scry | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you scry, put a verse counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | CounterNum$ 1 | Defined$ Self | CounterType$ Verse
 SVar:X:Count$CardCounters.VERSE
 A:AB$ Draw | Cost$ 4 U U Exile<1/CARDNAME> | NumCards$ X | SubAbility$ DBExtraTurn | SorcerySpeed$ True | SpellDescription$ Draw a card for each verse counter on CARDNAME. If it had seven or more verse counters on it, take an extra turn after this one. Activate only as a sorcery.
 SVar:DBExtraTurn:DB$ AddTurn | NumTurns$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE7
 DeckHas:Ability$Counters
-Oracle:Whenever you scry, put a verse counter on Lost Isle Calling.\n{4}{U}{U}, Exile Lost Isle Calling: Draw a card for each verse counter on Lost Isle Calling. If it had seven or more verse counters on it, take an extra turn after this one. Activate only as a sorcery.
\ No newline at end of file
+Oracle:Whenever you scry, put a verse counter on Lost Isle Calling.\n{4}{U}{U}, Exile Lost Isle Calling: Draw a card for each verse counter on Lost Isle Calling. If it had seven or more verse counters on it, take an extra turn after this one. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/m/mercurial_spelldancer.txt b/forge-gui/res/cardsfolder/m/mercurial_spelldancer.txt
index 868aebd0d40..7453498ab12 100644
--- a/forge-gui/res/cardsfolder/m/mercurial_spelldancer.txt
+++ b/forge-gui/res/cardsfolder/m/mercurial_spelldancer.txt
@@ -6,7 +6,7 @@ S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | Description$ CARDNAME can't
 T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature spell, put an oil counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ OIL | CounterNum$ 1
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDelayTrig | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may remove two oil counters from it. If you do, when you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy.
-SVar:TrigDelayTrig:AB$ DelayedTrigger| Cost$ SubCounter<2/OIL> | AILogic$ SpellCopy | Execute$ EffTrigCopy | ThisTurn$ True | Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | SpellDescription$ When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy.
+SVar:TrigDelayTrig:AB$ DelayedTrigger | Cost$ SubCounter<2/OIL> | AILogic$ SpellCopy | Execute$ EffTrigCopy | ThisTurn$ True | Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | SpellDescription$ When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy.
 SVar:EffTrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 SVar:HasAttackEffect:TRUE
 SVar:BuffedBy:Card.nonCreature
diff --git a/forge-gui/res/cardsfolder/m/meriadoc_brandybuck.txt b/forge-gui/res/cardsfolder/m/meriadoc_brandybuck.txt
index 1977605e13b..8faa00f73c8 100644
--- a/forge-gui/res/cardsfolder/m/meriadoc_brandybuck.txt
+++ b/forge-gui/res/cardsfolder/m/meriadoc_brandybuck.txt
@@ -2,8 +2,8 @@ Name:Meriadoc Brandybuck
 ManaCost:1 G
 Types:Legendary Creature Halfling Citizen
 PT:2/2
-T:Mode$ AttackersDeclaredOneTarget | ValidAttackers$ Halfling.YouCtrl | AttackedTarget$ Opponent | Execute$ TrigFood| TriggerZones$ Battlefield | TriggerDescription$ Whenever one or more Halflings you control attack a player, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
+T:Mode$ AttackersDeclaredOneTarget | ValidAttackers$ Halfling.YouCtrl | AttackedTarget$ Opponent | Execute$ TrigFood | TriggerZones$ Battlefield | TriggerDescription$ Whenever one or more Halflings you control attack a player, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
 SVar:TrigFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
 DeckHas:Ability$Token|LifeGain & Type$Food|Artifact
 DeckHints:Type$Halfling
-Oracle:Whenever one or more Halflings you control attack a player, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
\ No newline at end of file
+Oracle:Whenever one or more Halflings you control attack a player, create a Food token. (It's an artifact with "{2}, {T}, Sacrifice this artifact: You gain 3 life.")
diff --git a/forge-gui/res/cardsfolder/m/mine_worker.txt b/forge-gui/res/cardsfolder/m/mine_worker.txt
index 5934d116c52..062c75c30e3 100644
--- a/forge-gui/res/cardsfolder/m/mine_worker.txt
+++ b/forge-gui/res/cardsfolder/m/mine_worker.txt
@@ -2,7 +2,7 @@ Name:Mine Worker
 ManaCost:2
 Types:Artifact Creature Assembly-Worker
 PT:2/1
-A:AB$ GainLife | Cost$ T | LifeAmount$ X | SpellDescription$ You gain 1 life. If you control creatures named Power Plant Worker and Tower Worker, you gain 3 life instead.| StackDescription$ SpellDescription
+A:AB$ GainLife | Cost$ T | LifeAmount$ X | SpellDescription$ You gain 1 life. If you control creatures named Power Plant Worker and Tower Worker, you gain 3 life instead. | StackDescription$ SpellDescription
 SVar:X:Count$Compare TronCheck GT0.3.1
 SVar:TronCheck:SVar$Z/Times.Y
 SVar:Z:Count$Valid Creature.YouCtrl+namedTower Worker
diff --git a/forge-gui/res/cardsfolder/m/morgul_knife_wound.txt b/forge-gui/res/cardsfolder/m/morgul_knife_wound.txt
index b94ef496904..855981c40b9 100644
--- a/forge-gui/res/cardsfolder/m/morgul_knife_wound.txt
+++ b/forge-gui/res/cardsfolder/m/morgul_knife_wound.txt
@@ -5,5 +5,5 @@ K:Enchant creature
 A:SP$ Attach | ValidTgts$ Creature | AILogic$ Curse
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -3 | AddTrigger$ TrigExile | Description$ Enchanted creature gets -3/-0 and has "At the beginning of your upkeep, exile this creature unless you pay 2 life."
 SVar:TrigExile:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You  | TriggerZones$ Battlefield | Execute$ TrigExileEnchanted | TriggerDescription$ At the beginning of your upkeep, exile this creature unless you pay 2 life.
-SVar:TrigExileEnchanted:DB$ ChangeZone| Origin$ Battlefield | Destination$ Exile | UnlessCost$ PayLife<2> | UnlessPayer$ TriggeredPlayer
-Oracle:Enchant creature\nEnchanted creature gets -3/-0 and has "At the beginning of your upkeep, exile this creature unless you pay 2 life."
\ No newline at end of file
+SVar:TrigExileEnchanted:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | UnlessCost$ PayLife<2> | UnlessPayer$ TriggeredPlayer
+Oracle:Enchant creature\nEnchanted creature gets -3/-0 and has "At the beginning of your upkeep, exile this creature unless you pay 2 life."
diff --git a/forge-gui/res/cardsfolder/n/nahiris_resolve.txt b/forge-gui/res/cardsfolder/n/nahiris_resolve.txt
index 0cfd8f919a8..014744dfc5e 100644
--- a/forge-gui/res/cardsfolder/n/nahiris_resolve.txt
+++ b/forge-gui/res/cardsfolder/n/nahiris_resolve.txt
@@ -4,7 +4,7 @@ Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddPower$ 1 | AddKeyword$ Haste | Description$ Creatures you control get +1/+0 and have haste.
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ At the beginning of your end step, exile any number of nontoken artifacts and/or creatures you control. Return those cards to the battlefield under their owner's control at the beginning of your next upkeep.
 SVar:TrigChangeZone:DB$ ChangeZone | ChangeNum$ X | ChangeType$ Creature.YouCtrl+nonToken,Artifact.YouCtrl+nonToken | Hidden$ True | SelectPrompt$ Choose any number of nontoken artifacts and creatures you control | Origin$ Battlefield | Destination$ Exile | SubAbility$ DelTrig | RememberChanged$ True
-SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigReturn | RememberObjects$ Remembered | SubAbility$ DBCleanup| TriggerDescription$ At the beginning of your next upkeep, return that card to the battlefield under its owner's control.
+SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigReturn | RememberObjects$ Remembered | SubAbility$ DBCleanup | TriggerDescription$ At the beginning of your next upkeep, return that card to the battlefield under its owner's control.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRememberedLKI
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$Valid Creature.YouCtrl+nonToken,Artifact.YouCtrl+nonToken
diff --git a/forge-gui/res/cardsfolder/o/orcish_medicine.txt b/forge-gui/res/cardsfolder/o/orcish_medicine.txt
index edfdc1335db..2ad994d176a 100644
--- a/forge-gui/res/cardsfolder/o/orcish_medicine.txt
+++ b/forge-gui/res/cardsfolder/o/orcish_medicine.txt
@@ -2,7 +2,7 @@ Name:Orcish Medicine
 ManaCost:1 B
 Types:Instant
 K:Flash
-A:SP$ Pump | ValidTgts$ Creature |SubAbility$ DBAmass | KWChoice$ Indestructible,Lifelink | StackDescription$ REP Target creature_{c:Targeted} & your_{p:You}'s | SpellDescription$ Target creature gains your choice of lifelink or indestructible until end of turn.
+A:SP$ Pump | ValidTgts$ Creature | SubAbility$ DBAmass | KWChoice$ Indestructible,Lifelink | StackDescription$ REP Target creature_{c:Targeted} & your_{p:You}'s | SpellDescription$ Target creature gains your choice of lifelink or indestructible until end of turn.
 SVar:DBAmass:DB$ Amass | Type$ Orc | Num$ 1 | SpellDescription$ Amass Orcs 1. (Put a +1/+1 counter on an Army you control. It's also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
 DeckHas:Ability$Token|Counters|LifeGain & Type$Orc|Army
 Oracle:Target creature gains your choice of lifelink or indestructible until end of turn.\nAmass Orcs 1. (Put a +1/+1 counter on an Army you control. It's also an Orc. If you don't control an Army, create a 0/0 black Orc Army creature token first.)
diff --git a/forge-gui/res/cardsfolder/p/part_water.txt b/forge-gui/res/cardsfolder/p/part_water.txt
index 47650da3548..10c4c82cd4c 100644
--- a/forge-gui/res/cardsfolder/p/part_water.txt
+++ b/forge-gui/res/cardsfolder/p/part_water.txt
@@ -4,5 +4,5 @@ Types:Sorcery
 A:SP$ Pump | KW$ Islandwalk | TargetMin$ X | TargetMax$ X | ValidTgts$ Creature | TgtPrompt$ Select X target creatures | StackDescription$ SpellDescription | SpellDescription$ X target creatures gain islandwalk until end of turn. (They can't be blocked as long as defending player controls an Island.)
 SVar:X:Count$xPaid
 AI:RemoveDeck:Random
-DeckHas:Keyword$IslandWalk
+DeckHas:Keyword$Islandwalk
 Oracle:X target creatures gain islandwalk until end of turn. (They can't be blocked as long as defending player controls an Island.)
diff --git a/forge-gui/res/cardsfolder/p/phabine_bosss_confidant.txt b/forge-gui/res/cardsfolder/p/phabine_bosss_confidant.txt
index 513fa3c17bd..a46eb54e2e9 100644
--- a/forge-gui/res/cardsfolder/p/phabine_bosss_confidant.txt
+++ b/forge-gui/res/cardsfolder/p/phabine_bosss_confidant.txt
@@ -12,6 +12,6 @@ SVar:DBDraw:DB$ Draw | Defined$ Player | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Valid Land
 SVar:Y:Remembered$Valid Card.nonLand
-DeckHas:Ability$Token & Type$ Citizen
+DeckHas:Ability$Token & Type$Citizen
 DeckHints:Ability$Token
 Oracle:Creature tokens you control have haste.\nParley — At the beginning of combat on your turn, each player reveals the top card of their library. For each land card revealed this way, you create a 1/1 green and white Citizen creature token. Then creatures you control get +1/+1 until end of turn for each nonland card revealed this way. Then each player draws a card.
diff --git a/forge-gui/res/cardsfolder/p/predation_steward.txt b/forge-gui/res/cardsfolder/p/predation_steward.txt
index abfb8741fa4..f0887311cf5 100644
--- a/forge-gui/res/cardsfolder/p/predation_steward.txt
+++ b/forge-gui/res/cardsfolder/p/predation_steward.txt
@@ -4,5 +4,5 @@ Types:Creature Phyrexian Elf Warrior
 PT:2/2
 K:etbCounter:OIL:2
 A:AB$ Pump | Cost$ 2 G T SubCounter<1/OIL> | ValidTgts$ Creature | SorcerySpeed$ True | NumAtt$ 2 | NumDef$ 2 | SpellDescription$ Target creature gets +2/+2 until end of turn. Activate only as a sorcery.
-DeckHas:Ability$Counter
-Oracle:Predation Steward enters the battlefield with two oil counters on it.\n{2}{G}, {T}, Remove an oil counter from Predation Steward: Target creature gets +2/+2 until end of turn. Activate only as a sorcery.
\ No newline at end of file
+DeckHas:Ability$Counters
+Oracle:Predation Steward enters the battlefield with two oil counters on it.\n{2}{G}, {T}, Remove an oil counter from Predation Steward: Target creature gets +2/+2 until end of turn. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/p/protean_war_engine.txt b/forge-gui/res/cardsfolder/p/protean_war_engine.txt
index 335117cfbea..1c9666a156b 100644
--- a/forge-gui/res/cardsfolder/p/protean_war_engine.txt
+++ b/forge-gui/res/cardsfolder/p/protean_war_engine.txt
@@ -8,5 +8,5 @@ T:Mode$ BecomesCrewed | ValidVehicle$ Card.Self | Execute$ TrigClone | TriggerDe
 SVar:TrigClone:DB$ Clone | Cost$ 3 | Defined$ Remembered | CloneTarget$ Self | AddTypes$ Vehicle | Duration$ UntilEndOfTurn
 K:Crew:3
 SVar:HasAttackingEffect:TRUE
-DeckHas:Type$ Angel|Dragon|Ogre|Warrior|Knight|Elk|Bird|Soldier|Human| & Ability$LifeGain|Token & Keyword$DoubleStrike|Haste|FirstStrike|Flying
-Oracle:As Protean War Engine enters the battlefield, draft a card from Protean War Engine's spellbook and exile it.\nWhenever Protean War Engine becomes crewed, until end of turn, it becomes a copy of the exiled card, except it's a Vehicle artifact in addition to its other types. 
\ No newline at end of file
+DeckHas:Type$Angel|Bird|Dragon|Elk|Human|Ogre|Cleric|Knight|Pirate|Soldier|Warrior & Ability$LifeGain|Token & Keyword$DoubleStrike|Haste|FirstStrike|Flying
+Oracle:As Protean War Engine enters the battlefield, draft a card from Protean War Engine's spellbook and exile it.\nWhenever Protean War Engine becomes crewed, until end of turn, it becomes a copy of the exiled card, except it's a Vehicle artifact in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/r/radagast_the_brown.txt b/forge-gui/res/cardsfolder/r/radagast_the_brown.txt
index f7420ece17d..d8373bb7ba2 100644
--- a/forge-gui/res/cardsfolder/r/radagast_the_brown.txt
+++ b/forge-gui/res/cardsfolder/r/radagast_the_brown.txt
@@ -3,6 +3,6 @@ ManaCost:2 G G
 Types:Legendary Creature Avatar Wizard
 PT:2/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+nonToken,Card.Self | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ Whenever CARDNAME or another nontoken creature enters the battlefield under your control, look at the top X cards of your library, where X is that creature's mana value. You may reveal a creature card from among them that doesn't share a creature type with a creature you control and put it into your hand. Put the rest on the bottom of your library in a random order.
-SVar:TrigDig:DB$ Dig | DigNum$ X | ChangeNum$ 1 | Optional$ True| ForceRevealToController$ True | ChangeValid$ Card.Creature+!sharesCreatureTypeWith Valid Creature.YouCtrl | DestinationZone$ Hand | DestinationZone2$ Library | RestRandomOrder$ True
+SVar:TrigDig:DB$ Dig | DigNum$ X | ChangeNum$ 1 | Optional$ True | ForceRevealToController$ True | ChangeValid$ Card.Creature+!sharesCreatureTypeWith Valid Creature.YouCtrl | DestinationZone$ Hand | DestinationZone2$ Library | RestRandomOrder$ True
 SVar:X:TriggeredCard$CardManaCost
 Oracle:Whenever Radagast the Brown or another nontoken creature enters the battlefield under your control, look at the top X cards of your library, where X is that creature's mana value. You may reveal a creature card from among them that doesn't share a creature type with a creature you control 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/r/raddic_tal_zealot.txt b/forge-gui/res/cardsfolder/r/raddic_tal_zealot.txt
index 1f5585f036a..48616997608 100644
--- a/forge-gui/res/cardsfolder/r/raddic_tal_zealot.txt
+++ b/forge-gui/res/cardsfolder/r/raddic_tal_zealot.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Human Knight
 PT:4/4
 K:Hexproof:Card.White:white
 K:Hexproof:Card.Black:black
-T:Mode$ AttackersDeclared | ValidAttackers$ Knight.YouCtrl |Execute$ TrigDraft | TriggerZones$ Battlefield | TriggerDescription$ Whenever one or more Knights you control attack, draft a card from CARDNAME's spellbook.
+T:Mode$ AttackersDeclared | ValidAttackers$ Knight.YouCtrl | Execute$ TrigDraft | TriggerZones$ Battlefield | TriggerDescription$ Whenever one or more Knights you control attack, draft a card from CARDNAME's spellbook.
 SVar:TrigDraft:DB$ Draft | Spellbook$ Midnight Reaper,Guardian of Faith,Knight of the Ebon Legion,Cavalier of Dawn,Benalish Marshal,Cavalier of Night,Murderous Rider,Order of Midnight,Acclaimed Contender,Dauntless Bodyguard,Valiant Knight,Smitten Swordmaster,Blacklance Paragon,History of Benalia,The Circle of Loyalty
 DeckHints:Type$Knight
 DeckHas:Type$Saga|Enchantment|Vampire|Artifact|Zombie|Elemental & Ability$Graveyard|LifeGain|Token|Counters
diff --git a/forge-gui/res/cardsfolder/r/restless_bivouac.txt b/forge-gui/res/cardsfolder/r/restless_bivouac.txt
index 1263119fdcb..f6dc80847a3 100644
--- a/forge-gui/res/cardsfolder/r/restless_bivouac.txt
+++ b/forge-gui/res/cardsfolder/r/restless_bivouac.txt
@@ -8,4 +8,4 @@ T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ Tr
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1
 DeckHas:Ability$Counters & Type$Ox & Color$Red|White
 SVar:HasAttackEffect:TRUE
-Oracle:Restless Bivouac enters the battlefield tapped.\n{T}: Add {R} or {W}.\n{1}{R}{W}: Restless Bivouac becomes a 2/2 red and white Ox creature until end of turn. It's still a land.\nWhenever Restless Bivouac attacks, put a +1/+1 counter on target creature you control.
\ No newline at end of file
+Oracle:Restless Bivouac enters the battlefield tapped.\n{T}: Add {R} or {W}.\n{1}{R}{W}: Restless Bivouac becomes a 2/2 red and white Ox creature until end of turn. It's still a land.\nWhenever Restless Bivouac attacks, put a +1/+1 counter on target creature you control.
diff --git a/forge-gui/res/cardsfolder/r/restless_prairie.txt b/forge-gui/res/cardsfolder/r/restless_prairie.txt
index 78b3a8264ed..2f51a9fcc7f 100644
--- a/forge-gui/res/cardsfolder/r/restless_prairie.txt
+++ b/forge-gui/res/cardsfolder/r/restless_prairie.txt
@@ -6,6 +6,6 @@ A:AB$ Mana | Cost$ T | Produced$ Combo G W | SpellDescription$ Add {G} or {W}.
 A:AB$ Animate | Cost$ 2 G W | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Llama | Colors$ Green,White | SpellDescription$ CARDNAME becomes a 3/3 green and white Llama creature until end of turn. It's still a land.
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME attacks, other creatures you control get +1/+1 until end of turn.
 SVar:TrigPumpAll:DB$ PumpAll | ValidCards$ Creature.StrictlyOther+YouCtrl | NumAtt$ +1 | NumDef$ +1
-DeckHas:Type$Llama  & Color$Green|White
+DeckHas:Type$Llama & Color$Green|White
 SVar:HasAttackEffect:TRUE
-Oracle:Restless Prairie enters the battlefield tapped.\n{T}: Add {G} or {W}.\n{2}{G}{W}: Restless Prairie becomes a 3/3 green and white Llama creature until end of turn. It's still a land.\nWhenever Restless Prairie attacks, other creatures you control get +1/+1 until end of turn.
\ No newline at end of file
+Oracle:Restless Prairie enters the battlefield tapped.\n{T}: Add {G} or {W}.\n{2}{G}{W}: Restless Prairie becomes a 3/3 green and white Llama creature until end of turn. It's still a land.\nWhenever Restless Prairie attacks, other creatures you control get +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/r/restless_reef.txt b/forge-gui/res/cardsfolder/r/restless_reef.txt
index b3510400de2..11493fd4f91 100644
--- a/forge-gui/res/cardsfolder/r/restless_reef.txt
+++ b/forge-gui/res/cardsfolder/r/restless_reef.txt
@@ -8,4 +8,4 @@ T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ Tr
 SVar:TrigMill:DB$ Mill | NumCards$ 4 | ValidTgts$ Player
 DeckHas:Ability$Mill|Graveyard & Type$Shark & Color$Blue|Black
 SVar:HasAttackEffect:TRUE
-Oracle:Restless Reef enters the battlefield tapped.\n{T}: Add {U} or {B}.\n{2}{U}{B}: Restless Reef becomes a 4/4 blue and black Shark creature with deathtouch until end of turn. It's still a land.\nWhenever Restless Reef attacks, target player mills 4 cards.
\ No newline at end of file
+Oracle:Restless Reef enters the battlefield tapped.\n{T}: Add {U} or {B}.\n{2}{U}{B}: Restless Reef becomes a 4/4 blue and black Shark creature with deathtouch until end of turn. It's still a land.\nWhenever Restless Reef attacks, target player mills 4 cards.
diff --git a/forge-gui/res/cardsfolder/r/restless_ridgeline.txt b/forge-gui/res/cardsfolder/r/restless_ridgeline.txt
index 0e800dc91ec..b0bff0233ce 100644
--- a/forge-gui/res/cardsfolder/r/restless_ridgeline.txt
+++ b/forge-gui/res/cardsfolder/r/restless_ridgeline.txt
@@ -7,6 +7,6 @@ A:AB$ Animate | Cost$ 2 R G | Defined$ Self | Power$ 3 | Toughness$ 4 | Types$ C
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, another target attacking creature gets +2/+0 until end of turn. Untap that creature.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.attacking+Other | TgtPrompt$ Select another target attacking creature | NumAtt$ +2 | SubAbility$ DBUntap
 SVar:DBUntap:DB$ Untap | Defined$ Targeted
-DeckHas:Type$Dinosaur  & Color$Red|Green
+DeckHas:Type$Dinosaur & Color$Red|Green
 SVar:HasAttackEffect:TRUE
-Oracle:Restless Ridgeline enters the battlefield tapped.\n{T}: Add {R} or {G}.\n{2}{R}{G}: Restless Ridgeline becomes a 3/4 red and green Dinosaur creature until end of turn. It's still a land.\nWhenever Restless Ridgeline attacks, another target attacking creature gets +2/+0 until end of turn. Untap that creature.
\ No newline at end of file
+Oracle:Restless Ridgeline enters the battlefield tapped.\n{T}: Add {R} or {G}.\n{2}{R}{G}: Restless Ridgeline becomes a 3/4 red and green Dinosaur creature until end of turn. It's still a land.\nWhenever Restless Ridgeline attacks, another target attacking creature gets +2/+0 until end of turn. Untap that creature.
diff --git a/forge-gui/res/cardsfolder/r/restless_vents.txt b/forge-gui/res/cardsfolder/r/restless_vents.txt
index c0c17b5af56..413ad25b293 100644
--- a/forge-gui/res/cardsfolder/r/restless_vents.txt
+++ b/forge-gui/res/cardsfolder/r/restless_vents.txt
@@ -8,4 +8,4 @@ T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ Tr
 SVar:TrigLoot:AB$ Draw | Cost$ Discard<1/Card>
 DeckHas:Ability$Discard & Type$Insect & Color$Black|Red
 SVar:HasAttackEffect:TRUE
-Oracle:Restless Vents enters the battlefield tapped.\n{T}: Add {B} or {R}.\n{1}{B}{R}: Until end of turn, Restless Vents becomes a 2/3 black and red Insect creature with menace. It's still a land.\nWhenever Restless Vents attacks, you may discard a card. If you do, draw a card.
\ No newline at end of file
+Oracle:Restless Vents enters the battlefield tapped.\n{T}: Add {B} or {R}.\n{1}{B}{R}: Until end of turn, Restless Vents becomes a 2/3 black and red Insect creature with menace. It's still a land.\nWhenever Restless Vents attacks, you may discard a card. If you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/r/restless_vinestalk.txt b/forge-gui/res/cardsfolder/r/restless_vinestalk.txt
index 95f04e3aa2b..ac5251f1044 100644
--- a/forge-gui/res/cardsfolder/r/restless_vinestalk.txt
+++ b/forge-gui/res/cardsfolder/r/restless_vinestalk.txt
@@ -6,6 +6,6 @@ A:AB$ Mana | Cost$ T | Produced$ Combo G U | SpellDescription$ Add {G} or {U}.
 A:AB$ Animate | Cost$ 3 G U | Defined$ Self | Power$ 5 | Toughness$ 5 | Types$ Creature,Plant | Keywords$ Trample | Colors$ Green,Blue | SpellDescription$ Until end of turn, CARDNAME becomes a 5/5 green and blue Plant creature with trample. It's still a land.
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ Whenever CARDNAME attacks, up to one other target creature has base power and toughness 3/3 until end of turn.
 SVar:TrigAnimate:DB$ Animate | ValidTgts$ Creature.Other | TgtPrompt$ Select up to one target other creature | Power$ 3 | Toughness$ 3 | TargetMin$ 0 | TargetMax$ 1
-DeckHas:Type$Plant  & Color$Green|Blue
+DeckHas:Type$Plant & Color$Green|Blue
 SVar:HasAttackEffect:TRUE
 Oracle:Restless Vinestalk enters the battlefield tapped.\n{T}: Add {G} or {U}.\n{3}{G}{U}:Until end of turn, Restless Vinestalk becomes a 5/5 green and blue Plant creature with trample. It's still a land.\nWhenever Restless Vinestalk attacks, up to one other target creature has base power and toughness 3/3 until end of turn.
diff --git a/forge-gui/res/cardsfolder/r/riders_of_rohan.txt b/forge-gui/res/cardsfolder/r/riders_of_rohan.txt
index 9f65825bf08..2458ba2849c 100644
--- a/forge-gui/res/cardsfolder/r/riders_of_rohan.txt
+++ b/forge-gui/res/cardsfolder/r/riders_of_rohan.txt
@@ -2,8 +2,8 @@ Name:Riders of Rohan
 ManaCost:3 R W
 Types:Creature Human Knight
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken| TriggerDescription$ When CARDNAME enters the battlefield, create two 2/2 red Human Knight creature tokens with trample and haste.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 2/2 red Human Knight creature tokens with trample and haste.
 SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ r_2_2_human_knight_trample_haste | TokenOwner$ You
 K:Dash:4 R W
 DeckHas:Ability$Token
-Oracle:When Riders of Rohan enters the battlefield, create two 2/2 red Human Knight creature tokens with trample and haste.\nDash {4}{R}{W} (You may cast this spell for its dash cost. If you do, it gains haste, and it's returned from the battlefield to its owner's hand at the beginning of the next end step.)
\ No newline at end of file
+Oracle:When Riders of Rohan enters the battlefield, create two 2/2 red Human Knight creature tokens with trample and haste.\nDash {4}{R}{W} (You may cast this spell for its dash cost. If you do, it gains haste, and it's returned from the battlefield to its owner's hand at the beginning of the next end step.)
diff --git a/forge-gui/res/cardsfolder/r/rise_of_the_eldrazi.txt b/forge-gui/res/cardsfolder/r/rise_of_the_eldrazi.txt
index 5aba990f68e..3b119fd6705 100644
--- a/forge-gui/res/cardsfolder/r/rise_of_the_eldrazi.txt
+++ b/forge-gui/res/cardsfolder/r/rise_of_the_eldrazi.txt
@@ -2,8 +2,8 @@ Name:Rise of the Eldrazi
 ManaCost:9 C C C
 Types:Sorcery
 R:Event$ Counter | ValidCard$ Card.Self | ValidSA$ Spell | Layer$ CantHappen | Description$ This spell can't be countered.
-A:SP$ Destroy | ValidTgts$ Permanent| SubAbility$ DBDraw | SpellDescription$ Destroy target permanent.
+A:SP$ Destroy | ValidTgts$ Permanent | SubAbility$ DBDraw | SpellDescription$ Destroy target permanent.
 SVar:DBDraw:DB$ Draw | NumCards$ 4 | ValidTgts$ Player | TgtPrompt$ Select target player | SubAbility$ DBExtraTurn | SpellDescription$ Target player draws four cards.
 SVar:DBExtraTurn: DB$ AddTurn | Defined$ You | NumTurns$ 1 | SubAbility$ DBChange | SpellDescription$ Take an extra turn after this one.
 SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | SpellDescription$ Exile CARDNAME
-Oracle:This spell can't be countered.\nDestroy target permanent. Target player draws four cards. Take an extra turn after this one.\nExile Rise of the Eldrazi.
\ No newline at end of file
+Oracle:This spell can't be countered.\nDestroy target permanent. Target player draws four cards. Take an extra turn after this one.\nExile Rise of the Eldrazi.
diff --git a/forge-gui/res/cardsfolder/r/rosnakht_heir_of_rohgahh.txt b/forge-gui/res/cardsfolder/r/rosnakht_heir_of_rohgahh.txt
index 966e4d6a493..775995b875d 100644
--- a/forge-gui/res/cardsfolder/r/rosnakht_heir_of_rohgahh.txt
+++ b/forge-gui/res/cardsfolder/r/rosnakht_heir_of_rohgahh.txt
@@ -3,7 +3,7 @@ ManaCost:R
 Types:Legendary Creature Kobold Warrior
 PT:0/1
 K:Battle cry
-T:Mode$ SpellCast | ValidActivatingPlayer$ You | TargetsValid$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken| TriggerDescription$ Heroic — Whenever you cast a spell that targets CARDNAME, create a 0/1 red Kobold creature token named Kobolds of Kher Keep.
+T:Mode$ SpellCast | ValidActivatingPlayer$ You | TargetsValid$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Heroic — Whenever you cast a spell that targets CARDNAME, create a 0/1 red Kobold creature token named Kobolds of Kher Keep.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenOwner$ You | TokenScript$ kobolds_of_kher_keep
 DeckHas:Ability$Token
 Oracle:Battle cry (Whenever this creature attacks, each other attacking creature gets +1/+0 until end of turn.)\nHeroic — Whenever you cast a spell that targets Rosnakht, Heir of Rohgahh, create a 0/1 red Kobold creature token named Kobolds of Kher Keep.
diff --git a/forge-gui/res/cardsfolder/rebalanced/a-karn_living_legacy.txt b/forge-gui/res/cardsfolder/rebalanced/a-karn_living_legacy.txt
index 2ac5166c569..0af8e507bdb 100644
--- a/forge-gui/res/cardsfolder/rebalanced/a-karn_living_legacy.txt
+++ b/forge-gui/res/cardsfolder/rebalanced/a-karn_living_legacy.txt
@@ -8,7 +8,7 @@ SVar:DBDig:DB$ Dig | DigNum$ X | ChangeNum$ 1 | RestRandomOrder$ True | UnlessCo
 A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | AILogic$ Always | Stackable$ False | Name$ Emblem - Karn, Living Legacy | Image$ emblem_karn_living_legacy | Duration$ Permanent | Abilities$ KarnPing | SpellDescription$ You get an emblem with "Tap an untapped artifact you control: This emblem deals 1 damage to any target."
 SVar:KarnPing:AB$ DealDamage | Cost$ tapXType<1/Artifact> | ActivationZone$ Command | ValidTgts$ Any | NumDmg$ 1
 SVar:PlayMain1:TRUE
-DeckHas:Ability$Token & Type|Artifact
+DeckHas:Ability$Token & Type$Artifact
 DeckNeeds:Type$Artifact
 SVar:X:Count$ChosenNumber
 Oracle:[+1]: Create a tapped Powerstone token.\n[0]: Pay any amount of mana. Look at that many cards from the top of your library, then put one of those cards into your hand and the rest on the bottom of your library in a random order.\n[−6]: You get an emblem with "Tap an untapped artifact you control: This emblem deals 1 damage to any target."
diff --git a/forge-gui/res/cardsfolder/s/samwise_gamgee.txt b/forge-gui/res/cardsfolder/s/samwise_gamgee.txt
index 0dfd0e2bf17..1d8dd17caa0 100644
--- a/forge-gui/res/cardsfolder/s/samwise_gamgee.txt
+++ b/forge-gui/res/cardsfolder/s/samwise_gamgee.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Halfling Citizen
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken+YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigFood | TriggerDescription$ Whenever another nontoken creature enters the battlefield under your control, create a Food token. (It's an artifact with "{2}, Sacrifice this artifact: You gain 3 life.")
 SVar:TrigFood:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_food_sac | TokenOwner$ You
-A:AB$ ChangeZone | Cost$ Sac<3/Food> | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Permanent.Historic+YouOwn |TgtPrompt$ Select target historic permanent in your graveyard | SpellDescription$ Return target historic card from your graveyard to your hand. (Artifacts, legendaries, and Sagas are historic.)
+A:AB$ ChangeZone | Cost$ Sac<3/Food> | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Permanent.Historic+YouOwn | TgtPrompt$ Select target historic permanent in your graveyard | SpellDescription$ Return target historic card from your graveyard to your hand. (Artifacts, legendaries, and Sagas are historic.)
 DeckHas:Ability$Sacrifice|Token & Type$Food
 DeckHints:Type$Food
-Oracle:Whenever another nontoken creature enters the battlefield under your control, create a Food token. (It's an artifact with "{2}, Sacrifice this artifact: You gain 3 life.")\nSacrifice three Foods: Return target historic card from your graveyard to your hand. (Artifacts, legendaries, and Sagas are historic.)
\ No newline at end of file
+Oracle:Whenever another nontoken creature enters the battlefield under your control, create a Food token. (It's an artifact with "{2}, Sacrifice this artifact: You gain 3 life.")\nSacrifice three Foods: Return target historic card from your graveyard to your hand. (Artifacts, legendaries, and Sagas are historic.)
diff --git a/forge-gui/res/cardsfolder/s/sontaran_general.txt b/forge-gui/res/cardsfolder/s/sontaran_general.txt
index fae1aa26500..524fd6b20e6 100644
--- a/forge-gui/res/cardsfolder/s/sontaran_general.txt
+++ b/forge-gui/res/cardsfolder/s/sontaran_general.txt
@@ -5,9 +5,9 @@ PT:5/5
 K:Trample
 K:Haste
 T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | IsPresent$ Creature.attacking+Other | NoResolvingCheck$ True | PresentCompare$ GE2 | Execute$ TrigGoad | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, for each opponent, goad up to one target creature that player controls. Those creatures can't block this turn. (Until your next turn, they attack each combat if able and attack a player other than you if able.)
-SVar:TrigGoad:DB$ Goad |ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select up to one target creature that opponent controls | TargetMin$ 0 | TargetMax$ OneEach | TargetsWithDifferentControllers$ True | SubAbility$ DBNoBlock
+SVar:TrigGoad:DB$ Goad | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select up to one target creature that opponent controls | TargetMin$ 0 | TargetMax$ OneEach | TargetsWithDifferentControllers$ True | SubAbility$ DBNoBlock
 SVar:DBNoBlock:DB$ Effect | RememberObjects$ Targeted | ForgetOnMoved$ Battlefield | StaticAbilities$ CantBlock
 SVar:CantBlock:Mode$ CantBlockBy | ValidBlocker$ Creature.IsRemembered | Description$ Those creatures can't block this turn.
 SVar:OneEach:PlayerCountOpponents$Amount
 SVar:HasAttackEffect:TRUE
-Oracle:Trample, haste\nBattalion — Whenever Sontaran General and at least two other creatures attack, for each opponent, goad up to one target creature that player controls. Those creatures can't block this turn. (Until your next turn, they attack each combat if able and attack a player other than you if able.)
\ No newline at end of file
+Oracle:Trample, haste\nBattalion — Whenever Sontaran General and at least two other creatures attack, for each opponent, goad up to one target creature that player controls. Those creatures can't block this turn. (Until your next turn, they attack each combat if able and attack a player other than you if able.)
diff --git a/forge-gui/res/cardsfolder/s/syr_ginger_the_meal_ender.txt b/forge-gui/res/cardsfolder/s/syr_ginger_the_meal_ender.txt
index 0a25d16c462..1b803e0db92 100644
--- a/forge-gui/res/cardsfolder/s/syr_ginger_the_meal_ender.txt
+++ b/forge-gui/res/cardsfolder/s/syr_ginger_the_meal_ender.txt
@@ -8,6 +8,6 @@ SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | Counter
 SVar:DBScry:DB$ Scry | ScryNum$ 1
 A:AB$ GainLife | Cost$ 2 Sac<1/NICKNAME> | LifeAmount$ X | SpellDescription$ You gain life equal to its power.
 SVar:X:Sacrificed$CardPower
-Ability$Sacrifice|Counters
+DeckHas:Ability$Sacrifice|Counters
 DeckHints:Type$Artifact
 Oracle:Syr Ginger, the Meal Ender has trample, hexproof, and haste as long as an opponent controls a planeswalker.\nWhenever another artifact you control is put into a graveyard from the battlefield, put a +1/+1 counter on Syr Ginger and scry 1.\n{2}, {T}, Sacrifice Syr Ginger: You gain life equal to its power.
diff --git a/forge-gui/res/cardsfolder/t/the_mana_rig.txt b/forge-gui/res/cardsfolder/t/the_mana_rig.txt
index 3690970d80a..ac6c8c8dca4 100644
--- a/forge-gui/res/cardsfolder/t/the_mana_rig.txt
+++ b/forge-gui/res/cardsfolder/t/the_mana_rig.txt
@@ -5,5 +5,5 @@ T:Mode$ SpellCast | ValidCard$ Card.MultiColor | ValidActivatingPlayer$ You | Tr
 SVar:TrigPowerStone:DB$ Token | TokenAmount$ 1 | TokenTapped$ True | TokenScript$ c_a_powerstone | TokenOwner$ You
 A:AB$ Dig | Cost$ T X X X | DigNum$ X | ChangeNum$ 2 | RestRandomOrder$ True | Optional$ True | SpellDescription$ Look at the top X cards of your library. Put up to two of them into your hand and the rest on the bottom of your library in a random order.
 SVar:X:Count$xPaid
-DeckHas:Ability$Token & Type|Artifact
+DeckHas:Ability$Token & Type$Artifact
 Oracle:Whenever you cast a multicolored spell, create a tapped Powerstone token. (It's an artifact with "{T}: Add {C}. This mana can't be spent to cast a nonartifact spell.")\n{X}{X}{X}, {T}:Look at the top X cards of your library. Put up to two of them into your hand and the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/t/the_night_of_the_doctor.txt b/forge-gui/res/cardsfolder/t/the_night_of_the_doctor.txt
index 248e1a068a4..3998e07cf15 100644
--- a/forge-gui/res/cardsfolder/t/the_night_of_the_doctor.txt
+++ b/forge-gui/res/cardsfolder/t/the_night_of_the_doctor.txt
@@ -4,6 +4,6 @@ Types:Enchantment Saga
 K:Chapter:2:DBDestroyAll,DBChangeZone
 SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature | SpellDescription$ Destroy all creatures.
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.Legendary+YouCtrl | TgtPrompt$ Choose target legendary creature card in your graveyard | SubAbility$ DBPutCounter | RememberChanged$ True | SpellDescription$ Return target legendary creature card from your graveyard to the battlefield. Put your choice of a first strike, vigilance, or lifelink counter on it.
-SVar:DBPutCounter:DB$ PutCounter | Choices$ Creature.IsRemembered | CounterType$ First Strike,Vigilance,Lifelink | CounterNum$ 1| SubAbility$ DBCleanup
+SVar:DBPutCounter:DB$ PutCounter | Choices$ Creature.IsRemembered | CounterType$ First Strike,Vigilance,Lifelink | CounterNum$ 1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after II.)\nI — Destroy all creatures.\nII — Return target legendary creature card from your graveyard to the battlefield. Put your choice of a first strike, vigilance, or lifelink counter on it.
diff --git a/forge-gui/res/cardsfolder/t/thunderblade_charge.txt b/forge-gui/res/cardsfolder/t/thunderblade_charge.txt
index b6a3319d5d9..56a61f5165e 100644
--- a/forge-gui/res/cardsfolder/t/thunderblade_charge.txt
+++ b/forge-gui/res/cardsfolder/t/thunderblade_charge.txt
@@ -2,6 +2,6 @@ Name:Thunderblade Charge
 ManaCost:1 R R
 Types:Sorcery
 A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Any | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to any target.
-T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | TriggerZones$ Graveyard | PresentZone$ Graveyard | IsPresent$ Card.StrictlySelf| Execute$ TrigPlay | TriggerDescription$ Whenever one or more creatures you control deal combat damage to a player, if CARDNAME is in your graveyard, you may pay {2}{R}{R}{R}. If you do, you may cast it without paying its mana cost.
+T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | TriggerZones$ Graveyard | PresentZone$ Graveyard | IsPresent$ Card.StrictlySelf | Execute$ TrigPlay | TriggerDescription$ Whenever one or more creatures you control deal combat damage to a player, if CARDNAME is in your graveyard, you may pay {2}{R}{R}{R}. If you do, you may cast it without paying its mana cost.
 SVar:TrigPlay:AB$ Play | Cost$ 2 R R R | WithoutManaCost$ True | Optional$ True
 Oracle:Thunderblade Charge deals 3 damage to any target.\nWhenever one or more creatures you control deal combat damage to a player, if Thunderblade Charge is in your graveyard, you may pay {2}{R}{R}{R}. If you do, you may cast it without paying its mana cost.
diff --git a/forge-gui/res/cardsfolder/t/tinkers_tote.txt b/forge-gui/res/cardsfolder/t/tinkers_tote.txt
index 04115fb346a..18d71719e81 100644
--- a/forge-gui/res/cardsfolder/t/tinkers_tote.txt
+++ b/forge-gui/res/cardsfolder/t/tinkers_tote.txt
@@ -1,7 +1,7 @@
 Name:Tinker's Tote
 ManaCost:2 W
 Types:Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken| TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 colorless Gnome artifact creature tokens.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 1/1 colorless Gnome artifact creature tokens.
 SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_1_1_a_gnome | TokenOwner$ You
 A:AB$ GainLife | Cost$ W Sac<1/CARDNAME> | LifeAmount$ 3 | SpellDescription$ You gain 3 life.
 Oracle:When Tinker's Tote enters the battlefield, create two 1/1 colorless Gnome artifact creature tokens.\n{W}, Sacrifice Tinker's Tote: You gain 3 life.
diff --git a/forge-gui/res/cardsfolder/t/titanias_command.txt b/forge-gui/res/cardsfolder/t/titanias_command.txt
index bdf6aeb9792..07f8d27692a 100644
--- a/forge-gui/res/cardsfolder/t/titanias_command.txt
+++ b/forge-gui/res/cardsfolder/t/titanias_command.txt
@@ -9,5 +9,5 @@ SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Chan
 SVar:DBToken:DB$ Token | TokenScript$ g_2_2_bear | TokenAmount$ 2 | SpellDescription$ Create two 2/2 green Bear creature tokens.
 SVar:DBCounter:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on each creature you control.
 SVar:X:Remembered$Amount
-DeckHas:Ability$Token|Counter|LifeGain & Type$Bear
+DeckHas:Ability$Token|Counters|LifeGain & Type$Bear
 Oracle:Choose two —\n• Exile target player's graveyard. You gain 1 life for each card exiled this way.\n• Search your library for up to two land cards, put them onto the battlefield tapped, then shuffle.\n• Create two 2/2 green Bear creature tokens.\n• Put two +1/+1 counters on each creature you control.
diff --git a/forge-gui/res/cardsfolder/t/twisted_fealty.txt b/forge-gui/res/cardsfolder/t/twisted_fealty.txt
index 1fa1597081d..bdd2d6c470f 100644
--- a/forge-gui/res/cardsfolder/t/twisted_fealty.txt
+++ b/forge-gui/res/cardsfolder/t/twisted_fealty.txt
@@ -1,7 +1,7 @@
 Name:Twisted Fealty
 ManaCost:2 R
 Types:Sorcery
-A:SP$ GainControl |ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SubAbility$ DBToken | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
+A:SP$ GainControl | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SubAbility$ DBToken | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ role_wicked | TokenOwner$ You | AttachedTo$ ThisTargetedCard | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | SpellDescription$ Create a Wicked Role token attached to up to one target creature. (If you control another Role on it, put that one into the graveyard. Enchanted creature gets +1/+1. When this Aura is put into a graveyard, each opponent loses 1 life.)
 DeckHas:Ability$Token & Type$Aura|Enchantment|Role
 Oracle:Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.\nCreate a Wicked Role token attached to up to one target creature. (If you control another Role on it, put that one into the graveyard. Enchanted creature gets +1/+1. When this Aura is put into a graveyard, each opponent loses 1 life.)
diff --git a/forge-gui/res/cardsfolder/t/tyranid_prime.txt b/forge-gui/res/cardsfolder/t/tyranid_prime.txt
index f4debafb040..c32d6029330 100644
--- a/forge-gui/res/cardsfolder/t/tyranid_prime.txt
+++ b/forge-gui/res/cardsfolder/t/tyranid_prime.txt
@@ -4,5 +4,5 @@ Types:Creature Tyranid
 PT:0/4
 K:Evolve
 S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddKeyword$ Evolve | Description$ Synapse Creature — Other creatures you control have evolve.
-DeckHas:Ability$Counter & Keyword$Evolve
-Oracle:Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)\nSynapse Creature — Other creatures you control have evolve.
\ No newline at end of file
+DeckHas:Ability$Counters & Keyword$Evolve
+Oracle:Evolve (Whenever a creature enters the battlefield under your control, if that creature has greater power or toughness than this creature, put a +1/+1 counter on this creature.)\nSynapse Creature — Other creatures you control have evolve.
diff --git a/forge-gui/res/cardsfolder/u/uncivil_arrest.txt b/forge-gui/res/cardsfolder/u/uncivil_unrest.txt
similarity index 99%
rename from forge-gui/res/cardsfolder/u/uncivil_arrest.txt
rename to forge-gui/res/cardsfolder/u/uncivil_unrest.txt
index a2fe04597a1..d5430750ec8 100644
--- a/forge-gui/res/cardsfolder/u/uncivil_arrest.txt
+++ b/forge-gui/res/cardsfolder/u/uncivil_unrest.txt
@@ -8,4 +8,4 @@ SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:PlayMain1:TRUE
 DeckHas:Ability$Counters
 DeckNeeds:Ability$Counters
-Oracle:Nontoken creatures you control have riot. (They enter the battlefield with your choice of a +1/+1 counter or haste.)\nIf a creature you control with a +1/+1 counter on it would deal damage to a permanent or player, it deals double that damage instead.
\ No newline at end of file
+Oracle:Nontoken creatures you control have riot. (They enter the battlefield with your choice of a +1/+1 counter or haste.)\nIf a creature you control with a +1/+1 counter on it would deal damage to a permanent or player, it deals double that damage instead.
diff --git a/forge-gui/res/cardsfolder/u/urborg_scavengers.txt b/forge-gui/res/cardsfolder/u/urborg_scavengers.txt
index 81d19e2b525..36688dbc583 100644
--- a/forge-gui/res/cardsfolder/u/urborg_scavengers.txt
+++ b/forge-gui/res/cardsfolder/u/urborg_scavengers.txt
@@ -7,6 +7,6 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | Secondary$ True |
 SVar:TrigExile:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card | ChangeNum$ 1 | SelectPrompt$ Select a card from a graveyard | Mandatory$ True | Hidden$ True | SubAbility$ DBCounter
 SVar:DBCounter:DB$ PutCounter | Defined$ Self | CounterNum$ 1 | CounterType$ P1P1
 S:Mode$ Continuous | EffectZone$ Battlefield | Affected$ Card.Self | SharedKeywordsZone$ Exile | SharedRestrictions$ Card.ExiledWithSource | AddKeyword$ Flying & First Strike & Double Strike & Deathtouch & Haste & Hexproof & Indestructible & Lifelink & Menace & Reach & Trample & Vigilance | Description$ CARDNAME has flying as long as a card exiled with it has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, reach, trample, and vigilance.
-DeckHas:AbilityGraveyard|Counters
+DeckHas:Ability$Graveyard|Counters
 SVar:HasAttackEffect:TRUE
 Oracle:Whenever Urborg Scavengers enters the battlefield or attacks, exile target card from a graveyard. Put a +1/+1 counter on Urborg Scavengers.\nUrborg Scavengers has flying as long as a card exiled with it has flying. The same is true for first strike, double strike, deathtouch, haste, hexproof, indestructible, lifelink, menace, reach, trample, and vigilance.
diff --git a/forge-gui/res/cardsfolder/upcoming/break_out.txt b/forge-gui/res/cardsfolder/upcoming/break_out.txt
new file mode 100644
index 00000000000..20784c148d6
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/break_out.txt
@@ -0,0 +1,11 @@
+Name:Break Out
+ManaCost:R G
+Types:Sorcery
+A:SP$ PeekAndReveal | Defined$ You | PeekAmount$ 6 | NoReveal$ True | RememberPeeked$ True | SubAbility$ PickOne | StackDescription$ SpellDescription | SpellDescription$ Look at the top six cards of your library. You may reveal a creature card from among them. If that card has mana value 2 or less, you may put it onto the battlefield and it gains haste until end of turn. If you didn’t put the revealed card onto the battlefield this way, put it into your hand. Put the rest on the bottom of your library in a random order.
+SVar:PickOne:DB$ ChooseCard | Defined$ You | Amount$ 1 | ChoiceTitle$ Choose a creature card to reveal | Choices$ Card.Creature+IsRemembered | ChoiceZone$ Library | Reveal$ True | SubAbility$ DBChangeZoneBattlefield
+SVar:DBChangeZoneBattlefield:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Defined$ ChosenCard | ConditionDefined$ Remembered | ConditionPresent$ Card.Creature+cmcLE2+ChosenCard | ConditionCompare$ EQ1 | Optional$ True | Imprint$ True | SubAbility$ DBPump | StackDescription$ None
+SVar:DBPump:DB$ Pump | KW$ Haste | Defined$ Imprinted | ConditionDefined$ Remembered | ConditionPresent$ Creature.IsImprinted+inZoneBattlefield | ConditionCompare$ EQ1 | SubAbility$ DBChangeZoneHand | StackDescription$ None
+SVar:DBChangeZoneHand:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Library | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Card.Creature+ChosenCard+inZoneBattlefield | ConditionCompare$ EQ0 | SubAbility$ DBRestRandomOrder | StackDescription$ None
+SVar:DBRestRandomOrder:DB$ ChangeZoneAll | ChangeType$ Card.IsRemembered | Origin$ Library | Destination$ Library | LibraryPosition$ -1 | RandomOrder$ True | SubAbility$ DBCleanup | StackDescription$ None
+SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True | ClearChosenCard$ True | ClearRemembered$ True
+Oracle:Look at the top six cards of your library. You may reveal a creature card from among them. If that card has mana value 2 or less, you may put it onto the battlefield and it gains haste until end of turn. If you didn’t put the revealed card onto the battlefield this way, 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/upcoming/sludge_titan.txt b/forge-gui/res/cardsfolder/upcoming/sludge_titan.txt
new file mode 100644
index 00000000000..0b3792d465c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sludge_titan.txt
@@ -0,0 +1,13 @@
+Name:Sludge Titan
+ManaCost:4 BG BG
+Types:Creature Zombie Giant
+PT:6/6
+K:Trample
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, mill five cards. You may put a creature card and/or a land card from among them into your hand.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, mill five cards. You may put a creature card and/or a land card from among them into your hand.
+SVar:TrigMill:DB$ Mill | NumCards$ 5 | Defined$ You | RememberMilled$ True | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Hidden$ True | Origin$ Graveyard,Exile | Destination$ Hand | ChangeType$ EACH Creature.YouOwn+IsRemembered & Land.YouOwn+IsRemembered | Optional$ True | SelectPrompt$ You may select a creature card and/or a land card. | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Mill
+Oracle:Trample\nWhenever Sludge Titan enters the battlefield or attacks, mill five cards. You may put a creature card and/or a land card from among them into your hand.
diff --git a/forge-gui/res/cardsfolder/upcoming/sophia_dogged_detective.txt b/forge-gui/res/cardsfolder/upcoming/sophia_dogged_detective.txt
new file mode 100644
index 00000000000..6566e329b26
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/sophia_dogged_detective.txt
@@ -0,0 +1,14 @@
+Name:Sophia, Dogged Detective
+ManaCost:1 G W U
+Types:Legendary Creature Human Detective
+PT:3/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTokenTiny | TriggerDescription$ When CARDNAME enters the battlefield, create Tiny, a legendary 2/2 green Dog Detective creature token with trample.
+SVar:TrigTokenTiny:DB$ Token | TokenAmount$ 1 | TokenScript$ tiny | TokenOwner$ You
+A:AB$ PutCounterAll | Cost$ 1 Sac<1/Artifact.token/artifact token> | ValidCards$ Dog.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | AILogic$ AtEOTOrBlock | SpellDescription$ Put a +1/+1 counter on each Dog you control.
+T:Mode$ DamageDone | ValidSource$ Dog.YouCtrl | Execute$ TrigTokenFoodClue | CombatDamage$ True | ValidTarget$ Player | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Dog you control deals combat damage to a player, create a Food token, then investigate.
+SVar:TrigTokenFoodClue:DB$ Token | TokenScript$ c_a_food_sac | SubAbility$ DBInvestigate
+SVar:DBInvestigate:DB$ Investigate
+DeckNeeds:Ability$Token
+DeckHints:Ability$Food
+DeckHas:Ability$Investigate|Token|Sacrifice|LifeGain|Food
+Oracle:When Sophia, Dogged Detective enters the battlefield, create Tiny, a legendary 2/2 green Dog Detective creature token with trample.\n{1}, Sacrifice an artifact token: Put a +1/+1 counter on each Dog you control.\nWhenever a Dog you control deals combat damage to a player, create a Food token, then investigate.
diff --git a/forge-gui/res/cardsfolder/v/vantress_transmuter.txt b/forge-gui/res/cardsfolder/v/vantress_transmuter.txt
index fc23f673396..6da99393f2e 100644
--- a/forge-gui/res/cardsfolder/v/vantress_transmuter.txt
+++ b/forge-gui/res/cardsfolder/v/vantress_transmuter.txt
@@ -11,6 +11,6 @@ ALTERNATE
 Name:Croaking Curse
 ManaCost:1 U
 Types:Sorcery Adventure
-A:SP$ Tap |ValidTgts$ Creature | SubAbility$ DBToken | SpellDescription$ Tap target creature. Create a Cursed Role token attached to it. (Enchanted creature is 1/1.)
+A:SP$ Tap | ValidTgts$ Creature | SubAbility$ DBToken | SpellDescription$ Tap target creature. Create a Cursed Role token attached to it. (Enchanted creature is 1/1.)
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ role_cursed | TokenOwner$ You | AttachedTo$ Targeted
-Oracle:Tap target creature. Create a Cursed Role token attached to it. (Enchanted creature is 1/1.)
\ No newline at end of file
+Oracle:Tap target creature. Create a Cursed Role token attached to it. (Enchanted creature is 1/1.)
diff --git a/forge-gui/res/cardsfolder/w/warehouse_thief.txt b/forge-gui/res/cardsfolder/w/warehouse_thief.txt
index 77a261554df..9d7b26c0078 100644
--- a/forge-gui/res/cardsfolder/w/warehouse_thief.txt
+++ b/forge-gui/res/cardsfolder/w/warehouse_thief.txt
@@ -2,7 +2,7 @@ Name:Warehouse Thief
 ManaCost:3 R
 Types:Creature Tiefling Rogue
 PT:4/2
-A:AB$ Dig | Cost$ 2 T Sac<1/Artifact;Creature/artifact or creature> | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect| SpellDescription$ Exile the top card of your library. Until the end of your next turn, you may play that card.
+A:AB$ Dig | Cost$ 2 T Sac<1/Artifact;Creature/artifact or creature> | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ Exile the top card of your library. Until the end of your next turn, you may play that card.
 SVar:DBEffect:DB$ Effect | StaticAbilities$ StaticMayPlay | Duration$ UntilTheEndOfYourNextTurn | RememberObjects$ Remembered | ForgetOnMoved$ Exile | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:StaticMayPlay:Mode$ Continuous | Affected$ Card.IsRemembered | EffectZone$ Command | AffectedZone$ Exile | MayPlay$ True | Description$ Until the end of your next turn, you may play that card.
diff --git a/forge-gui/res/tokenscripts/tiny.txt b/forge-gui/res/tokenscripts/tiny.txt
new file mode 100644
index 00000000000..d808af79f72
--- /dev/null
+++ b/forge-gui/res/tokenscripts/tiny.txt
@@ -0,0 +1,7 @@
+Name:Tiny
+ManaCost:no cost
+Types:Legendary Creature Dog Detective
+Colors:green
+PT:2/2
+K:Trample
+Oracle:Trample