diff --git a/forge-gui/res/cardsfolder/a/abunas_chant.txt b/forge-gui/res/cardsfolder/a/abunas_chant.txt
index a9390c1ef5d..988b151d5aa 100644
--- a/forge-gui/res/cardsfolder/a/abunas_chant.txt
+++ b/forge-gui/res/cardsfolder/a/abunas_chant.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Instant
 A:SP$ GainLife | Cost$ 3 W | LifeAmount$ 5 | SpellDescription$ Choose one - You gain 5 life;
 A:SP$ PreventDamage | Cost$ 3 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | Amount$ 5 | SpellDescription$  or prevent the next 5 damage that would be dealt to target creature this turn.
-A:SP$ GainLife | Cost$ 5 W | PrecostDesc$ Entwine | CostDesc$ 2 | LifeAmount$ 5 | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ DBPreventDamage
+A:SP$ GainLife | Cost$ 5 W | PrecostDesc$ Entwine | CostDesc$ {2} | LifeAmount$ 5 | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ DBPreventDamage
 SVar:DBPreventDamage:DB$ PreventDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | Amount$ 5
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abunas_chant.jpg
diff --git a/forge-gui/res/cardsfolder/b/barbed_lightning.txt b/forge-gui/res/cardsfolder/b/barbed_lightning.txt
index 3aaaae67a9e..10bcb1c5e57 100644
--- a/forge-gui/res/cardsfolder/b/barbed_lightning.txt
+++ b/forge-gui/res/cardsfolder/b/barbed_lightning.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Instant
 A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | SpellDescription$ Choose one - CARDNAME deals 3 damage to target creature;
 A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SpellDescription$ or CARDNAME deals 3 damage to target player.
-A:SP$ DealDamage | Cost$ 4 R | PrecostDesc$ Entwine | CostDesc$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ DBDamage
+A:SP$ DealDamage | Cost$ 4 R | PrecostDesc$ Entwine | CostDesc$ {2} | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ DBDamage
 SVar:DBDamage:DB$DealDamage| ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 |
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/barbed_lightning.jpg
diff --git a/forge-gui/res/cardsfolder/b/blinding_beam.txt b/forge-gui/res/cardsfolder/b/blinding_beam.txt
index b396c222d94..e4d258ed4d8 100644
--- a/forge-gui/res/cardsfolder/b/blinding_beam.txt
+++ b/forge-gui/res/cardsfolder/b/blinding_beam.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Instant
 A:SP$ Tap | Cost$ 2 W |  ValidTgts$ Creature | TargetMin$ 2 | TargetMax$ 2 | TgtPrompt$ Select two target creatures | SpellDescription$  Choose one - Tap two target creatures;
 A:SP$ Effect | Cost$ 2 W | ValidTgts$ Player | TgtPrompt$ Select target player | IsCurse$ True | StaticAbilities$ DontUntap | Triggers$ RestoreSight | SVars$ ExileEffect | RememberObjects$ Targeted | Duration$ Permanent | SpellDescription$  or creatures don't untap during target player's next untap step.
-A:SP$ Effect | Cost$ 3 W | ValidTgts$ Player | TgtPrompt$ Select target player | IsCurse$ True | StaticAbilities$ DontUntap | Triggers$ RestoreSight | SVars$ ExileEffect | RememberObjects$ Targeted | AILogic$ BeginningOfOppTurn | Duration$ Permanent | SubAbility$ BlindTheFoe | PrecostDesc$ Entwine | CostDesc$ 1 | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
+A:SP$ Effect | Cost$ 3 W | ValidTgts$ Player | TgtPrompt$ Select target player | IsCurse$ True | StaticAbilities$ DontUntap | Triggers$ RestoreSight | SVars$ ExileEffect | RememberObjects$ Targeted | AILogic$ BeginningOfOppTurn | Duration$ Permanent | SubAbility$ BlindTheFoe | PrecostDesc$ Entwine | CostDesc$ {1} | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
 SVar:BlindTheFoe:DB$ Tap |  ValidTgts$ Creature | TargetMin$ 2 | TargetMax$ 2 | TgtPrompt$ Select two target creatures
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ This card doesn't untap during your next untap step.
 SVar:RestoreSight:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.IsRemembered | TriggerZones$ Command | Execute$ ExileEffect | Static$ True
diff --git a/forge-gui/res/cardsfolder/b/blustersquall.txt b/forge-gui/res/cardsfolder/b/blustersquall.txt
index 7ecce453419..4321ecf7f71 100644
--- a/forge-gui/res/cardsfolder/b/blustersquall.txt
+++ b/forge-gui/res/cardsfolder/b/blustersquall.txt
@@ -2,6 +2,6 @@ Name:Blustersquall
 ManaCost:U
 Types:Instant
 A:SP$ Tap | Cost$ U | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | SpellDescription$ Tap target creature you don't control.
-A:SP$ TapAll | Cost$ 3 U | ValidCards$ Creature.YouDontCtrl | ValidDescription$ each creature you don't control. | PrecostDesc$ Overload | CostDesc$ 3 U | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
+A:SP$ TapAll | Cost$ 3 U | ValidCards$ Creature.YouDontCtrl | ValidDescription$ each creature you don't control. | PrecostDesc$ Overload | CostDesc$ {3}{U} | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blustersquall.jpg
 Oracle:Tap target creature you don't control.\nOverload {3}{U} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/chemisters_trick.txt b/forge-gui/res/cardsfolder/c/chemisters_trick.txt
index e00c3078971..7ee43ae36ce 100644
--- a/forge-gui/res/cardsfolder/c/chemisters_trick.txt
+++ b/forge-gui/res/cardsfolder/c/chemisters_trick.txt
@@ -2,6 +2,6 @@ Name:Chemister's Trick
 ManaCost:U R
 Types:Instant
 A:SP$ Pump | Cost$ U R | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control. | NumAtt$ -2 | KW$ HIDDEN CARDNAME attacks each turn if able. | SpellDescription$ Target creature you don't control gets -2/-0 until end of turn and attacks this turn if able.
-A:SP$ PumpAll | Cost$ 3 U R | ValidCards$ Creature.YouDontCtrl | ValidDescription$ each creature you don't control. | NumAtt$ -2 | KW$ HIDDEN CARDNAME attacks each turn if able. | PrecostDesc$ Overload | CostDesc$ 3 U R | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
+A:SP$ PumpAll | Cost$ 3 U R | ValidCards$ Creature.YouDontCtrl | ValidDescription$ each creature you don't control. | NumAtt$ -2 | KW$ HIDDEN CARDNAME attacks each turn if able. | PrecostDesc$ Overload | CostDesc$ {3}{U}{R} | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chemisters_trick.jpg
 Oracle:Target creature you don't control gets -2/-0 until end of turn and attacks this turn if able.\nOverload {3}{U}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/counterflux.txt b/forge-gui/res/cardsfolder/c/counterflux.txt
index 95247e57f17..7188e84eef7 100644
--- a/forge-gui/res/cardsfolder/c/counterflux.txt
+++ b/forge-gui/res/cardsfolder/c/counterflux.txt
@@ -3,6 +3,6 @@ ManaCost:U U R
 Types:Instant
 K:CARDNAME can't be countered.
 A:SP$ Counter | Cost$ U U R | TargetType$ Spell | TgtPrompt$ Select target spell you don't control. | ValidTgts$ Card.YouDontCtrl | SpellDescription$ Counter target spell you don't control.
-A:SP$ Counter | Cost$ 1 U U R | AllType$ Spell | AllValid$ Card.YouDontCtrl | PrecostDesc$ Overload | CostDesc$ 1 U U R | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
+A:SP$ Counter | Cost$ 1 U U R | AllType$ Spell | AllValid$ Card.YouDontCtrl | PrecostDesc$ Overload | CostDesc$ {1}{U}{U}{R} | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/counterflux.jpg
 Oracle:Counterflux can't be countered by spells or abilities.\nCounter target spell you don't control.\nOverload {1}{U}{U}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/cyclonic_rift.txt b/forge-gui/res/cardsfolder/c/cyclonic_rift.txt
index ca21049ee4d..eeb1a78745a 100644
--- a/forge-gui/res/cardsfolder/c/cyclonic_rift.txt
+++ b/forge-gui/res/cardsfolder/c/cyclonic_rift.txt
@@ -2,6 +2,6 @@ Name:Cyclonic Rift
 ManaCost:1 U
 Types:Instant
 A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Permanent.nonLand+YouDontCtrl | TgtPrompt$ Select target nonland permanent you don't control | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target nonland permanent you don't control to its owner's hand.
-A:SP$ ChangeZoneAll | Cost$ 6 U | ChangeType$ Permanent.nonLand+YouDontCtrl | Origin$ Battlefield | Destination$ Hand | PrecostDesc$ Overload | CostDesc$ 6 U | NonBasicSpell$ True | SpellDescription$ (Return each nonland permanent you don't control to its owner's hand.)
+A:SP$ ChangeZoneAll | Cost$ 6 U | ChangeType$ Permanent.nonLand+YouDontCtrl | Origin$ Battlefield | Destination$ Hand | PrecostDesc$ Overload | CostDesc$ {6}{U} | NonBasicSpell$ True | SpellDescription$ (Return each nonland permanent you don't control to its owner's hand.)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cyclonic_rift.jpg
 Oracle:Return target nonland permanent you don't control to its owner's hand.\nOverload {6}{U} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/downsize.txt b/forge-gui/res/cardsfolder/d/downsize.txt
index 0b7e6f338e6..00310b95009 100644
--- a/forge-gui/res/cardsfolder/d/downsize.txt
+++ b/forge-gui/res/cardsfolder/d/downsize.txt
@@ -2,6 +2,6 @@ Name:Downsize
 ManaCost:U
 Types:Instant
 A:SP$ Pump | Cost$ U | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | NumAtt$ -4 | SpellDescription$ Target creature you don't control gets -4/-0 until end of turn.
-A:SP$ PumpAll | Cost$ 2 U | ValidCards$ Creature.YouDontCtrl | ValidDescription$ each creature you don't control. | NumAtt$ -4 | PrecostDesc$ Overload | CostDesc$ 2 U | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
+A:SP$ PumpAll | Cost$ 2 U | ValidCards$ Creature.YouDontCtrl | ValidDescription$ each creature you don't control. | NumAtt$ -4 | PrecostDesc$ Overload | CostDesc$ {2}{U} | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/downsize.jpg
 Oracle:Target creature you don't control gets -4/-0 until end of turn.\nOverload {2}{U} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/dragonshift.txt b/forge-gui/res/cardsfolder/d/dragonshift.txt
index 200bf1f0ddf..4d5a36b214c 100644
--- a/forge-gui/res/cardsfolder/d/dragonshift.txt
+++ b/forge-gui/res/cardsfolder/d/dragonshift.txt
@@ -2,7 +2,7 @@ Name:Dragonshift
 ManaCost:1 U R
 Types:Instant
 A:SP$ Animate | Cost$ 1 U R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature | Power$ 4 | Toughness$ 4 | Keywords$ Flying | RemoveAllAbilities$ True | Colors$ Blue,Red | OverwriteColors$ True | Types$ Dragon | RemoveCreatureTypes$ True | SpellDescription$ Until end of turn, target creature you control becomes a 4/4 blue and red Dragon, loses all abilites, and gains flying.
-A:SP$ AnimateAll | Cost$ 3 U U R R | ValidCards$ Creature.YouCtrl | Power$ 4 | Toughness$ 4 | Keywords$ Flying | RemoveAllAbilities$ True | Colors$ Blue,Red | OverwriteColors$ True | Types$ Dragon | RemoveCreatureTypes$ True | PrecostDesc$ Overload | CostDesc$ 3 U U R R | NonBasicSpell$ True | SpellDescription$ Until end of turn, each creature you control becomes a 4/4 blue and red Dragon, loses all abilites, and gains flying.
+A:SP$ AnimateAll | Cost$ 3 U U R R | ValidCards$ Creature.YouCtrl | Power$ 4 | Toughness$ 4 | Keywords$ Flying | RemoveAllAbilities$ True | Colors$ Blue,Red | OverwriteColors$ True | Types$ Dragon | RemoveCreatureTypes$ True | PrecostDesc$ Overload | CostDesc$ {3}{U}{U}{R}{R} | NonBasicSpell$ True | SpellDescription$ Until end of turn, each creature you control becomes a 4/4 blue and red Dragon, loses all abilites, and gains flying.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dragonshift.jpg
 Oracle:Until end of turn, target creature you control becomes a 4/4 blue and red Dragon, loses all abilities, and gains flying.\nOverload {3}{U}{U}{R}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.")
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/d/dreams_grip.txt b/forge-gui/res/cardsfolder/d/dreams_grip.txt
index 07984b8b892..3fb2f0ad0a8 100644
--- a/forge-gui/res/cardsfolder/d/dreams_grip.txt
+++ b/forge-gui/res/cardsfolder/d/dreams_grip.txt
@@ -3,7 +3,7 @@ ManaCost:U
 Types:Instant
 A:SP$ Tap | Cost$ U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to tap | SpellDescription$ Choose one: Tap target permanent;
 A:SP$ Untap | Cost$ U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to untap | SpellDescription$ or untap target permanent.
-A:SP$ Tap | Cost$ 1 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to tap | SubAbility$ DBUntap | PrecostDesc$ Entwine | CostDesc$ 1 | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
+A:SP$ Tap | Cost$ 1 U | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to tap | SubAbility$ DBUntap | PrecostDesc$ Entwine | CostDesc$ {1} | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
 SVar:DBUntap:DB$ Untap | Cost$ 0 | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to untap
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dreams_grip.jpg
diff --git a/forge-gui/res/cardsfolder/d/dynacharge.txt b/forge-gui/res/cardsfolder/d/dynacharge.txt
index 0c45306bf2a..bede39999ad 100644
--- a/forge-gui/res/cardsfolder/d/dynacharge.txt
+++ b/forge-gui/res/cardsfolder/d/dynacharge.txt
@@ -2,6 +2,6 @@ Name:Dynacharge
 ManaCost:R
 Types:Instant
 A:SP$ Pump | Cost$ R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control. | NumAtt$ 2 | SpellDescription$ Target creature you control gets +2/+0 until end of turn.
-A:SP$ PumpAll | Cost$ 2 R | ValidCards$ Creature.YouCtrl | NumAtt$ 2 | PrecostDesc$ Overload | CostDesc$ 2 R | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
+A:SP$ PumpAll | Cost$ 2 R | ValidCards$ Creature.YouCtrl | NumAtt$ 2 | PrecostDesc$ Overload | CostDesc$ {2}{R} | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dynacharge.jpg
 Oracle:Target creature you control gets +2/+0 until end of turn.\nOverload {2}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/e/electrickery.txt b/forge-gui/res/cardsfolder/e/electrickery.txt
index 5b609d13054..c1987a94adb 100644
--- a/forge-gui/res/cardsfolder/e/electrickery.txt
+++ b/forge-gui/res/cardsfolder/e/electrickery.txt
@@ -2,6 +2,6 @@ Name:Electrickery
 ManaCost:R
 Types:Instant
 A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control. | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature you don't control.
-A:SP$ DamageAll | Cost$ 1 R | ValidCards$ Creature.YouDontCtrl | NumDmg$ 1 | PrecostDesc$ Overload | CostDesc$ 1 R | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
+A:SP$ DamageAll | Cost$ 1 R | ValidCards$ Creature.YouDontCtrl | NumDmg$ 1 | PrecostDesc$ Overload | CostDesc$ {1}{R} | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/electrickery.jpg
 Oracle:Electrickery deals 1 damage to target creature you don't control.\nOverload {1}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/grab_the_reins.txt b/forge-gui/res/cardsfolder/g/grab_the_reins.txt
index 275248123c5..f15efad8393 100644
--- a/forge-gui/res/cardsfolder/g/grab_the_reins.txt
+++ b/forge-gui/res/cardsfolder/g/grab_the_reins.txt
@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Instant
 A:SP$ GainControl | Cost$ 3 R | ValidTgts$ Creature | TgtPrompt$ Select target creature to gain control of | LoseControl$ EOT | AddKWs$ Haste | SpellDescription$ Choose one - Until end of turn, you gain control of target creature and it gains haste;
 A:SP$ Sacrifice | Cost$ 3 R | Amount$ 1 | SacValid$ Creature | RememberSacrificed$ True | SubAbility$ GrabDmg | SpellDescription$ or sacrifice a creature, then CARDNAME deals damage equal to that creature's power to target creature or player.
-A:SP$ GainControl | Cost$ 5 R R | ValidTgts$ Creature | TgtPrompt$ Select target creature to gain control of | LoseControl$ EOT | AddKWs$ Haste | NonBasicSpell$ True | SubAbility$ GrabASacrifice | PrecostDesc$ Entwine | CostDesc$ 2 R | SpellDescription$ (Choose both if you pay the entwine cost.)
+A:SP$ GainControl | Cost$ 5 R R | ValidTgts$ Creature | TgtPrompt$ Select target creature to gain control of | LoseControl$ EOT | AddKWs$ Haste | NonBasicSpell$ True | SubAbility$ GrabASacrifice | PrecostDesc$ Entwine | CostDesc$ {2}{R} | SpellDescription$ (Choose both if you pay the entwine cost.)
 SVar:GrabASacrifice:DB$ Sacrifice | Amount$ 1 | SacValid$ Creature | RememberSacrificed$ True | SubAbility$ GrabDmg
 SVar:GrabDmg:DB$DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to deal the damage to | NumDmg$ X | SubAbility$ DBCleanup | References$ X
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/h/homing_sliver.txt b/forge-gui/res/cardsfolder/h/homing_sliver.txt
index 57d7e13f677..362fd2b7501 100644
--- a/forge-gui/res/cardsfolder/h/homing_sliver.txt
+++ b/forge-gui/res/cardsfolder/h/homing_sliver.txt
@@ -4,7 +4,7 @@ Types:Creature Sliver
 PT:2/2
 K:TypeCycling:Sliver:3
 S:Mode$ Continuous | Affected$ Sliver | EffectZone$ Battlefield | AffectedZone$ Hand | AddAbility$ SliverCycling | Description$ Each Sliver card in each player's hand has slivercycling {3}.
-SVar:SliverCycling:AB$ ChangeZone | Cost$ 3 Discard<1/CARDNAME> | ActivationZone$ Hand | PrecostDesc$ Slivercycling | CostDesc$ 3 | Origin$ Library | Destination$ Hand | ChangeType$ Sliver | ChangeNum$ 1 | SpellDescription$ (3, Discard this card: Search your library for a Sliver card, reveal it, and put it into your hand. Then shuffle your library.)
+SVar:SliverCycling:AB$ ChangeZone | Cost$ 3 Discard<1/CARDNAME> | ActivationZone$ Hand | PrecostDesc$ Slivercycling | CostDesc$ {3} | Origin$ Library | Destination$ Hand | ChangeType$ Sliver | ChangeNum$ 1 | SpellDescription$ (3, Discard this card: Search your library for a Sliver card, reveal it, and put it into your hand. Then shuffle your library.)
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/homing_sliver.jpg
 Oracle:Each Sliver card in each player's hand has slivercycling {3}.\nSlivercycling {3} ({3}, Discard this card: Search your library for a Sliver card, reveal it, and put it into your hand. Then shuffle your library.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/i/incite_war.txt b/forge-gui/res/cardsfolder/i/incite_war.txt
index 3624827411e..e06b5bdec24 100644
--- a/forge-gui/res/cardsfolder/i/incite_war.txt
+++ b/forge-gui/res/cardsfolder/i/incite_war.txt
@@ -4,7 +4,7 @@ Types:Instant
 A:SP$ Effect | Cost$ 2 R | Name$ Incite War Effect | ValidTgts$ Player | TgtPrompt$ Select target player | StaticAbilities$ MustAttack | References$ MustAttack | RememberObjects$ Targeted | PreCostDesc$ Choose one : | SpellDescription$ Creatures target player controls attack this turn if able;
 SVar:MustAttack:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ CARDNAME attacks each turn if able. | Description$ Creatures target player controls attack this turn if able.
 A:SP$ PumpAll | Cost$ 2 R | ValidCards$ Creature.YouCtrl | KW$ First Strike | SpellDescription$ or creatures you control gain first strike until end of turn.
-A:SP$ Effect | Cost$ 4 R | Name$ Incite War Effect | ValidTgts$ Player | TgtPrompt$ Select target player | StaticAbilities$ MustAttack | References$ MustAttack | RememberObjects$ Targeted | PrecostDesc$ Entwine | CostDesc$ 2 | SubAbility$ DBPumpAll | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
+A:SP$ Effect | Cost$ 4 R | Name$ Incite War Effect | ValidTgts$ Player | TgtPrompt$ Select target player | StaticAbilities$ MustAttack | References$ MustAttack | RememberObjects$ Targeted | PrecostDesc$ Entwine | CostDesc$ {2} | SubAbility$ DBPumpAll | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ First Strike
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/incite_war.jpg
diff --git a/forge-gui/res/cardsfolder/i/infernal_darkness.txt b/forge-gui/res/cardsfolder/i/infernal_darkness.txt
index b8b53829e82..7cf9e7eb01a 100644
--- a/forge-gui/res/cardsfolder/i/infernal_darkness.txt
+++ b/forge-gui/res/cardsfolder/i/infernal_darkness.txt
@@ -1,7 +1,7 @@
 Name:Infernal Darkness
 ManaCost:2 B B
 Types:Enchantment
-K:Cumulative upkeep:B PayLife<1>:Pay B and 1 life.
+K:Cumulative upkeep:B PayLife<1>:Pay {B} and 1 life.
 R:Event$ ProduceMana | ActiveZones$ Battlefield | ValidCard$ Land | ManaReplacement$ ProduceB | Description$ If a land is tapped for mana, it produces {B} instead of any other type.
 SVar:ProduceB:Colorless->B & U->B & R->B & G->B & W->B
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/j/journey_of_discovery.txt b/forge-gui/res/cardsfolder/j/journey_of_discovery.txt
index 39a0c561d89..e4261e868d8 100644
--- a/forge-gui/res/cardsfolder/j/journey_of_discovery.txt
+++ b/forge-gui/res/cardsfolder/j/journey_of_discovery.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 2 G | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | PreCostDesc$ Choose one : | SpellDescription$ Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle your library;
 A:SP$ Effect | Cost$ 2 G | Name$ Journey of Discovery Effect | StaticAbilities$ JourneyOfDis | AILogic$ Always | SpellDescription$ or you may play up to two additional lands this turn.
-A:SP$ ChangeZone | Cost$ 4 G G | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | PrecostDesc$ Entwine | CostDesc$ 2 G | SubAbility$ DBEffect | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
+A:SP$ ChangeZone | Cost$ 4 G G | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | PrecostDesc$ Entwine | CostDesc$ {2}{G} | SubAbility$ DBEffect | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
 SVar:DBEffect:DB$ Effect | Cost$ 0 | Name$ Journey of Discovery Effect | StaticAbilities$ JourneyOfDis | AILogic$ Always
 SVar:JourneyOfDis:Mode$ Continuous | Affected$ You | AddKeyword$ AdjustLandPlays:2 | EffectZone$ Command | Description$ You may play two additional lands this turn.
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/m/mizzium_mortars.txt b/forge-gui/res/cardsfolder/m/mizzium_mortars.txt
index d69209001a1..8c5f53321d2 100644
--- a/forge-gui/res/cardsfolder/m/mizzium_mortars.txt
+++ b/forge-gui/res/cardsfolder/m/mizzium_mortars.txt
@@ -2,6 +2,6 @@ Name:Mizzium Mortars
 ManaCost:1 R
 Types:Sorcery
 A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature you don't control.
-A:SP$ DamageAll | Cost$ 3 R R R | NumDmg$ 4 | ValidCards$ Creature.YouDontCtrl | ValidDescription$ each creature you don't control. | PrecostDesc$ Overload | CostDesc$ 3 R R R | NonBasicSpell$ True | SpellDescription$ (CARDNAME deals 4 damage to each creature you don't control.)
+A:SP$ DamageAll | Cost$ 3 R R R | NumDmg$ 4 | ValidCards$ Creature.YouDontCtrl | ValidDescription$ each creature you don't control. | PrecostDesc$ Overload | CostDesc$ {3}{R}{R}{R} | NonBasicSpell$ True | SpellDescription$ (CARDNAME deals 4 damage to each creature you don't control.)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mizzium_mortars.jpg
 Oracle:Mizzium Mortars deals 4 damage to target creature you don't control.\nOverload {3}{R}{R}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/mizzium_skin.txt b/forge-gui/res/cardsfolder/m/mizzium_skin.txt
index e5e9f4ac223..12fb14eae5b 100644
--- a/forge-gui/res/cardsfolder/m/mizzium_skin.txt
+++ b/forge-gui/res/cardsfolder/m/mizzium_skin.txt
@@ -2,6 +2,6 @@ Name:Mizzium Skin
 ManaCost:U
 Types:Instant
 A:SP$ Pump | Cost$ U | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumDef$ +1 | KW$ Hexproof | SpellDescription$ Target creature you control gets +0/+1 and gains hexproof until end of turn.
-A:SP$ PumpAll | Cost$ 1 U | ValidCards$ Creature.YouCtrl | ValidDescription$ each creature you control. | NumDef$ +1 | KW$ Hexproof | PrecostDesc$ Overload | CostDesc$ 1 U | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
+A:SP$ PumpAll | Cost$ 1 U | ValidCards$ Creature.YouCtrl | ValidDescription$ each creature you control. | NumDef$ +1 | KW$ Hexproof | PrecostDesc$ Overload | CostDesc$ {1}{U} | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mizzium_skin.jpg
 Oracle:Target creature you control gets +0/+1 and gains hexproof until end of turn.\nOverload {1}{U} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/n/naked_singularity.txt b/forge-gui/res/cardsfolder/n/naked_singularity.txt
index 52ee325b766..0fa905a17a4 100644
--- a/forge-gui/res/cardsfolder/n/naked_singularity.txt
+++ b/forge-gui/res/cardsfolder/n/naked_singularity.txt
@@ -1,7 +1,7 @@
 Name:Naked Singularity
 ManaCost:5
 Types:Artifact
-Text:If tapped for mana, Plains produce R, Islands produce G, Swamps produce W, Mountains produce U, and Forests produce B instead of any other type.
+Text:If tapped for mana, Plains produce {R}, Islands produce {G}, Swamps produce {W}, Mountains produce {U}, and Forests produce {B} instead of any other type.
 K:Cumulative upkeep:3
 R:Event$ ProduceMana | ActiveZones$ Battlefield | ValidCard$ Plains | ManaReplacement$ ProduceR | Secondary$ True | Description$ If tapped for mana, Plains produce R.
 SVar:ProduceR:Colorless->R & B->R & U->R & G->R & W->R
diff --git a/forge-gui/res/cardsfolder/o/one_dozen_eyes.txt b/forge-gui/res/cardsfolder/o/one_dozen_eyes.txt
index 7077ebdb84e..4ff70bc1a81 100644
--- a/forge-gui/res/cardsfolder/o/one_dozen_eyes.txt
+++ b/forge-gui/res/cardsfolder/o/one_dozen_eyes.txt
@@ -3,7 +3,7 @@ ManaCost:5 G
 Types:Sorcery
 A:SP$ Token | Cost$ 5 G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | SpellDescription$ Choose one - Put a 5/5 green Beast creature token onto the battlefield;
 A:SP$ Token | Cost$ 5 G | TokenAmount$ 5 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ or put five 1/1 green Insect creature tokens onto the battlefield.
-A:SP$ Token | Cost$ 5 G G G G | PrecostDesc$ Entwine | CostDesc$ G G G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ DBToken2
+A:SP$ Token | Cost$ 5 G G G G | PrecostDesc$ Entwine | CostDesc$ {G}{G}{G} | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ DBToken2
 SVar:DBToken2:DB$Token | TokenAmount$ 5 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/one_dozen_eyes.jpg
 Oracle:Choose one - Put a 5/5 green Beast creature token onto the battlefield; or put five 1/1 green Insect creature tokens onto the battlefield.\nEntwine {G}{G}{G} (Choose both if you pay the entwine cost.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/promise_of_power.txt b/forge-gui/res/cardsfolder/p/promise_of_power.txt
index 7e8575f3cb4..a244970f145 100644
--- a/forge-gui/res/cardsfolder/p/promise_of_power.txt
+++ b/forge-gui/res/cardsfolder/p/promise_of_power.txt
@@ -3,7 +3,7 @@ ManaCost:2 B B B
 Types:Sorcery
 A:SP$ Draw | Cost$ 2 B B B | NumCards$ 5 | SpellDescription$ Choose one - You draw five cards and you lose 5 life; | SubAbility$ DBLoseLife
 A:SP$ Token | Cost$ 2 B B B | TokenAmount$ 1 | TokenName$ Demon | TokenTypes$ Creature,Demon | TokenOwner$ You | TokenColors$ Black | TokenKeywords$ Flying | TokenPower$ X | TokenToughness$ X | References$ X | SpellDescription$ or put an X/X black Demon creature token with flying onto the battlefield, where X is the number of cards in your hand as the token enters the battlefield.
-A:SP$ Draw | Cost$ 6 B B B | NumCards$ 5 | PrecostDesc$ Entwine | CostDesc$ 4 | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ DBLoseLife2
+A:SP$ Draw | Cost$ 6 B B B | NumCards$ 5 | PrecostDesc$ Entwine | CostDesc$ {4} | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.) | SubAbility$ DBLoseLife2
 SVar:DBLoseLife:DB$LoseLife | LifeAmount$ 5
 SVar:DBLoseLife2:DB$LoseLife | LifeAmount$ 5 | SubAbility$ DBToken
 SVar:DBToken:DB$Token | TokenAmount$ 1 | TokenName$ Demon | TokenTypes$ Creature,Demon | TokenOwner$ You | TokenColors$ Black | TokenKeywords$ Flying | TokenPower$ X | TokenToughness$ X
diff --git a/forge-gui/res/cardsfolder/r/rain_of_rust.txt b/forge-gui/res/cardsfolder/r/rain_of_rust.txt
index 7500bc0a2eb..2368809a9bf 100644
--- a/forge-gui/res/cardsfolder/r/rain_of_rust.txt
+++ b/forge-gui/res/cardsfolder/r/rain_of_rust.txt
@@ -3,7 +3,7 @@ ManaCost:3 R R
 Types:Instant
 A:SP$ Destroy | Cost$ 3 R R | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | PrecostDesc$ Choose one - | SpellDescription$ Destroy target artifact;
 A:SP$ Destroy | Cost$ 3 R R | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ or destroy target land.
-A:SP$ Destroy | Cost$ 6 R R R | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ DBDestroy | PrecostDesc$ Entwine | CostDesc$ 3 R | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
+A:SP$ Destroy | Cost$ 6 R R R | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SubAbility$ DBDestroy | PrecostDesc$ Entwine | CostDesc$ {3}{R} | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
 SVar:DBDestroy:DB$Destroy | ValidTgts$ Land | TgtPrompt$ Select target land
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rain_of_rust.jpg
diff --git a/forge-gui/res/cardsfolder/r/rude_awakening.txt b/forge-gui/res/cardsfolder/r/rude_awakening.txt
index 4ed6a54112b..40511b03352 100644
--- a/forge-gui/res/cardsfolder/r/rude_awakening.txt
+++ b/forge-gui/res/cardsfolder/r/rude_awakening.txt
@@ -3,7 +3,7 @@ ManaCost:4 G
 Types:Sorcery
 A:SP$ UntapAll | Cost$ 4 G | ValidCards$ Land.YouCtrl | PreCostDesc$ Choose one : | SpellDescription$ Untap all lands you control;
 A:SP$ AnimateAll | Cost$ 4 G | ValidCards$ Land.YouCtrl | Power$ 2 | Toughness$ 2 | Types$ Creature | SpellDescription$ or until end of turn, lands you control become 2/2 creatures that are still lands.
-A:SP$ UntapAll | Cost$ 6 G G | ValidCards$ Land.YouCtrl | PrecostDesc$ Entwine | CostDesc$ 2 G | SubAbility$ DBAnimate | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
+A:SP$ UntapAll | Cost$ 6 G G | ValidCards$ Land.YouCtrl | PrecostDesc$ Entwine | CostDesc$ {2}{G} | SubAbility$ DBAnimate | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
 SVar:DBAnimate:DB$AnimateAll | ValidCards$ Land.YouCtrl | Power$ 2 | Toughness$ 2 | Types$ Creature
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rude_awakening.jpg
diff --git a/forge-gui/res/cardsfolder/s/savage_beating.txt b/forge-gui/res/cardsfolder/s/savage_beating.txt
index 5dc1cee943a..a11fcd392a3 100644
--- a/forge-gui/res/cardsfolder/s/savage_beating.txt
+++ b/forge-gui/res/cardsfolder/s/savage_beating.txt
@@ -4,7 +4,7 @@ Types:Instant
 Text:Cast CARDNAME only during your turn and only during combat.
 A:SP$ PumpAll | Cost$ 3 R R | ValidCards$ Creature.YouCtrl | KW$ Double Strike | PlayerTurn$ True | ActivationPhases$ BeginCombat->EndCombat | PreCostDesc$ Choose one : | SpellDescription$ Creatures you control gain double strike until end of turn;
 A:SP$ UntapAll | Cost$ 3 R R | ValidCards$ Creature.YouCtrl | PlayerTurn$ True | ActivationPhases$ BeginCombat->EndCombat | SubAbility$ DBAddCombat | SpellDescription$ or untap all creatures you control and after this phase, there is an additional combat phase.
-A:SP$ PumpAll | Cost$ 4 R R R | ValidCards$ Creature.YouCtrl | KW$ Double Strike | PlayerTurn$ True | ActivationPhases$ BeginCombat->EndCombat | PrecostDesc$ Entwine | CostDesc$ 1 R | SubAbility$ DBUntapAll | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
+A:SP$ PumpAll | Cost$ 4 R R R | ValidCards$ Creature.YouCtrl | KW$ Double Strike | PlayerTurn$ True | ActivationPhases$ BeginCombat->EndCombat | PrecostDesc$ Entwine | CostDesc$ {1}{R} | SubAbility$ DBUntapAll | NonBasicSpell$ True | SpellDescription$ (Choose both if you pay the entwine cost.)
 SVar:DBUntapAll:DB$ UntapAll | ValidCards$ Creature.YouCtrl | SubAbility$ DBAddCombat
 SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ BeginCombat | AfterPhase$ EndCombat
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/s/sedris_the_traitor_king.txt b/forge-gui/res/cardsfolder/s/sedris_the_traitor_king.txt
index 1ac5ec712cb..595fcc368e1 100644
--- a/forge-gui/res/cardsfolder/s/sedris_the_traitor_king.txt
+++ b/forge-gui/res/cardsfolder/s/sedris_the_traitor_king.txt
@@ -3,7 +3,7 @@ ManaCost:3 U B R
 Types:Legendary Creature Zombie Warrior
 PT:5/5
 S:Mode$ Continuous | EffectZone$ Battlefield | AffectedZone$ Graveyard | Affected$ Creature.YouCtrl | AddAbility$ Unearth | AddSVar$ Unearthed & TrueDeath & Unavailable | Description$ Each creature card in your graveyard has unearth {2}{B}. ({2}{B}: Return the card to the battlefield. The creature gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-SVar:Unearth:AB$ ChangeZone | Cost$ 2 B | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SorcerySpeed$ True | ActivationZone$ Graveyard | SubAbility$ Unearthed | PrecostDesc$ Unearth | CostDesc$ 2 B | StackDescription$ Unearth: Return CARDNAME to the battlefield. | SpellDescription$ ({2}{B}: Return CARDNAME to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
+SVar:Unearth:AB$ ChangeZone | Cost$ 2 B | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SorcerySpeed$ True | ActivationZone$ Graveyard | SubAbility$ Unearthed | PrecostDesc$ Unearth | CostDesc$ {2}{B} | StackDescription$ Unearth: Return CARDNAME to the battlefield. | SpellDescription$ ({2}{B}: Return CARDNAME to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 SVar:Unearthed:DB$ Pump | Defined$ Self | KW$ Haste & HIDDEN If CARDNAME would leave the battlefield, exile it instead of putting it anywhere else. | Permanent$ True | SubAbility$ TrueDeath | StackDescription$ It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield.
 SVar:TrueDeath:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ Unavailable | TriggerDescription$ Exile CARDNAME at the beginning of the next end step.
 SVar:Unavailable:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile
diff --git a/forge-gui/res/cardsfolder/s/street_spasm.txt b/forge-gui/res/cardsfolder/s/street_spasm.txt
index d6a0c5f6e38..0d25d65d901 100644
--- a/forge-gui/res/cardsfolder/s/street_spasm.txt
+++ b/forge-gui/res/cardsfolder/s/street_spasm.txt
@@ -2,7 +2,7 @@ Name:Street Spasm
 ManaCost:X R
 Types:Instant
 A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature.withoutFlying+YouDontCtrl | TgtPrompt$ Select target flying creature you don't control. | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals X damage to target creature without flying you don't control.
-A:SP$ DamageAll | Cost$ X X R R | ValidCards$ Creature.withoutFlying+YouDontCtrl | NumDmg$ X | References$ X | PrecostDesc$ Overload | CostDesc$ X X R R | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
+A:SP$ DamageAll | Cost$ X X R R | ValidCards$ Creature.withoutFlying+YouDontCtrl | NumDmg$ X | References$ X | PrecostDesc$ Overload | CostDesc$ {X}{X}{R}{R} | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/street_spasm.jpg
 Oracle:Street Spasm deals X damage to target creature without flying you don't control.\nOverload {X}{X}{R}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/t/teleportal.txt b/forge-gui/res/cardsfolder/t/teleportal.txt
index 77179bbeda2..6c5eb811ebb 100644
--- a/forge-gui/res/cardsfolder/t/teleportal.txt
+++ b/forge-gui/res/cardsfolder/t/teleportal.txt
@@ -2,6 +2,6 @@ Name:Teleportal
 ManaCost:U R
 Types:Sorcery
 A:SP$ Pump | Cost$ U R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control. | NumAtt$ 1 | KW$ HIDDEN Unblockable | SpellDescription$ Target creature you control gets +1/+0 until end of turn and can't be blocked this turn.
-A:SP$ PumpAll | Cost$ 3 U R | ValidCards$ Creature.YouCtrl | ValidDescription$ each creature you control. | NumAtt$ 1 | KW$ HIDDEN Unblockable | PrecostDesc$ Overload | CostDesc$ 3 U R | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
+A:SP$ PumpAll | Cost$ 3 U R | ValidCards$ Creature.YouCtrl | ValidDescription$ each creature you control. | NumAtt$ 1 | KW$ HIDDEN Unblockable | PrecostDesc$ Overload | CostDesc$ {3}{U}{R} | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/teleportal.jpg
 Oracle:Target creature you control gets +1/+0 until end of turn and can't be blocked this turn.\nOverload {3}{U}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/v/vandalblast.txt b/forge-gui/res/cardsfolder/v/vandalblast.txt
index cdadfbd4bc2..9feb32efc09 100644
--- a/forge-gui/res/cardsfolder/v/vandalblast.txt
+++ b/forge-gui/res/cardsfolder/v/vandalblast.txt
@@ -2,6 +2,6 @@ Name:Vandalblast
 ManaCost:R
 Types:Sorcery
 A:SP$ Destroy | Cost$ R | ValidTgts$ Artifact.YouDontCtrl | TgtPrompt$ Select target artifact you don't control | SpellDescription$ Destroy target artifact you don't control.
-A:SP$ DestroyAll | Cost$ 4 R | ValidCards$ Artifact.YouDontCtrl | PrecostDesc$ Overload | CostDesc$ 4 R | NonBasicSpell$ True | StackDescription$ Overload (Destroy each artifact you don't control.) | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
+A:SP$ DestroyAll | Cost$ 4 R | ValidCards$ Artifact.YouDontCtrl | PrecostDesc$ Overload | CostDesc$ {4}{R} | NonBasicSpell$ True | StackDescription$ Overload (Destroy each artifact you don't control.) | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vandalblast.jpg
 Oracle:Destroy target artifact you don't control.\nOverload {4}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/w/weapon_surge.txt b/forge-gui/res/cardsfolder/w/weapon_surge.txt
index 6f47d8c6b8a..976dae0d5c3 100644
--- a/forge-gui/res/cardsfolder/w/weapon_surge.txt
+++ b/forge-gui/res/cardsfolder/w/weapon_surge.txt
@@ -2,6 +2,6 @@ Name:Weapon Surge
 ManaCost:R
 Types:Instant
 A:SP$ Pump | Cost$ R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +1 | KW$ First Strike | SpellDescription$ Target creature you control gets +1/+0 and gains first strike until end of turn.
-A:SP$ PumpAll | Cost$ 1 R | ValidCards$ Creature.YouCtrl | ValidDescription$ each creature you control. | NumAtt$ +1 | KW$ First Strike | PrecostDesc$ Overload | CostDesc$ 1 R | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
+A:SP$ PumpAll | Cost$ 1 R | ValidCards$ Creature.YouCtrl | ValidDescription$ each creature you control. | NumAtt$ +1 | KW$ First Strike | PrecostDesc$ Overload | CostDesc$ {1}{R} | NonBasicSpell$ True | SpellDescription$ (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.".)
 SVar:Picture:http://www.wizards.com/global/images/magic/general/weapon_surge.jpg
 Oracle:Target creature you control gets +1/+0 and gains first strike until end of turn.\nOverload {1}{R} (You may cast this spell for its overload cost. If you do, change its text by replacing all instances of "target" with "each.")
\ No newline at end of file