diff --git a/forge-gui/res/cardsfolder/b/bringer_of_the_black_dawn.txt b/forge-gui/res/cardsfolder/b/bringer_of_the_black_dawn.txt
index 2b2a5dd432b..14642032771 100644
--- a/forge-gui/res/cardsfolder/b/bringer_of_the_black_dawn.txt
+++ b/forge-gui/res/cardsfolder/b/bringer_of_the_black_dawn.txt
@@ -3,7 +3,7 @@ ManaCost:7 B B
 Types:Creature Bringer
 PT:5/5
 K:Trample
-SVar:AltCost:Cost$ W U B R G | Description$ You may pay W U B R G rather than pay CARDNAME's mana cost.
+SVar:AltCost:Cost$ W U B R G | Description$ You may pay {W}{U}{B}{R}{G} rather than pay CARDNAME's mana cost.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ At the beginning of your upkeep, you may pay 2 life. If you do, search your library for a card, then shuffle your library and put that card on top of it.
 SVar:TrigChange:AB$ChangeZone | Cost$ PayLife<2> | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Card | ChangeNum$ 1
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/b/bringer_of_the_blue_dawn.txt b/forge-gui/res/cardsfolder/b/bringer_of_the_blue_dawn.txt
index c1d1e9daa8b..b6b417743ca 100644
--- a/forge-gui/res/cardsfolder/b/bringer_of_the_blue_dawn.txt
+++ b/forge-gui/res/cardsfolder/b/bringer_of_the_blue_dawn.txt
@@ -5,6 +5,6 @@ PT:5/5
 K:Trample
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ At the beginning of your upkeep, you may draw two cards.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 2
-SVar:AltCost:Cost$ W U B R G | Description$ You may pay W U B R G rather than pay CARDNAME's mana cost.
+SVar:AltCost:Cost$ W U B R G | Description$ You may pay {W}{U}{B}{R}{G} rather than pay CARDNAME's mana cost.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bringer_of_the_blue_dawn.jpg
 Oracle:You may pay {W}{U}{B}{R}{G} rather than pay Bringer of the Blue Dawn's mana cost.\nTrample\nAt the beginning of your upkeep, you may draw two cards.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/b/bringer_of_the_green_dawn.txt b/forge-gui/res/cardsfolder/b/bringer_of_the_green_dawn.txt
index af48826383c..9c5d9c8ef33 100644
--- a/forge-gui/res/cardsfolder/b/bringer_of_the_green_dawn.txt
+++ b/forge-gui/res/cardsfolder/b/bringer_of_the_green_dawn.txt
@@ -3,7 +3,7 @@ ManaCost:7 G G
 Types:Creature Bringer
 PT:5/5
 K:Trample
-SVar:AltCost:Cost$ W U B R G | Description$ You may pay W U B R G rather than pay CARDNAME's mana cost.
+SVar:AltCost:Cost$ W U B R G | Description$ You may pay {W}{U}{B}{R}{G} rather than pay CARDNAME's mana cost.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, you may put a 3/3 green Beast creature token onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bringer_of_the_green_dawn.jpg
diff --git a/forge-gui/res/cardsfolder/b/bringer_of_the_red_dawn.txt b/forge-gui/res/cardsfolder/b/bringer_of_the_red_dawn.txt
index c5630bb8885..7757aa2fbfc 100644
--- a/forge-gui/res/cardsfolder/b/bringer_of_the_red_dawn.txt
+++ b/forge-gui/res/cardsfolder/b/bringer_of_the_red_dawn.txt
@@ -3,7 +3,7 @@ ManaCost:7 R R
 Types:Creature Bringer
 PT:5/5
 K:Trample
-SVar:AltCost:Cost$ W U B R G | Description$ You may pay W U B R G rather than pay CARDNAME's mana cost.
+SVar:AltCost:Cost$ W U B R G | Description$ You may pay {W}{U}{B}{R}{G} rather than pay CARDNAME's mana cost.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ At the beginning of your upkeep, you may untap target creature and gain control of it until end of turn. That creature gains haste until end of turn.
 SVar:TrigChange:AB$GainControl | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bringer_of_the_red_dawn.jpg
diff --git a/forge-gui/res/cardsfolder/b/bringer_of_the_white_dawn.txt b/forge-gui/res/cardsfolder/b/bringer_of_the_white_dawn.txt
index 23cb767bfb5..88fc1e331f5 100644
--- a/forge-gui/res/cardsfolder/b/bringer_of_the_white_dawn.txt
+++ b/forge-gui/res/cardsfolder/b/bringer_of_the_white_dawn.txt
@@ -3,7 +3,7 @@ ManaCost:7 W W
 Types:Creature Bringer
 PT:5/5
 K:Trample
-SVar:AltCost:Cost$ W U B R G | Description$ You may pay W U B R G rather than pay CARDNAME's mana cost.
+SVar:AltCost:Cost$ W U B R G | Description$ You may pay {W}{U}{B}{R}{G} rather than pay CARDNAME's mana cost.
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ At the beginning of your upkeep, you may return target artifact card from your graveyard to the battlefield.
 SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Artifact.YouCtrl | Cost$ 0
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bringer_of_the_white_dawn.jpg
diff --git a/forge-gui/res/cardsfolder/i/inferno_trap.txt b/forge-gui/res/cardsfolder/i/inferno_trap.txt
index 9acc053dd01..d9097eea414 100644
--- a/forge-gui/res/cardsfolder/i/inferno_trap.txt
+++ b/forge-gui/res/cardsfolder/i/inferno_trap.txt
@@ -2,7 +2,7 @@ Name:Inferno Trap
 ManaCost:3 R
 Types:Instant Trap
 A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
-A:SP$ DealDamage | Cost$ R | CheckSVar$ CreaturesAttacked | SVarCompare$ GE2 | ValidTgts$ Creature | References$ CreaturesAttacked | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ If you've been dealt damage by two or more creatures this turn, you may pay R rather than pay CARDNAME's mana cost.
+A:SP$ DealDamage | Cost$ R | CheckSVar$ CreaturesAttacked | SVarCompare$ GE2 | ValidTgts$ Creature | References$ CreaturesAttacked | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ If you've been dealt damage by two or more creatures this turn, you may pay {R} rather than pay CARDNAME's mana cost.
 SVar:CreaturesAttacked:Count$YourDamageSourcesThisTurn Creature
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/inferno_trap.jpg
diff --git a/forge-gui/res/cardsfolder/l/lavaball_trap.txt b/forge-gui/res/cardsfolder/l/lavaball_trap.txt
index 81a264e7259..391e468ce24 100644
--- a/forge-gui/res/cardsfolder/l/lavaball_trap.txt
+++ b/forge-gui/res/cardsfolder/l/lavaball_trap.txt
@@ -2,7 +2,7 @@ Name:Lavaball Trap
 ManaCost:6 R R
 Types:Instant Trap
 A:SP$Destroy | Cost$ 6 R R | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ DBDamageAll | SpellDescription$ Destroy two target lands. CARDNAME deals 4 damage to each creature.
-A:SP$Destroy | Cost$ 3 R R | CheckSVar$ LandsEntered | SVarCompare$ GE2 | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ DBDamageAll | References$ LandsEntered | SpellDescription$ If an opponent had two or more lands enter the battlefield under his or her control this turn, you may pay 3 R R rather than pay CARDNAME's mana cost.
+A:SP$Destroy | Cost$ 3 R R | CheckSVar$ LandsEntered | SVarCompare$ GE2 | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Land | TgtPrompt$ Select target land. | SubAbility$ DBDamageAll | References$ LandsEntered | SpellDescription$ If an opponent had two or more lands enter the battlefield under his or her control this turn, you may pay {3}{R}{R} rather than pay CARDNAME's mana cost.
 SVar:DBDamageAll:DB$DamageAll | ValidCards$ Creature | NumDmg$ 4 | ValidDescription$ each creature.
 SVar:LandsEntered:Count$ThisTurnEntered_Battlefield_Land.YouDontCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lavaball_trap.jpg
diff --git a/forge-gui/res/cardsfolder/l/lethargy_trap.txt b/forge-gui/res/cardsfolder/l/lethargy_trap.txt
index 83c87906c99..560ba9a8a61 100644
--- a/forge-gui/res/cardsfolder/l/lethargy_trap.txt
+++ b/forge-gui/res/cardsfolder/l/lethargy_trap.txt
@@ -2,6 +2,6 @@ Name:Lethargy Trap
 ManaCost:3 U
 Types:Instant Trap
 A:SP$ PumpAll | Cost$ 3 U | ValidCards$ Creature.attacking | NumAtt$ -3 | IsCurse$ True | SpellDescription$ Attacking creatures get -3/-0 until end of turn.
-A:SP$ PumpAll | Cost$ U | ValidCards$ Creature.attacking | NumAtt$ -3 | IsCurse$ True | IsPresent$ Creature.attacking | PresentCompare$ GE3 | NonBasicSpell$ True | SpellDescription$ If three or more creatures are attacking, you may pay U rather than pay CARDNAME mana cost.
+A:SP$ PumpAll | Cost$ U | ValidCards$ Creature.attacking | NumAtt$ -3 | IsCurse$ True | IsPresent$ Creature.attacking | PresentCompare$ GE3 | NonBasicSpell$ True | SpellDescription$ If three or more creatures are attacking, you may pay {U} rather than pay CARDNAME mana cost.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lethargy_trap.jpg
 Oracle:If three or more creatures are attacking, you may pay {U} rather than pay Lethargy Trap's mana cost.\nAttacking creatures get -3/-0 until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/pitfall_trap.txt b/forge-gui/res/cardsfolder/p/pitfall_trap.txt
index 1048243517f..f2b64409051 100644
--- a/forge-gui/res/cardsfolder/p/pitfall_trap.txt
+++ b/forge-gui/res/cardsfolder/p/pitfall_trap.txt
@@ -1,7 +1,7 @@
 Name:Pitfall Trap
 ManaCost:2 W
 Types:Instant Trap
-A:SP$ Destroy | Cost$ W | ValidTgts$ Creature.attacking+withoutFlying | IsPresent$ Creature.attacking | PresentCompare$ EQ1 | TgtPrompt$ Select target attacking creature without flying | SpellDescription$ If exactly one creature is attacking, you may pay W rather than pay CARDNAME mana cost.
+A:SP$ Destroy | Cost$ W | ValidTgts$ Creature.attacking+withoutFlying | IsPresent$ Creature.attacking | PresentCompare$ EQ1 | TgtPrompt$ Select target attacking creature without flying | SpellDescription$ If exactly one creature is attacking, you may pay {W} rather than pay CARDNAME mana cost.
 A:SP$ Destroy | Cost$ 2 W | ValidTgts$ Creature.attacking+withoutFlying | TgtPrompt$ Select target attacking creature without flying | SpellDescription$ Destroy target attacking creature without flying.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pitfall_trap.jpg
 Oracle:If exactly one creature is attacking, you may pay {W} rather than pay Pitfall Trap's mana cost.\nDestroy target attacking creature without flying.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/r/rooftop_storm.txt b/forge-gui/res/cardsfolder/r/rooftop_storm.txt
index 38d51bfaf64..9a0a306cbff 100644
--- a/forge-gui/res/cardsfolder/r/rooftop_storm.txt
+++ b/forge-gui/res/cardsfolder/r/rooftop_storm.txt
@@ -1,7 +1,7 @@
 Name:Rooftop Storm
 ManaCost:5 U
 Types:Enchantment
-S:Mode$ Continuous | Affected$ Creature.YouCtrl+Zombie | AddHiddenKeyword$ Alternative Cost 0 | AffectedZone$ Hand,Graveyard,Exile,Library,Command | Description$ You may pay 0 rather than pay the mana cost for Zombie creature spells you cast.
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+Zombie | AddHiddenKeyword$ Alternative Cost 0 | AffectedZone$ Hand,Graveyard,Exile,Library,Command | Description$ You may pay {0} rather than pay the mana cost for Zombie creature spells you cast.
 SVar:NonStackingEffect:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rooftop_storm.jpg
diff --git a/forge-gui/res/cardsfolder/r/runeflare_trap.txt b/forge-gui/res/cardsfolder/r/runeflare_trap.txt
index d80cd25e688..ef06d2158ed 100644
--- a/forge-gui/res/cardsfolder/r/runeflare_trap.txt
+++ b/forge-gui/res/cardsfolder/r/runeflare_trap.txt
@@ -1,7 +1,7 @@
 Name:Runeflare Trap
 ManaCost:4 R R
 Types:Instant Trap
-A:SP$DealDamage | Cost$ R | ValidTgts$ Player | NumDmg$ X | CheckSVar$ Y | SVarCompare$ GE3 | References$ X,Y | SpellDescription$ If an opponent drew three or more cards this turn, you may pay R rather than pay CARDNAME's mana cost.
+A:SP$DealDamage | Cost$ R | ValidTgts$ Player | NumDmg$ X | CheckSVar$ Y | SVarCompare$ GE3 | References$ X,Y | SpellDescription$ If an opponent drew three or more cards this turn, you may pay {R} rather than pay CARDNAME's mana cost.
 A:SP$DealDamage | Cost$ 4 R R | ValidTgts$ Player | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals damage to target player equal to the number of cards in that player's hand.
 SVar:X:TargetedPlayer$CardsInHand
 SVar:Y:Count$OppDrewThisTurn