diff --git a/forge-gui/res/cardsfolder/a/all_is_dust.txt b/forge-gui/res/cardsfolder/a/all_is_dust.txt
index edb50eeac77..dd772d25743 100644
--- a/forge-gui/res/cardsfolder/a/all_is_dust.txt
+++ b/forge-gui/res/cardsfolder/a/all_is_dust.txt
@@ -1,5 +1,5 @@
 Name:All Is Dust
 ManaCost:7
 Types:Kindred Sorcery Eldrazi
-A:SP$ SacrificeAll | Cost$ 7 | ValidCards$ Permanent.nonColorless | SpellDescription$ Each player sacrifices all permanents they control that are one or more colors.
+A:SP$ SacrificeAll | ValidCards$ Permanent.nonColorless | SpellDescription$ Each player sacrifices all permanents they control that are one or more colors.
 Oracle:Each player sacrifices all permanents they control that are one or more colors.
diff --git a/forge-gui/res/cardsfolder/a/aquitects_will.txt b/forge-gui/res/cardsfolder/a/aquitects_will.txt
index d5a800f2b56..61fa84727f4 100644
--- a/forge-gui/res/cardsfolder/a/aquitects_will.txt
+++ b/forge-gui/res/cardsfolder/a/aquitects_will.txt
@@ -1,7 +1,7 @@
 Name:Aquitect's Will
 ManaCost:U
 Types:Kindred Sorcery Merfolk
-A:SP$ PutCounter | Cost$ U | ValidTgts$ Land | TgtPrompt$ Select target land | CounterType$ FLOOD | CounterNum$ 1 | SubAbility$ DBEffect | SpellDescription$ Put a flood counter on target land. That land is an island in addition to its other types for as long as it has a flood counter on it. If you control a Merfolk, draw a card.
+A:SP$ PutCounter | ValidTgts$ Land | TgtPrompt$ Select target land | CounterType$ FLOOD | CounterNum$ 1 | SubAbility$ DBEffect | SpellDescription$ Put a flood counter on target land. That land is an island in addition to its other types for as long as it has a flood counter on it. If you control a Merfolk, draw a card.
 SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ FountainStatic | ForgetOnMoved$ Battlefield | ForgetCounter$ FLOOD | Duration$ Permanent | SubAbility$ DBDraw
 SVar:FountainStatic:Mode$ Continuous | Affected$ Card.IsRemembered | AddType$ Island | Description$ That land is an island in addition to its other types for as long as it has a flood counter on it.
 SVar:DBDraw:DB$ Draw | ConditionPresent$ Merfolk.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Merfolk,
diff --git a/forge-gui/res/cardsfolder/b/blades_of_velis_vel.txt b/forge-gui/res/cardsfolder/b/blades_of_velis_vel.txt
index a78cd1f2a1f..e57fd94c45b 100644
--- a/forge-gui/res/cardsfolder/b/blades_of_velis_vel.txt
+++ b/forge-gui/res/cardsfolder/b/blades_of_velis_vel.txt
@@ -2,6 +2,6 @@ Name:Blades of Velis Vel
 ManaCost:1 R
 Types:Kindred Instant Shapeshifter
 K:Changeling
-A:SP$ Pump | Cost$ 1 R | TargetMin$ 0 | TargetMax$ 2 | NumAtt$ +2 | ValidTgts$ Creature | TgtPrompt$ Select up to two target creatures | SubAbility$ DBAnimate | SpellDescription$ Up to two target creatures each get +2/+0 and gain all creature types until end of turn.
+A:SP$ Pump | TargetMin$ 0 | TargetMax$ 2 | NumAtt$ +2 | ValidTgts$ Creature | TgtPrompt$ Select up to two target creatures | SubAbility$ DBAnimate | SpellDescription$ Up to two target creatures each get +2/+0 and gain all creature types until end of turn.
 SVar:DBAnimate:DB$ Animate | Defined$ Targeted | AddAllCreatureTypes$ True
 Oracle:Changeling (This card is every creature type.)\nUp to two target creatures each get +2/+0 and gain all creature types until end of turn.
diff --git a/forge-gui/res/cardsfolder/b/boggart_birth_rite.txt b/forge-gui/res/cardsfolder/b/boggart_birth_rite.txt
index 528b5d04888..b96b17e7ed0 100644
--- a/forge-gui/res/cardsfolder/b/boggart_birth_rite.txt
+++ b/forge-gui/res/cardsfolder/b/boggart_birth_rite.txt
@@ -1,6 +1,6 @@
 Name:Boggart Birth Rite
 ManaCost:B
 Types:Kindred Sorcery Goblin
-A:SP$ ChangeZone | Cost$ B | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target Goblin card in your graveyard | ValidTgts$ Goblin.YouCtrl | SpellDescription$ Return target Goblin card from your graveyard to your hand.
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target Goblin card in your graveyard | ValidTgts$ Goblin.YouCtrl | SpellDescription$ Return target Goblin card from your graveyard to your hand.
 AI:RemoveDeck:Random
 Oracle:Return target Goblin card from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/c/consuming_bonfire.txt b/forge-gui/res/cardsfolder/c/consuming_bonfire.txt
index dc7e9cc1720..5afc14e8fca 100644
--- a/forge-gui/res/cardsfolder/c/consuming_bonfire.txt
+++ b/forge-gui/res/cardsfolder/c/consuming_bonfire.txt
@@ -1,7 +1,7 @@
 Name:Consuming Bonfire
 ManaCost:3 R R
 Types:Kindred Sorcery Elemental
-A:SP$ Charm | Cost$ 3 R R | Choices$ DBDmg,DBDmg2
+A:SP$ Charm | Choices$ DBDmg,DBDmg2
 SVar:DBDmg:DB$ DealDamage | ValidTgts$ Creature.nonElemental | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target non-Elemental creature.
 SVar:DBDmg2:DB$ DealDamage | ValidTgts$ Creature.Treefolk | NumDmg$ 7 | SpellDescription$ CARDNAME deals 7 damage to target Treefolk creature.
 Oracle:Choose one —\n• Consuming Bonfire deals 4 damage to target non-Elemental creature.\n• Consuming Bonfire deals 7 damage to target Treefolk creature.
diff --git a/forge-gui/res/cardsfolder/c/crib_swap.txt b/forge-gui/res/cardsfolder/c/crib_swap.txt
index 0c7b4efdaa2..bc2f49223fd 100644
--- a/forge-gui/res/cardsfolder/c/crib_swap.txt
+++ b/forge-gui/res/cardsfolder/c/crib_swap.txt
@@ -2,6 +2,6 @@ Name:Crib Swap
 ManaCost:2 W
 Types:Kindred Instant Shapeshifter
 K:Changeling
-A:SP$ ChangeZone | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | IsCurse$ True | SubAbility$ DBToken | AILogic$ Pongify | SpellDescription$ Exile target creature. Its controller creates a 1/1 colorless Shapeshifter creature token with changeling.
+A:SP$ ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | IsCurse$ True | SubAbility$ DBToken | AILogic$ Pongify | SpellDescription$ Exile target creature. Its controller creates a 1/1 colorless Shapeshifter creature token with changeling.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_shapeshifter_changeling | TokenOwner$ TargetedController
 Oracle:Changeling (This card is every creature type.)\nExile target creature. Its controller creates a 1/1 colorless Shapeshifter creature token with changeling.
diff --git a/forge-gui/res/cardsfolder/c/crush_underfoot.txt b/forge-gui/res/cardsfolder/c/crush_underfoot.txt
index e190a7aa2df..3385405cab3 100644
--- a/forge-gui/res/cardsfolder/c/crush_underfoot.txt
+++ b/forge-gui/res/cardsfolder/c/crush_underfoot.txt
@@ -1,7 +1,7 @@
 Name:Crush Underfoot
 ManaCost:1 R
 Types:Kindred Instant Giant
-A:SP$ ChooseCard | Cost$ 1 R | Defined$ You | Mandatory$ True | Choices$ Creature.Giant+YouCtrl | ChoiceTitle$ Choose a Giant creature you control | SubAbility$ DBDmg | SpellDescription$ Choose a Giant creature you control. It deals damage equal to its power to target creature.
+A:SP$ ChooseCard | Defined$ You | Mandatory$ True | Choices$ Creature.Giant+YouCtrl | ChoiceTitle$ Choose a Giant creature you control | SubAbility$ DBDmg | SpellDescription$ Choose a Giant creature you control. It deals damage equal to its power to target creature.
 SVar:DBDmg:DB$ DealDamage | NumDmg$ X | DamageSource$ ChosenCard | ValidTgts$ Creature
 SVar:X:Count$Valid Card.ChosenCard$CardPower
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/e/elvish_promenade.txt b/forge-gui/res/cardsfolder/e/elvish_promenade.txt
index 19e49da1ab3..4cdbfa1e02a 100644
--- a/forge-gui/res/cardsfolder/e/elvish_promenade.txt
+++ b/forge-gui/res/cardsfolder/e/elvish_promenade.txt
@@ -1,7 +1,7 @@
 Name:Elvish Promenade
 ManaCost:3 G
 Types:Kindred Sorcery Elf
-A:SP$ Token | Cost$ 3 G | TokenAmount$ X | TokenScript$ g_1_1_elf_warrior | TokenOwner$ You | SpellDescription$ Create a 1/1 green Elf Warrior creature token for each Elf you control.
+A:SP$ Token | TokenAmount$ X | TokenScript$ g_1_1_elf_warrior | TokenOwner$ You | SpellDescription$ Create a 1/1 green Elf Warrior creature token for each Elf you control.
 SVar:X:Count$Valid Elf.YouCtrl
 AI:RemoveDeck:Random
 Oracle:Create a 1/1 green Elf Warrior creature token for each Elf you control.
diff --git a/forge-gui/res/cardsfolder/e/eyeblights_ending.txt b/forge-gui/res/cardsfolder/e/eyeblights_ending.txt
index a27e4e311ad..b6cb96d3d04 100644
--- a/forge-gui/res/cardsfolder/e/eyeblights_ending.txt
+++ b/forge-gui/res/cardsfolder/e/eyeblights_ending.txt
@@ -1,5 +1,5 @@
 Name:Eyeblight's Ending
 ManaCost:2 B
 Types:Kindred Instant Elf
-A:SP$ Destroy | Cost$ 2 B | ValidTgts$ Creature.nonElf | TgtPrompt$ Select target non-Elf creature | SpellDescription$ Destroy target non-Elf creature.
+A:SP$ Destroy | ValidTgts$ Creature.nonElf | TgtPrompt$ Select target non-Elf creature | SpellDescription$ Destroy target non-Elf creature.
 Oracle:Destroy target non-Elf creature.
diff --git a/forge-gui/res/cardsfolder/f/faerie_trickery.txt b/forge-gui/res/cardsfolder/f/faerie_trickery.txt
index dd6d9b01c00..16b3864a92a 100644
--- a/forge-gui/res/cardsfolder/f/faerie_trickery.txt
+++ b/forge-gui/res/cardsfolder/f/faerie_trickery.txt
@@ -1,5 +1,5 @@
 Name:Faerie Trickery
 ManaCost:1 U U
 Types:Kindred Instant Faerie
-A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target non-Faerie spell | ValidTgts$ Card.nonFaerie | Destination$ Exile | SpellDescription$ Counter target non-Faerie spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
+A:SP$ Counter | TargetType$ Spell | TgtPrompt$ Select target non-Faerie spell | ValidTgts$ Card.nonFaerie | Destination$ Exile | SpellDescription$ Counter target non-Faerie spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
 Oracle:Counter target non-Faerie spell. If that spell is countered this way, exile it instead of putting it into its owner's graveyard.
diff --git a/forge-gui/res/cardsfolder/f/feudkillers_verdict.txt b/forge-gui/res/cardsfolder/f/feudkillers_verdict.txt
index e10e9ce36da..62dd2d6d9a8 100644
--- a/forge-gui/res/cardsfolder/f/feudkillers_verdict.txt
+++ b/forge-gui/res/cardsfolder/f/feudkillers_verdict.txt
@@ -1,7 +1,7 @@
 Name:Feudkiller's Verdict
 ManaCost:4 W W
 Types:Kindred Sorcery Giant
-A:SP$ GainLife | Cost$ 4 W W | Defined$ You | LifeAmount$ 10 | SubAbility$ Token | SpellDescription$ You gain 10 life. Then if you have more life than an opponent, create a 5/5 white Giant Warrior creature token.
+A:SP$ GainLife | Defined$ You | LifeAmount$ 10 | SubAbility$ Token | SpellDescription$ You gain 10 life. Then if you have more life than an opponent, create a 5/5 white Giant Warrior creature token.
 SVar:Token:DB$ Token | ConditionLifeTotal$ You | ConditionLifeAmount$ GTX | TokenAmount$ 1 | TokenScript$ w_5_5_giant_warrior | TokenOwner$ You
 SVar:X:PlayerCountOpponents$LowestLifeTotal
 Oracle:You gain 10 life. Then if you have more life than an opponent, create a 5/5 white Giant Warrior creature token.
diff --git a/forge-gui/res/cardsfolder/g/giants_ire.txt b/forge-gui/res/cardsfolder/g/giants_ire.txt
index 98f0648f6ee..5bf2c194bb9 100644
--- a/forge-gui/res/cardsfolder/g/giants_ire.txt
+++ b/forge-gui/res/cardsfolder/g/giants_ire.txt
@@ -1,7 +1,7 @@
 Name:Giant's Ire
 ManaCost:3 R
 Types:Kindred Sorcery Giant
-A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 4 | SubAbility$ DBDraw | SpellDescription$ CARDNAME deals 4 damage to target player or planeswalker. If you control a Giant, draw a card.
+A:SP$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 4 | SubAbility$ DBDraw | SpellDescription$ CARDNAME deals 4 damage to target player or planeswalker. If you control a Giant, draw a card.
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionPresent$ Giant.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Giant,
 AI:RemoveDeck:Random
 Oracle:Giant's Ire deals 4 damage to target player or planeswalker. If you control a Giant, draw a card.
diff --git a/forge-gui/res/cardsfolder/g/gilt_leaf_ambush.txt b/forge-gui/res/cardsfolder/g/gilt_leaf_ambush.txt
index 04b4f3f9b81..9724932e566 100644
--- a/forge-gui/res/cardsfolder/g/gilt_leaf_ambush.txt
+++ b/forge-gui/res/cardsfolder/g/gilt_leaf_ambush.txt
@@ -1,7 +1,7 @@
 Name:Gilt-Leaf Ambush
 ManaCost:2 G
 Types:Kindred Instant Elf
-A:SP$ Token | Cost$ 2 G | TokenAmount$ 2 | TokenScript$ g_1_1_elf_warrior | TokenOwner$ You | SubAbility$ DBClash | RememberTokens$ True | SpellDescription$ Create two 1/1 green Elf Warrior creature tokens. Clash with an opponent. If you win, those creatures gain deathtouch until end of turn.
+A:SP$ Token | TokenAmount$ 2 | TokenScript$ g_1_1_elf_warrior | TokenOwner$ You | SubAbility$ DBClash | RememberTokens$ True | SpellDescription$ Create two 1/1 green Elf Warrior creature tokens. Clash with an opponent. If you win, those creatures gain deathtouch until end of turn.
 SVar:DBClash:DB$ Clash | WinSubAbility$ AdditionalPump
 SVar:AdditionalPump:DB$ PumpAll | ValidCards$ Creature.IsRemembered | KW$ Deathtouch | SubAbility$ DBCleanUp
 SVar:DBCleanUp:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/h/hunting_triad.txt b/forge-gui/res/cardsfolder/h/hunting_triad.txt
index 9d70c9af32f..eaf7890beef 100644
--- a/forge-gui/res/cardsfolder/h/hunting_triad.txt
+++ b/forge-gui/res/cardsfolder/h/hunting_triad.txt
@@ -1,7 +1,7 @@
 Name:Hunting Triad
 ManaCost:3 G
 Types:Kindred Sorcery Elf
-A:SP$ Token | Cost$ 3 G | TokenAmount$ 3 | TokenScript$ g_1_1_elf_warrior | TokenOwner$ You | SpellDescription$ Create three 1/1 green Elf Warrior creature tokens.
+A:SP$ Token | TokenAmount$ 3 | TokenScript$ g_1_1_elf_warrior | TokenOwner$ You | SpellDescription$ Create three 1/1 green Elf Warrior creature tokens.
 K:Reinforce:3:3 G
 DeckHas:Ability$Counters|Token
 DeckNeeds:Type$Creature
diff --git a/forge-gui/res/cardsfolder/k/knowledge_exploitation.txt b/forge-gui/res/cardsfolder/k/knowledge_exploitation.txt
index f501d531146..21bfa1d8ddc 100644
--- a/forge-gui/res/cardsfolder/k/knowledge_exploitation.txt
+++ b/forge-gui/res/cardsfolder/k/knowledge_exploitation.txt
@@ -2,7 +2,7 @@ Name:Knowledge Exploitation
 ManaCost:5 U U
 Types:Kindred Sorcery Rogue
 K:Prowl:3 U
-A:SP$ ChangeZone | Cost$ 5 U U | ValidTgts$ Opponent | Origin$ Library | Destination$ Library | ChangeType$ Instant,Sorcery | ChangeNum$ 1 | RememberChanged$ True | Reveal$ True | Shuffle$ False | DefinedPlayer$ Targeted | Chooser$ You | SubAbility$ DBPlay | StackDescription$ Search {p:Targeted}'s library for an instant or sorcery card | SpellDescription$ Search target opponent's library for an instant or sorcery card. You may cast that card without paying its mana cost. Then that player shuffles.
+A:SP$ ChangeZone | ValidTgts$ Opponent | Origin$ Library | Destination$ Library | ChangeType$ Instant,Sorcery | ChangeNum$ 1 | RememberChanged$ True | Reveal$ True | Shuffle$ False | DefinedPlayer$ Targeted | Chooser$ You | SubAbility$ DBPlay | StackDescription$ Search {p:Targeted}'s library for an instant or sorcery card | SpellDescription$ Search target opponent's library for an instant or sorcery card. You may cast that card without paying its mana cost. Then that player shuffles.
 SVar:DBPlay:DB$ Play | Defined$ Remembered | Controller$ You | WithoutManaCost$ True | ValidSA$ Spell | Optional$ True | SubAbility$ DBShuffle
 SVar:DBShuffle:DB$ Shuffle | Defined$ RememberedController | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/m/morsel_theft.txt b/forge-gui/res/cardsfolder/m/morsel_theft.txt
index 3053804ba04..337c245eb95 100644
--- a/forge-gui/res/cardsfolder/m/morsel_theft.txt
+++ b/forge-gui/res/cardsfolder/m/morsel_theft.txt
@@ -2,7 +2,7 @@ Name:Morsel Theft
 ManaCost:2 B B
 Types:Kindred Sorcery Rogue
 K:Prowl:1 B
-A:SP$ LoseLife | Cost$ 2 B B | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 3 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 3 life and you gain 3 life. If CARDNAME's prowl cost was paid, draw a card.
+A:SP$ LoseLife | ValidTgts$ Player | TgtPrompt$ Select a player | LifeAmount$ 3 | SubAbility$ DBGainLife | SpellDescription$ Target player loses 3 life and you gain 3 life. If CARDNAME's prowl cost was paid, draw a card.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3 | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionDefined$ Self | ConditionPresent$ Card.prowled
 DeckNeeds:Type$Rogue
diff --git a/forge-gui/res/cardsfolder/n/nameless_inversion.txt b/forge-gui/res/cardsfolder/n/nameless_inversion.txt
index b5d17dd2985..bc8b48cb448 100644
--- a/forge-gui/res/cardsfolder/n/nameless_inversion.txt
+++ b/forge-gui/res/cardsfolder/n/nameless_inversion.txt
@@ -2,6 +2,6 @@ Name:Nameless Inversion
 ManaCost:1 B
 Types:Kindred Instant Shapeshifter
 K:Changeling
-A:SP$ Pump | Cost$ 1 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ -3 | IsCurse$ True | SubAbility$ DBAnimate | SpellDescription$ Target creature gets +3/-3 and loses all creature types until end of turn.
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ -3 | IsCurse$ True | SubAbility$ DBAnimate | SpellDescription$ Target creature gets +3/-3 and loses all creature types until end of turn.
 SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Types$ Creature | RemoveCreatureTypes$ True
 Oracle:Changeling (This card is every creature type.)\nTarget creature gets +3/-3 and loses all creature types until end of turn.
diff --git a/forge-gui/res/cardsfolder/n/noggin_whack.txt b/forge-gui/res/cardsfolder/n/noggin_whack.txt
index 89c596ca2f9..32b2ab6b36c 100644
--- a/forge-gui/res/cardsfolder/n/noggin_whack.txt
+++ b/forge-gui/res/cardsfolder/n/noggin_whack.txt
@@ -2,6 +2,6 @@ Name:Noggin Whack
 ManaCost:2 B B
 Types:Kindred Sorcery Rogue
 K:Prowl:1 B
-A:SP$ Discard | Cost$ 2 B B | ValidTgts$ Player | Mode$ RevealYouChoose | RevealNumber$ 3 | NumCards$ 2 | SpellDescription$ Target player reveals three cards from their hand. You choose two of them. That player discards those cards.
+A:SP$ Discard | ValidTgts$ Player | Mode$ RevealYouChoose | RevealNumber$ 3 | NumCards$ 2 | SpellDescription$ Target player reveals three cards from their hand. You choose two of them. That player discards those cards.
 DeckNeeds:Type$Rogue
 Oracle:Prowl {1}{B} (You may cast this for its prowl cost if you dealt combat damage to a player this turn with a Rogue.)\nTarget player reveals three cards from their hand. You choose two of them. That player discards those cards.
diff --git a/forge-gui/res/cardsfolder/n/not_of_this_world.txt b/forge-gui/res/cardsfolder/n/not_of_this_world.txt
index dd7f266707e..e8ac6dd4fc1 100644
--- a/forge-gui/res/cardsfolder/n/not_of_this_world.txt
+++ b/forge-gui/res/cardsfolder/n/not_of_this_world.txt
@@ -2,7 +2,7 @@ Name:Not of This World
 ManaCost:7
 Types:Kindred Instant Eldrazi
 S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ CostReduction | Relative$ True | EffectZone$ All | Description$ This spell costs {7} less to cast if it targets a spell or ability that targets a creature you control with power 7 or greater.
-A:SP$ Counter | Cost$ 7 | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability that targets a permanent you control | ValidTgts$ Card,Emblem | TargetValidTargeting$ Permanent.YouCtrl+inRealZoneBattlefield | SpellDescription$ Counter target spell or ability that targets a permanent you control.
+A:SP$ Counter | TargetType$ Spell,Activated,Triggered | TgtPrompt$ Select target spell or ability that targets a permanent you control | ValidTgts$ Card,Emblem | TargetValidTargeting$ Permanent.YouCtrl+inRealZoneBattlefield | SpellDescription$ Counter target spell or ability that targets a permanent you control.
 SVar:CostReduction:Count$Compare CheckTgt GE1.7.0
 SVar:CheckTgt:TargetedByTarget$Valid Card.powerGE7+YouCtrl
 Oracle:Counter target spell or ability that targets a permanent you control.\nThis spell costs {7} less to cast if it targets a spell or ability that targets a creature you control with power 7 or greater.
diff --git a/forge-gui/res/cardsfolder/n/notorious_throng.txt b/forge-gui/res/cardsfolder/n/notorious_throng.txt
index 6222eb6794b..091952e4f43 100644
--- a/forge-gui/res/cardsfolder/n/notorious_throng.txt
+++ b/forge-gui/res/cardsfolder/n/notorious_throng.txt
@@ -2,7 +2,7 @@ Name:Notorious Throng
 ManaCost:3 U
 Types:Kindred Sorcery Rogue
 K:Prowl:5 U
-A:SP$ Token | Cost$ 3 U | TokenAmount$ X | TokenScript$ b_1_1_faerie_rogue_flying | TokenOwner$ You | SubAbility$ DBTakeTurn | SpellDescription$ Create X 1/1 black Faerie Rogue creature tokens with flying, where X is the damage dealt to your opponents this turn. If CARDNAME's prowl cost was paid, take an extra turn after this one.
+A:SP$ Token | TokenAmount$ X | TokenScript$ b_1_1_faerie_rogue_flying | TokenOwner$ You | SubAbility$ DBTakeTurn | SpellDescription$ Create X 1/1 black Faerie Rogue creature tokens with flying, where X is the damage dealt to your opponents this turn. If CARDNAME's prowl cost was paid, take an extra turn after this one.
 SVar:DBTakeTurn:DB$ AddTurn | NumTurns$ 1 | ConditionDefined$ Self | ConditionPresent$ Card.prowled
 SVar:X:Count$BloodthirstAmount
 DeckNeeds:Type$Rogue
diff --git a/forge-gui/res/cardsfolder/p/peppersmoke.txt b/forge-gui/res/cardsfolder/p/peppersmoke.txt
index 905274ace60..019ce28f422 100644
--- a/forge-gui/res/cardsfolder/p/peppersmoke.txt
+++ b/forge-gui/res/cardsfolder/p/peppersmoke.txt
@@ -1,7 +1,7 @@
 Name:Peppersmoke
 ManaCost:B
 Types:Kindred Instant Faerie
-A:SP$ Pump | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SubAbility$ DBDraw | SpellDescription$ Target creature gets -1/-1 until end of turn. If you control a Faerie, draw a card.
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SubAbility$ DBDraw | SpellDescription$ Target creature gets -1/-1 until end of turn. If you control a Faerie, draw a card.
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionPresent$ Faerie.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Faerie,
 AI:RemoveDeck:Random
 Oracle:Target creature gets -1/-1 until end of turn. If you control a Faerie, draw a card.
diff --git a/forge-gui/res/cardsfolder/r/reach_of_branches.txt b/forge-gui/res/cardsfolder/r/reach_of_branches.txt
index 109b274d4a3..9bd1e7e5630 100644
--- a/forge-gui/res/cardsfolder/r/reach_of_branches.txt
+++ b/forge-gui/res/cardsfolder/r/reach_of_branches.txt
@@ -1,7 +1,7 @@
 Name:Reach of Branches
 ManaCost:4 G
 Types:Kindred Instant Treefolk
-A:SP$ Token | Cost$ 4 G | TokenAmount$ 1 | TokenScript$ g_2_5_treefolk_shaman | TokenOwner$ You | SpellDescription$ Create a 2/5 green Treefolk Shaman creature token.
+A:SP$ Token | TokenAmount$ 1 | TokenScript$ g_2_5_treefolk_shaman | TokenOwner$ You | SpellDescription$ Create a 2/5 green Treefolk Shaman creature token.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Forest.YouCtrl | TriggerZones$ Graveyard | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever a Forest you control enters, you may return CARDNAME from your graveyard to your hand.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ Self
 Oracle:Create a 2/5 green Treefolk Shaman creature token.\nWhenever a Forest you control enters, you may return Reach of Branches from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/r/rootgrapple.txt b/forge-gui/res/cardsfolder/r/rootgrapple.txt
index ff0cb6fdf9c..0529c6c973b 100644
--- a/forge-gui/res/cardsfolder/r/rootgrapple.txt
+++ b/forge-gui/res/cardsfolder/r/rootgrapple.txt
@@ -1,7 +1,7 @@
 Name:Rootgrapple
 ManaCost:4 G
 Types:Kindred Instant Treefolk
-A:SP$ Destroy | Cost$ 4 G | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select target noncreature permanent | SubAbility$ DBDraw | SpellDescription$ Destroy target noncreature permanent. If you control a Treefolk, draw a card.
+A:SP$ Destroy | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select target noncreature permanent | SubAbility$ DBDraw | SpellDescription$ Destroy target noncreature permanent. If you control a Treefolk, draw a card.
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionPresent$ Treefolk.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Treefolk,
 AI:RemoveDeck:Random
 Oracle:Destroy target noncreature permanent. If you control a Treefolk, draw a card.
diff --git a/forge-gui/res/cardsfolder/s/sages_dousing.txt b/forge-gui/res/cardsfolder/s/sages_dousing.txt
index 26186f7b639..513c2d8663b 100644
--- a/forge-gui/res/cardsfolder/s/sages_dousing.txt
+++ b/forge-gui/res/cardsfolder/s/sages_dousing.txt
@@ -1,7 +1,7 @@
 Name:Sage's Dousing
 ManaCost:2 U
 Types:Kindred Instant Wizard
-A:SP$ Counter | Cost$ 2 U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 3 | SubAbility$ DBDraw | SpellDescription$ Counter target spell unless its controller pays {3}. If you control a Wizard, draw a card.
+A:SP$ Counter | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | UnlessCost$ 3 | SubAbility$ DBDraw | SpellDescription$ Counter target spell unless its controller pays {3}. If you control a Wizard, draw a card.
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionPresent$ Wizard.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Wizard,
 AI:RemoveDeck:Random
 DeckNeeds:Type$Wizard
diff --git a/forge-gui/res/cardsfolder/s/sarahs_wings.txt b/forge-gui/res/cardsfolder/s/sarahs_wings.txt
index 5f0fa04c687..9c1d022aa6b 100644
--- a/forge-gui/res/cardsfolder/s/sarahs_wings.txt
+++ b/forge-gui/res/cardsfolder/s/sarahs_wings.txt
@@ -1,7 +1,7 @@
 Name:Sarah's Wings
 ManaCost:W
 Types:Kindred Instant Angel
-A:SP$ Pump | Cost$ W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | KW$ Flying | SubAbility$ NoDamage | SpellDescription$ Target creature or player gains flying until end of turn.
+A:SP$ Pump | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | KW$ Flying | SubAbility$ NoDamage | SpellDescription$ Target creature or player gains flying until end of turn.
 SVar:NoDamage:DB$ Effect | ReplacementEffects$ RPrevent | EffectOwner$ TargetedPlayer | ConditionPlayerDefined$ Targeted | ConditionPlayerContains$ Targeted | SpellDescription$ (Players with flying can't be dealt damage by creatures without flying.)
 SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidTarget$ You | ValidSource$ Creature.withoutFlying | Description$ Prevent all damage that would be dealt to you this turn by creatures without flying.
 Oracle:Target creature or player gains flying until end of turn. (Players with flying can't be dealt damage by creatures without flying.)
diff --git a/forge-gui/res/cardsfolder/s/shields_of_velis_vel.txt b/forge-gui/res/cardsfolder/s/shields_of_velis_vel.txt
index dd3654db3b4..7b5d2a66aca 100644
--- a/forge-gui/res/cardsfolder/s/shields_of_velis_vel.txt
+++ b/forge-gui/res/cardsfolder/s/shields_of_velis_vel.txt
@@ -2,7 +2,7 @@ Name:Shields of Velis Vel
 ManaCost:W
 Types:Kindred Instant Shapeshifter
 K:Changeling
-A:SP$ PumpAll | Cost$ W | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Creature | NumAtt$ +0 | NumDef$ +1 | SubAbility$ DBAnimate | SpellDescription$ Creatures target player controls get +0/+1 and gain all creature types until end of turn.
+A:SP$ PumpAll | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Creature | NumAtt$ +0 | NumDef$ +1 | SubAbility$ DBAnimate | SpellDescription$ Creatures target player controls get +0/+1 and gain all creature types until end of turn.
 SVar:DBAnimate:DB$ AnimateAll | ValidCards$ Creature.TargetedPlayerCtrl | AddAllCreatureTypes$ True
 SVar:NeedsToPlay:Creature.YouCtrl
 AI:RemoveDeck:All
diff --git a/forge-gui/res/cardsfolder/s/skittering_invasion.txt b/forge-gui/res/cardsfolder/s/skittering_invasion.txt
index e2b5d550e64..888877da772 100644
--- a/forge-gui/res/cardsfolder/s/skittering_invasion.txt
+++ b/forge-gui/res/cardsfolder/s/skittering_invasion.txt
@@ -1,7 +1,7 @@
 Name:Skittering Invasion
 ManaCost:7
 Types:Kindred Sorcery Eldrazi
-A:SP$ Token | Cost$ 7 | TokenAmount$ 5 | TokenScript$ c_0_1_eldrazi_spawn_sac | TokenOwner$ You | SpellDescription$ Create five 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
+A:SP$ Token | TokenAmount$ 5 | TokenScript$ c_0_1_eldrazi_spawn_sac | TokenOwner$ You | SpellDescription$ Create five 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
 DeckHints:Type$Eldrazi
 DeckHas:Ability$Mana.Colorless|Token
 Oracle:Create five 0/1 colorless Eldrazi Spawn creature tokens. They have "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/s/stream_of_unconsciousness.txt b/forge-gui/res/cardsfolder/s/stream_of_unconsciousness.txt
index b32a92c7982..cdce5cffd82 100644
--- a/forge-gui/res/cardsfolder/s/stream_of_unconsciousness.txt
+++ b/forge-gui/res/cardsfolder/s/stream_of_unconsciousness.txt
@@ -1,7 +1,7 @@
 Name:Stream of Unconsciousness
 ManaCost:U
 Types:Kindred Instant Wizard
-A:SP$ Pump | Cost$ U | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -4 | IsCurse$ True | SubAbility$ DBDraw | SpellDescription$ Target creature gets -4/-0 until end of turn. If you control a Wizard, draw a card.
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -4 | IsCurse$ True | SubAbility$ DBDraw | SpellDescription$ Target creature gets -4/-0 until end of turn. If you control a Wizard, draw a card.
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionPresent$ Wizard.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Wizard,
 DeckHints:Type$Wizard
 Oracle:Target creature gets -4/-0 until end of turn. If you control a Wizard, draw a card.
diff --git a/forge-gui/res/cardsfolder/s/summon_the_school.txt b/forge-gui/res/cardsfolder/s/summon_the_school.txt
index 512b8087c60..988dd297051 100644
--- a/forge-gui/res/cardsfolder/s/summon_the_school.txt
+++ b/forge-gui/res/cardsfolder/s/summon_the_school.txt
@@ -1,7 +1,7 @@
 Name:Summon the School
 ManaCost:3 W
 Types:Kindred Sorcery Merfolk
-A:SP$ Token | Cost$ 3 W | TokenAmount$ 2 | TokenScript$ u_1_1_merfolk_wizard | TokenOwner$ You | SpellDescription$ Create two 1/1 blue Merfolk Wizard creature tokens.
+A:SP$ Token | TokenAmount$ 2 | TokenScript$ u_1_1_merfolk_wizard | TokenOwner$ You | SpellDescription$ Create two 1/1 blue Merfolk Wizard creature tokens.
 A:AB$ ChangeZone | Cost$ tapXType<4/Merfolk> | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | SpellDescription$ Return CARDNAME from your graveyard to your hand.
 AI:RemoveDeck:Random
 Oracle:Create two 1/1 blue Merfolk Wizard creature tokens.\nTap four untapped Merfolk you control: Return Summon the School from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/s/surge_of_thoughtweft.txt b/forge-gui/res/cardsfolder/s/surge_of_thoughtweft.txt
index 98fce9b7c64..1915de11aa8 100644
--- a/forge-gui/res/cardsfolder/s/surge_of_thoughtweft.txt
+++ b/forge-gui/res/cardsfolder/s/surge_of_thoughtweft.txt
@@ -1,7 +1,7 @@
 Name:Surge of Thoughtweft
 ManaCost:1 W
 Types:Kindred Instant Kithkin
-A:SP$ PumpAll | Cost$ 1 W | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SubAbility$ DBDraw | SpellDescription$ Creatures you control get +1/+1 until end of turn. If you control a Kithkin, draw a card.
+A:SP$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | SubAbility$ DBDraw | SpellDescription$ Creatures you control get +1/+1 until end of turn. If you control a Kithkin, draw a card.
 SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionPresent$ Kithkin.YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a Kithkin,
 AI:RemoveDeck:Random
 Oracle:Creatures you control get +1/+1 until end of turn. If you control a Kithkin, draw a card.
diff --git a/forge-gui/res/cardsfolder/t/tarfire.txt b/forge-gui/res/cardsfolder/t/tarfire.txt
index 7e744280eb2..ddb495c8b95 100644
--- a/forge-gui/res/cardsfolder/t/tarfire.txt
+++ b/forge-gui/res/cardsfolder/t/tarfire.txt
@@ -1,5 +1,5 @@
 Name:Tarfire
 ManaCost:R
 Types:Kindred Instant Goblin
-A:SP$ DealDamage | Cost$ R | ValidTgts$ Any | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to any target.
+A:SP$ DealDamage | ValidTgts$ Any | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to any target.
 Oracle:Tarfire deals 2 damage to any target.
diff --git a/forge-gui/res/cardsfolder/t/thieves_fortune.txt b/forge-gui/res/cardsfolder/t/thieves_fortune.txt
index 80cad4406e7..69b75bf036f 100644
--- a/forge-gui/res/cardsfolder/t/thieves_fortune.txt
+++ b/forge-gui/res/cardsfolder/t/thieves_fortune.txt
@@ -2,6 +2,6 @@ Name:Thieves' Fortune
 ManaCost:2 U
 Types:Kindred Instant Rogue
 K:Prowl:U
-A:SP$ Dig | Cost$ 2 U | DigNum$ 4 | ChangeNum$ 1 | NoReveal$ True | SpellDescription$ Look at the top four cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.
+A:SP$ Dig | DigNum$ 4 | ChangeNum$ 1 | NoReveal$ True | SpellDescription$ Look at the top four cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.
 DeckNeeds:Type$Rogue
 Oracle:Prowl {U} (You may cast this for its prowl cost if you dealt combat damage to a player this turn with a Rogue.)\nLook at the top four cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.
diff --git a/forge-gui/res/cardsfolder/v/violet_pall.txt b/forge-gui/res/cardsfolder/v/violet_pall.txt
index 4866b12fae7..7da33ba3102 100644
--- a/forge-gui/res/cardsfolder/v/violet_pall.txt
+++ b/forge-gui/res/cardsfolder/v/violet_pall.txt
@@ -1,6 +1,6 @@
 Name:Violet Pall
 ManaCost:4 B
 Types:Kindred Instant Faerie
-A:SP$ Destroy | Cost$ 4 B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | SubAbility$ DBToken | SpellDescription$ Destroy target nonblack creature. Create a 1/1 black Faerie Rogue creature token with flying.
+A:SP$ Destroy | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | SubAbility$ DBToken | SpellDescription$ Destroy target nonblack creature. Create a 1/1 black Faerie Rogue creature token with flying.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_faerie_rogue_flying | TokenOwner$ You
 Oracle:Destroy target nonblack creature. Create a 1/1 black Faerie Rogue creature token with flying.
diff --git a/forge-gui/res/cardsfolder/w/warren_weirding.txt b/forge-gui/res/cardsfolder/w/warren_weirding.txt
index 09679509856..49fbda4a399 100644
--- a/forge-gui/res/cardsfolder/w/warren_weirding.txt
+++ b/forge-gui/res/cardsfolder/w/warren_weirding.txt
@@ -1,7 +1,7 @@
 Name:Warren Weirding
 ManaCost:1 B
 Types:Kindred Sorcery Goblin
-A:SP$ Sacrifice | Cost$ 1 B | ValidTgts$ Player | SacValid$ Creature | SacMessage$ Creature | RememberSacrificed$ True | SubAbility$ DBToken | SpellDescription$ Target player sacrifices a creature. If a Goblin is sacrificed this way, that player creates two 1/1 black Goblin Rogue creature tokens, and those tokens gain haste until end of turn.
+A:SP$ Sacrifice | ValidTgts$ Player | SacValid$ Creature | SacMessage$ Creature | RememberSacrificed$ True | SubAbility$ DBToken | SpellDescription$ Target player sacrifices a creature. If a Goblin is sacrificed this way, that player creates two 1/1 black Goblin Rogue creature tokens, and those tokens gain haste until end of turn.
 SVar:DBToken:DB$ Token | ConditionDefined$ Remembered | ConditionPresent$ Card.Goblin | ConditionCompare$ GE1 | TokenAmount$ 2 | TokenScript$ b_1_1_goblin_rogue | TokenOwner$ Targeted | RememberTokens$ True | ForgetOtherRemembered$ True | SubAbility$ AdditionalPump
 SVar:AdditionalPump:DB$ PumpAll | ValidCards$ Creature.IsRemembered | KW$ Haste | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/w/wings_of_velis_vel.txt b/forge-gui/res/cardsfolder/w/wings_of_velis_vel.txt
index 3351b7043ca..6385e96ce93 100644
--- a/forge-gui/res/cardsfolder/w/wings_of_velis_vel.txt
+++ b/forge-gui/res/cardsfolder/w/wings_of_velis_vel.txt
@@ -2,6 +2,6 @@ Name:Wings of Velis Vel
 ManaCost:1 U
 Types:Kindred Instant Shapeshifter
 K:Changeling
-A:SP$ Animate | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Power$ 4 | Toughness$ 4 | Keywords$ Flying | AddAllCreatureTypes$ True | SpellDescription$ Until end of turn, target creature has base power and toughness 4/4, gains all creature types, and gains flying.
+A:SP$ Animate | ValidTgts$ Creature | TgtPrompt$ Select target creature | Power$ 4 | Toughness$ 4 | Keywords$ Flying | AddAllCreatureTypes$ True | SpellDescription$ Until end of turn, target creature has base power and toughness 4/4, gains all creature types, and gains flying.
 AI:RemoveDeck:All
 Oracle:Changeling (This card is every creature type.)\nUntil end of turn, target creature has base power and toughness 4/4, gains all creature types, and gains flying.