diff --git a/forge-gui/res/cardsfolder/a/abundance.txt b/forge-gui/res/cardsfolder/a/abundance.txt
index 3d655b5c5e0..fc2f7c0a397 100644
--- a/forge-gui/res/cardsfolder/a/abundance.txt
+++ b/forge-gui/res/cardsfolder/a/abundance.txt
@@ -3,8 +3,8 @@ ManaCost:2 G G
 Types:Enchantment
 R:Event$ Draw | ActiveZones$ Battlefield | ValidPlayer$ You | ReplaceWith$ AbundantChoice | Optional$ True | Description$ If you would draw a card, you may instead choose land or nonland and reveal cards from the top of your library until you reveal a card of the chosen kind. Put that card into your hand and put all other cards revealed this way on the bottom of your library in any order.
 SVar:AbundantChoice:AB$ GenericChoice | Cost$ 0 | Choices$ DigLand,DigNonland | Defined$ You
-SVar:DigLand:DB$ DigUntil | Valid$ Card.Land | ValidDescription$ land | FoundDestination$ Hand | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | ChoiceDescription$ Land
-SVar:DigNonland:DB$ DigUntil | Valid$ Card.nonLand | ValidDescription$ nonland | FoundDestination$ Hand | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | ChoiceDescription$ nonLand
+SVar:DigLand:DB$ DigUntil | Valid$ Card.Land | ValidDescription$ land | FoundDestination$ Hand | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | SpellDescription$ Land
+SVar:DigNonland:DB$ DigUntil | Valid$ Card.nonLand | ValidDescription$ nonland | FoundDestination$ Hand | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | SpellDescription$ nonLand
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abundance.jpg
 Oracle:If you would draw a card, you may instead choose land or nonland and reveal cards from the top of your library until you reveal a card of the chosen kind. Put that card into your hand and put all other cards revealed this way on the bottom of your library in any order.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/a/angelic_skirmisher.txt b/forge-gui/res/cardsfolder/a/angelic_skirmisher.txt
index 25fb48df6fd..56f5ddf40f4 100644
--- a/forge-gui/res/cardsfolder/a/angelic_skirmisher.txt
+++ b/forge-gui/res/cardsfolder/a/angelic_skirmisher.txt
@@ -5,8 +5,8 @@ PT:4/4
 K:Flying
 T:Mode$ Phase | Phase$ BeginCombat | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each combat, choose first strike, vigilance or lifelink. Creatures you control gain that ability until end of turn.
 SVar:TrigChoose:AB$ GenericChoice | Cost$ 0 | Choices$ PumpFirstStrike,PumpVigilance,PumpLifelink | Defined$ You
-SVar:PumpFirstStrike:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ First Strike | ChoiceDescription$ First strike
-SVar:PumpVigilance:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Vigilance | ChoiceDescription$ Vigilance
-SVar:PumpLifelink:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Lifelink | ChoiceDescription$ Lifelink
+SVar:PumpFirstStrike:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ First Strike | SpellDescription$ First strike
+SVar:PumpVigilance:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Vigilance | SpellDescription$ Vigilance
+SVar:PumpLifelink:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Lifelink | SpellDescription$ Lifelink
 SVar:Picture:http://www.wizards.com/global/images/magic/general/angelic_skirmisher.jpg
 Oracle:Flying\nAt the beginning of each combat, choose first strike, vigilance, or lifelink. Creatures you control gain that ability until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/a/aquamorph_entity.txt b/forge-gui/res/cardsfolder/a/aquamorph_entity.txt
index 6a5a69f8206..6ff56269eb9 100644
--- a/forge-gui/res/cardsfolder/a/aquamorph_entity.txt
+++ b/forge-gui/res/cardsfolder/a/aquamorph_entity.txt
@@ -6,7 +6,7 @@ K:Morph:2 U
 R:Event$ TurnFaceUp | ValidCard$ Card.Self | ReplaceWith$ MorphChoice | ActiveZones$ Battlefield
 K:ETBReplacement:Other:MorphChoice
 SVar:MorphChoice:DB$ GenericChoice | Defined$ You | Choices$ BigTough,BigPower | SpellDescription$ As CARDNAME enters the battlefield or is turned face up, it becomes your choice of 5/1 or 1/5.
-SVar:BigPower:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 5 | Toughness$ 1 | ChoiceDescription$ CARDNAME is 5/1
-SVar:BigTough:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 1 | Toughness$ 5 | ChoiceDescription$ CARDNAME is 1/5
+SVar:BigPower:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 5 | Toughness$ 1 | SpellDescription$ CARDNAME is 5/1
+SVar:BigTough:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 1 | Toughness$ 5 | SpellDescription$ CARDNAME is 1/5
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aquamorph_entity.jpg
 Oracle:As Aquamorph Entity enters the battlefield or is turned face up, it becomes your choice of 5/1 or 1/5.\nMorph {2}{U} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/a/archangel_of_strife.txt b/forge-gui/res/cardsfolder/a/archangel_of_strife.txt
index a6f0de1728e..ab9ea814d5e 100644
--- a/forge-gui/res/cardsfolder/a/archangel_of_strife.txt
+++ b/forge-gui/res/cardsfolder/a/archangel_of_strife.txt
@@ -6,8 +6,8 @@ K:Flying
 K:ETBReplacement:Other:ChooseEach
 SVar:ChooseEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChoice | SpellDescription$ As CARDNAME enters the battlefield, each player chooses war or peace. Creatures controlled by players who chose war get +3/+0. Creatures controlled by players who chose peace get +0/+3.
 SVar:DBChoice:DB$ GenericChoice | Cost$ 0 | Defined$ Player.IsRemembered | Choices$ WarChoice,PeaceChoice
-SVar:WarChoice:DB$ Effect | Name$ Archangel War Effect | StaticAbilities$ WarPump | ChoiceDescription$ War | EffectOwner$ Player.IsRemembered | Duration$ UntilHostLeavesPlay
-SVar:PeaceChoice:DB$ Effect | Name$ Archangel Peace Effect | StaticAbilities$ PeacePump | ChoiceDescription$ Peace | EffectOwner$ Player.IsRemembered | Duration$ UntilHostLeavesPlay
+SVar:WarChoice:DB$ Effect | Name$ Archangel War Effect | StaticAbilities$ WarPump | SpellDescription$ War | EffectOwner$ Player.IsRemembered | Duration$ UntilHostLeavesPlay
+SVar:PeaceChoice:DB$ Effect | Name$ Archangel Peace Effect | StaticAbilities$ PeacePump | SpellDescription$ Peace | EffectOwner$ Player.IsRemembered | Duration$ UntilHostLeavesPlay
 SVar:WarPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.YouCtrl | AddPower$ 3 | Description$ Creatures you control get +3/+0.
 SVar:PeacePump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.YouCtrl | AddToughness$ 3 | Description$ Creatures you control get +0/+3.
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/c/catastrophe.txt b/forge-gui/res/cardsfolder/c/catastrophe.txt
index 64b666bf763..0e6ce4ce1d6 100644
--- a/forge-gui/res/cardsfolder/c/catastrophe.txt
+++ b/forge-gui/res/cardsfolder/c/catastrophe.txt
@@ -2,7 +2,7 @@ Name:Catastrophe
 ManaCost:4 W W
 Types:Sorcery
 A:SP$ GenericChoice | Cost$ 4 W W | Choices$ DBKillLand,DBKillCreatures | Defined$ You | StackDescription$ SpellDescription | SpellDescription$ Destroy all lands or all creatures. Creatures destroyed this way can't be regenerated.
-SVar:DBKillLand:DB$ DestroyAll | ValidCards$ Land | ChoiceDescription$ Destroy all lands.
-SVar:DBKillCreatures:DB$ DestroyAll | ValidCards$ Creature | NoRegen$ True | ChoiceDescription$ Destroy all creatures. They can't be regenerated.
+SVar:DBKillLand:DB$ DestroyAll | ValidCards$ Land | SpellDescription$ Destroy all lands.
+SVar:DBKillCreatures:DB$ DestroyAll | ValidCards$ Creature | NoRegen$ True | SpellDescription$ Destroy all creatures. They can't be regenerated.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/catastrophe.jpg
 Oracle:Destroy all lands or all creatures. Creatures destroyed this way can't be regenerated.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/covenant_of_minds.txt b/forge-gui/res/cardsfolder/c/covenant_of_minds.txt
index 3f549a5f173..bdf4a5e8be7 100644
--- a/forge-gui/res/cardsfolder/c/covenant_of_minds.txt
+++ b/forge-gui/res/cardsfolder/c/covenant_of_minds.txt
@@ -3,8 +3,8 @@ ManaCost:4 U
 Types:Sorcery
 A:SP$ Dig | Cost$ 4 U | DigNum$ 3 | NoMove$ True | Reveal$ True | DestinationZone$ Library | LibraryPosition$ 0 | LibraryPosition2$ 0 | SubAbility$ DBChoice | RememberRevealed$ True | SpellDescription$ Reveal the top three cards of your library. Target opponent may choose to put those cards into your hand. If he or she doesn't, put those cards into your graveyard and draw five cards.
 SVar:DBChoice:DB$ GenericChoice | ValidTgts$ Opponent | Choices$ CovenantDraw,CovenantMillDraw
-SVar:CovenantDraw:DB$ Draw | Defined$ SourceController | NumCards$ X | References$ X | ChoiceDescription$ You may choose to put those cards into that player's hand.
-SVar:CovenantMillDraw:DB$ Mill | Defined$ SourceController | NumCards$ X | References$ X | SubAbility$ DBDraw | ChoiceDescription$ If you don't, put those cards into that player's graveyard and that player draws five cards.
+SVar:CovenantDraw:DB$ Draw | Defined$ SourceController | NumCards$ X | References$ X | SpellDescription$ You may choose to put those cards into that player's hand.
+SVar:CovenantMillDraw:DB$ Mill | Defined$ SourceController | NumCards$ X | References$ X | SubAbility$ DBDraw | SpellDescription$ If you don't, put those cards into that player's graveyard and that player draws five cards.
 SVar:DBDraw:DB$ Draw | Defined$ SourceController | NumCards$ 5
 SVar:X:Count$RememberedSize
 SVar:Picture:http://www.wizards.com/global/images/magic/general/covenant_of_minds.jpg
diff --git a/forge-gui/res/cardsfolder/d/dismantle.txt b/forge-gui/res/cardsfolder/d/dismantle.txt
index a99b4bd6558..d6304f38566 100644
--- a/forge-gui/res/cardsfolder/d/dismantle.txt
+++ b/forge-gui/res/cardsfolder/d/dismantle.txt
@@ -3,10 +3,10 @@ ManaCost:2 R
 Types:Sorcery
 A:SP$ Destroy | Cost$ 2 R | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | RememberTargets$ True | SubAbility$ DBChoice | SpellDescription$ Destroy target artifact. If that artifact had counters on it, put that many +1/+1 counters or charge counters on an artifact you control.
 SVar:DBChoice:DB$ GenericChoice | Choices$ DBP1P1,DBCharge | ConditionDefined$ Targeted | ConditionPresent$ Card.HasCounters | ConditionCompare$ GE1 | StackDescription$ put that many +1/+1 counters or charge counters on an artifact you control.
-SVar:DBP1P1:DB$ ChooseCard | Choices$ Artifact.YouCtrl | Amount$ 1 | ChoiceDescription$ +1/+1 | SubAbility$ DBPutP1P1
+SVar:DBP1P1:DB$ ChooseCard | Choices$ Artifact.YouCtrl | Amount$ 1 | SpellDescription$ +1/+1 | SubAbility$ DBPutP1P1
 SVar:DBPutP1P1:DB$ PutCounter | Defined$ ChosenCard | CounterType$ P1P1 | CounterNum$ X | References$ X | SubAbility$ DBCleanup
-SVar:DBCharge:DB$ ChooseCard | Choices$ Artifact.YouCtrl | Amount$ 1 | ChoiceDescription$ charge | SubAbility$ DBPutCharge
-SVar:DBPutCharge:DB$ PutCounter | Defined$ ChosenCard | CounterType$ CHARGE | CounterNum$ X | References$ X | ChoiceDescription$ Charge | SubAbility$ DBCleanup
+SVar:DBCharge:DB$ ChooseCard | Choices$ Artifact.YouCtrl | Amount$ 1 | SpellDescription$ charge | SubAbility$ DBPutCharge
+SVar:DBPutCharge:DB$ PutCounter | Defined$ ChosenCard | CounterType$ CHARGE | CounterNum$ X | References$ X | SpellDescription$ Charge | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:RememberedLKI$CardCounters.ALL
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dismantle.jpg
diff --git a/forge-gui/res/cardsfolder/e/ether_well.txt b/forge-gui/res/cardsfolder/e/ether_well.txt
index d555e8ec36d..d95de02caba 100644
--- a/forge-gui/res/cardsfolder/e/ether_well.txt
+++ b/forge-gui/res/cardsfolder/e/ether_well.txt
@@ -4,8 +4,8 @@ Types:Instant
 A:SP$ Pump | Cost$ 3 U | ValidTgts$ Creature | IsCurse$ True | RememberObjects$ Targeted | SubAbility$ DBDefaultAction | StackDescription$ SpellDescription | SpellDescription$ Put target creature on top of its owner's library. If that creature is red, you may put it on the bottom of its owner's library instead.
 SVar:DBDefaultAction:DB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ DBChoose
 SVar:DBChoose:DB$ GenericChoice | Cost$ 0 | Choices$ DBBottomLibChoice,DBTopLibChoice | Defined$ You | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBCleanup
-SVar:DBTopLibChoice:DB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | ChoiceDescription$ Put target creature on top of its owner's library.
-SVar:DBBottomLibChoice:DB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | ChoiceDescription$ If that creature is red, you may put it on the bottom of its owner's library instead.
+SVar:DBTopLibChoice:DB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put target creature on top of its owner's library.
+SVar:DBBottomLibChoice:DB$ ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ If that creature is red, you may put it on the bottom of its owner's library instead.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$Valid Creature.IsRemembered+Red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ether_well.jpg
diff --git a/forge-gui/res/cardsfolder/e/eureka.txt b/forge-gui/res/cardsfolder/e/eureka.txt
index c7361fbbf51..c92c4c6a41a 100644
--- a/forge-gui/res/cardsfolder/e/eureka.txt
+++ b/forge-gui/res/cardsfolder/e/eureka.txt
@@ -5,9 +5,9 @@ A:SP$ Repeat | Cost$ 2 G G | RepeatSubAbility$ ResetCheck | RepeatCheckSVar$ Num
 SVar:ResetCheck:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ Number | Expression$ 0 | SubAbility$ DBRepeatChoice
 SVar:DBRepeatChoice:DB$ RepeatEach | RepeatSubAbility$ DBChoice | RepeatPlayers$ Player
 SVar:DBChoice:DB$ GenericChoice | Choices$ DBCheckHand,DBNoChange | Defined$ Player.IsRemembered
-SVar:DBCheckHand:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ CountSVar | Expression$ NumPlayerGiveup/Plus.1 | ConditionCheckSVar$ CheckHand | ConditionSVarCompare$ EQ0 | SubAbility$ DBChoose | ChoiceDescription$ Choose a permanent to put onto the battlefield
+SVar:DBCheckHand:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ CountSVar | Expression$ NumPlayerGiveup/Plus.1 | ConditionCheckSVar$ CheckHand | ConditionSVarCompare$ EQ0 | SubAbility$ DBChoose | SpellDescription$ Choose a permanent to put onto the battlefield
 SVar:DBChoose:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Permanent.IsNotRemembered+RememberedPlayerCtrl | ChoiceZone$ Hand | Amount$ 1 | RememberChosen$ True | Mandatory$ True | ConditionCheckSVar$ CheckHand | ConditionSVarCompare$ GE1
-SVar:DBNoChange:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ CountSVar | Expression$ NumPlayerGiveup/Plus.1 | ChoiceDescription$ Do not put a permanent onto the battlefield
+SVar:DBNoChange:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ CountSVar | Expression$ NumPlayerGiveup/Plus.1 | SpellDescription$ Do not put a permanent onto the battlefield
 SVar:DBChangeZoneAll:DB$ ChangeZoneAll | Origin$ Hand | Destination$ Battlefield | ChangeType$ Card.IsRemembered | SubAbility$ FinalReset
 SVar:FinalReset:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ Number | Expression$ 0 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/f/flowstone_sculpture.txt b/forge-gui/res/cardsfolder/f/flowstone_sculpture.txt
index 0349edeb418..2e8d6098da4 100644
--- a/forge-gui/res/cardsfolder/f/flowstone_sculpture.txt
+++ b/forge-gui/res/cardsfolder/f/flowstone_sculpture.txt
@@ -3,9 +3,9 @@ ManaCost:6
 Types:Artifact Creature Shapeshifter
 PT:4/4
 A:AB$ GenericChoice | Cost$ 2 Discard<1/Card> | Choices$ ChooseCounters,ChooseFlying,ChooseFirstStrike,ChooseTrample | SpellDescription$ Put a +1/+1 counter on CARDNAME or CARDNAME gains flying, first strike, or trample. (This effect lasts indefinitely.)
-SVar:ChooseCounters:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | ChoiceDescription$ Put a +1/+1 counter on CARDNAME.
-SVar:ChooseFlying:DB$ Pump | Defined$ Self | KW$ Flying | Permanent$ True | ChoiceDescription$ CARDNAME gains flying.
-SVar:ChooseFirstStrike:DB$ Pump | Defined$ Self | KW$ First Strike | Permanent$ True | ChoiceDescription$ CARDNAME gains first strike.
-SVar:ChooseTrample:DB$ Pump | Defined$ Self | KW$ Trample | Permanent$ True | ChoiceDescription$ CARDNAME gains trample.
+SVar:ChooseCounters:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
+SVar:ChooseFlying:DB$ Pump | Defined$ Self | KW$ Flying | Permanent$ True | SpellDescription$ CARDNAME gains flying.
+SVar:ChooseFirstStrike:DB$ Pump | Defined$ Self | KW$ First Strike | Permanent$ True | SpellDescription$ CARDNAME gains first strike.
+SVar:ChooseTrample:DB$ Pump | Defined$ Self | KW$ Trample | Permanent$ True | SpellDescription$ CARDNAME gains trample.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flowstone_sculpture.jpg
 Oracle:{2}, Discard a card: Put a +1/+1 counter on Flowstone Sculpture or Flowstone Sculpture gains flying, first strike, or trample. (This effect lasts indefinitely.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/frankensteins_monster.txt b/forge-gui/res/cardsfolder/f/frankensteins_monster.txt
index 895a6418354..4e087dd299c 100644
--- a/forge-gui/res/cardsfolder/f/frankensteins_monster.txt
+++ b/forge-gui/res/cardsfolder/f/frankensteins_monster.txt
@@ -8,9 +8,9 @@ SVar:DBExile:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Graveyard | Destinat
 SVar:Movetoyard:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Graveyard | Defined$ Self | ConditionCheckSVar$ CheckExiled | ConditionSVarCompare$ LTX | References$ CheckExiled,X | Imprint$ True | SubAbility$ ChooseCounters
 SVar:ChooseCounters:DB$ Repeat | MaxRepeat$ X | RepeatSubAbility$ DBChooseCounter | ConditionCheckSVar$ CheckExiled | ConditionSVarCompare$ EQX | References$ CheckExiled,X | SubAbility$ MovetoPlay
 SVar:DBChooseCounter:DB$ GenericChoice | Choices$ SVarP1P1,SVarP2P0,SVarP0P2
-SVar:SVarP1P1:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | ChoiceDescription$ +1/+1
-SVar:SVarP2P0:DB$ PutCounter | CounterType$ P2P0 | CounterNum$ 1 | ChoiceDescription$ +2/+0
-SVar:SVarP0P2:DB$ PutCounter | CounterType$ P0P2 | CounterNum$ 1 | ChoiceDescription$ +0/+2
+SVar:SVarP1P1:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ +1/+1
+SVar:SVarP2P0:DB$ PutCounter | CounterType$ P2P0 | CounterNum$ 1 | SpellDescription$ +2/+0
+SVar:SVarP0P2:DB$ PutCounter | CounterType$ P0P2 | CounterNum$ 1 | SpellDescription$ +0/+2
 SVar:MovetoPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ Self | ConditionDefined$ Imprinted | ConditionPresent$ Card | ConditionCompare$ EQ0 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
 SVar:X:Count$xPaid
diff --git a/forge-gui/res/cardsfolder/g/gabriel_angelfire.txt b/forge-gui/res/cardsfolder/g/gabriel_angelfire.txt
index d16c83f199d..7a98d348b1b 100644
--- a/forge-gui/res/cardsfolder/g/gabriel_angelfire.txt
+++ b/forge-gui/res/cardsfolder/g/gabriel_angelfire.txt
@@ -4,10 +4,10 @@ Types:Legendary Creature Angel
 PT:4/4
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoice | TriggerDescription$ At the beginning of your upkeep, choose flying, first strike, trample, or rampage 3. CARDNAME gains that ability until your next upkeep.
 SVar:TrigChoice:AB$ GenericChoice | Cost$ 0 | Defined$ You | Choices$ SVar1,SVar2,SVar3,SVar4
-SVar:SVar1:DB$ Pump | Defined$ Self | KW$ Flying | UntilYourNextUpkeep$ True | ChoiceDescription$ Flying
-SVar:SVar2:DB$ Pump | Defined$ Self | KW$ First Strike | UntilYourNextUpkeep$ True | ChoiceDescription$ First strike
-SVar:SVar3:DB$ Pump | Defined$ Self | KW$ Trample | UntilYourNextUpkeep$ True | ChoiceDescription$ Trample
-SVar:SVar4:DB$ Pump | Defined$ Self | KW$ Rampage 3 | UntilYourNextUpkeep$ True | ChoiceDescription$ Rampage 3
+SVar:SVar1:DB$ Pump | Defined$ Self | KW$ Flying | UntilYourNextUpkeep$ True | SpellDescription$ Flying
+SVar:SVar2:DB$ Pump | Defined$ Self | KW$ First Strike | UntilYourNextUpkeep$ True | SpellDescription$ First strike
+SVar:SVar3:DB$ Pump | Defined$ Self | KW$ Trample | UntilYourNextUpkeep$ True | SpellDescription$ Trample
+SVar:SVar4:DB$ Pump | Defined$ Self | KW$ Rampage 3 | UntilYourNextUpkeep$ True | SpellDescription$ Rampage 3
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gabriel_angelfire.jpg
 Oracle:At the beginning of your upkeep, choose flying, first strike, trample, or rampage 3. Gabriel Angelfire gains that ability until your next upkeep. (Whenever a creature with rampage 3 becomes blocked, it gets +3/+3 until end of turn for each creature blocking it beyond the first.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/golem_artisan.txt b/forge-gui/res/cardsfolder/g/golem_artisan.txt
index f17954149c3..5bce1f7f175 100644
--- a/forge-gui/res/cardsfolder/g/golem_artisan.txt
+++ b/forge-gui/res/cardsfolder/g/golem_artisan.txt
@@ -4,8 +4,8 @@ Types:Artifact Creature Golem
 PT:3/3
 A:AB$ Pump | Cost$ 2 | ValidTgts$ Creature.Artifact | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target artifact creature gets +1/+1 until end of turn. | TgtPrompt$ Select target artifact creature.
 A:AB$ GenericChoice | Cost$ 2 | ValidTgts$ Creature.Artifact | TgtPrompt$ Select target artifact creature. | Choices$ DBFlying,DBTrample,DBHaste | Defined$ You | SpellDescription$ Target artifact creature gains your choice of flying, trample, or haste until end of turn.
-SVar:DBFlying:DB$ Pump | Defined$ Targeted | KW$ Flying | ChoiceDescription$ Target artifact creature gains flying until end of turn.
-SVar:DBTrample:DB$ Pump | Defined$ Targeted | KW$ Trample | ChoiceDescription$ Target artifact creature gains trample until end of turn.
-SVar:DBHaste:DB$ Pump | Defined$ Targeted | KW$ Haste | ChoiceDescription$ Target artifact creature gains haste until end of turn.
+SVar:DBFlying:DB$ Pump | Defined$ Targeted | KW$ Flying | SpellDescription$ Target artifact creature gains flying until end of turn.
+SVar:DBTrample:DB$ Pump | Defined$ Targeted | KW$ Trample | SpellDescription$ Target artifact creature gains trample until end of turn.
+SVar:DBHaste:DB$ Pump | Defined$ Targeted | KW$ Haste | SpellDescription$ Target artifact creature gains haste until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/golem_artisan.jpg
 Oracle:{2}: Target artifact creature gets +1/+1 until end of turn.\n{2}: Target artifact creature gains your choice of flying, trample, or haste until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/hypergenesis.txt b/forge-gui/res/cardsfolder/h/hypergenesis.txt
index c4523746028..dc0fd8a8981 100644
--- a/forge-gui/res/cardsfolder/h/hypergenesis.txt
+++ b/forge-gui/res/cardsfolder/h/hypergenesis.txt
@@ -7,9 +7,9 @@ A:SP$ Repeat | Cost$ 0 | RepeatSubAbility$ ResetCheck | RepeatCheckSVar$ NumPlay
 SVar:ResetCheck:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ Number | Expression$ 0 | SubAbility$ DBRepeatChoice
 SVar:DBRepeatChoice:DB$ RepeatEach | RepeatSubAbility$ DBChoice | RepeatPlayers$ Player
 SVar:DBChoice:DB$ GenericChoice | Choices$ DBCheckHand,DBNoChange | Defined$ Player.IsRemembered
-SVar:DBCheckHand:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ CountSVar | Expression$ NumPlayerGiveup/Plus.1 | ConditionCheckSVar$ CheckHand | ConditionSVarCompare$ EQ0 | SubAbility$ DBChoose | ChoiceDescription$ Choose an artifact, creature, enchantment, or land card from your hand onto the battlefield
+SVar:DBCheckHand:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ CountSVar | Expression$ NumPlayerGiveup/Plus.1 | ConditionCheckSVar$ CheckHand | ConditionSVarCompare$ EQ0 | SubAbility$ DBChoose | SpellDescription$ Choose an artifact, creature, enchantment, or land card from your hand onto the battlefield
 SVar:DBChoose:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Artifact.IsNotRemembered+RememberedPlayerCtrl,Creature.IsNotRemembered+RememberedPlayerCtrl,Enchantment.IsNotRemembered+RememberedPlayerCtrl,Land.IsNotRemembered+RememberedPlayerCtrl | ChoiceZone$ Hand | Amount$ 1 | RememberChosen$ True | Mandatory$ True | ConditionCheckSVar$ CheckHand | ConditionSVarCompare$ GE1
-SVar:DBNoChange:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ CountSVar | Expression$ NumPlayerGiveup/Plus.1 | ChoiceDescription$ Do not put an artifact, creature, enchantment, or land card from your hand onto the battlefield
+SVar:DBNoChange:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ CountSVar | Expression$ NumPlayerGiveup/Plus.1 | SpellDescription$ Do not put an artifact, creature, enchantment, or land card from your hand onto the battlefield
 SVar:DBChangeZoneAll:DB$ ChangeZoneAll | Origin$ Hand | Defined$ Each | Destination$ Battlefield | ChangeType$ Card.IsRemembered | SubAbility$ FinalReset
 SVar:FinalReset:DB$ StoreSVar | SVar$ NumPlayerGiveup | Type$ Number | Expression$ 0 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/j/jhoiras_timebug.txt b/forge-gui/res/cardsfolder/j/jhoiras_timebug.txt
index a7692e130b7..3db03360826 100644
--- a/forge-gui/res/cardsfolder/j/jhoiras_timebug.txt
+++ b/forge-gui/res/cardsfolder/j/jhoiras_timebug.txt
@@ -3,8 +3,8 @@ ManaCost:2
 Types:Artifact Creature Insect
 PT:1/2
 A:AB$ GenericChoice | Cost$ T | ValidTgts$ Permanent.inZoneBattlefield+YouCtrl,Card.suspended+YouOwn | TgtPrompt$ Choose target permanent you control or suspended card you own | Defined$ You | Choices$ LoseTime,AddTime | TgtZone$ Battlefield,Exile | ConditionDefined$ Targeted | ConditionPresent$ Card.counters_GE1_TIME | ConditionCompare$ GE1 | SpellDescription$ Choose target permanent you control or suspended card you own. If that permanent or card has a time counter on it, you may remove a time counter from it or put another time counter on it.
-SVar:LoseTime:DB$ RemoveCounter | Defined$ Targeted | TgtPrompt$ Select target permanent or suspended card. | CounterType$ TIME | CounterNum$ 1 | ChoiceDescription$ Remove a time counter.
-SVar:AddTime:DB$ PutCounter | Defined$ Targeted | TgtPrompt$ Select target permanent with a time counter on it or suspended card. | CounterType$ TIME | CounterNum$ 1 | TgtZone$ Battlefield,Exile | ChoiceDescription$ Add a time counter.
+SVar:LoseTime:DB$ RemoveCounter | Defined$ Targeted | TgtPrompt$ Select target permanent or suspended card. | CounterType$ TIME | CounterNum$ 1 | SpellDescription$ Remove a time counter.
+SVar:AddTime:DB$ PutCounter | Defined$ Targeted | TgtPrompt$ Select target permanent with a time counter on it or suspended card. | CounterType$ TIME | CounterNum$ 1 | TgtZone$ Battlefield,Exile | SpellDescription$ Add a time counter.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jhoiras_timebug.jpg
 Oracle:{T}: Choose target permanent you control or suspended card you own. If that permanent or card has a time counter on it, you may remove a time counter from it or put another time counter on it.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/j/jodahs_avenger.txt b/forge-gui/res/cardsfolder/j/jodahs_avenger.txt
index e3b4904e253..96eb3a03188 100644
--- a/forge-gui/res/cardsfolder/j/jodahs_avenger.txt
+++ b/forge-gui/res/cardsfolder/j/jodahs_avenger.txt
@@ -3,9 +3,9 @@ ManaCost:5 U
 Types:Creature Shapeshifter
 PT:4/4
 A:AB$ GenericChoice | Cost$ 0 | Choices$ DBDoubleStrike,DBProtection,DBVigilance,DBShadow | SpellDescription$ Until end of turn, CARDNAME gets -1/-1 and gains your choice of double strike, protection from red, vigilance, or shadow.
-SVar:DBDoubleStrike:DB$ Pump | NumAtt$ -1 | NumDef$ -1 | KW$ Double Strike | ChoiceDescription$ CARDNAME gets -1/-1 and gains double strike until end of turn.
-SVar:DBProtection:DB$ Pump | NumAtt$ -1 | NumDef$ -1 | KW$ Protection from red | ChoiceDescription$ CARDNAME gets -1/-1 and gains protection from red until end of turn.
-SVar:DBVigilance:DB$ Pump | NumAtt$ -1 | NumDef$ -1 | KW$ Vigilance | ChoiceDescription$ CARDNAME gets -1/-1 and gains vigilance until end of turn.
-SVar:DBShadow:DB$ Pump | NumAtt$ -1 | NumDef$ -1 | KW$ Shadow | ChoiceDescription$ CARDNAME gets -1/-1 and gains shadow until end of turn.
+SVar:DBDoubleStrike:DB$ Pump | NumAtt$ -1 | NumDef$ -1 | KW$ Double Strike | SpellDescription$ CARDNAME gets -1/-1 and gains double strike until end of turn.
+SVar:DBProtection:DB$ Pump | NumAtt$ -1 | NumDef$ -1 | KW$ Protection from red | SpellDescription$ CARDNAME gets -1/-1 and gains protection from red until end of turn.
+SVar:DBVigilance:DB$ Pump | NumAtt$ -1 | NumDef$ -1 | KW$ Vigilance | SpellDescription$ CARDNAME gets -1/-1 and gains vigilance until end of turn.
+SVar:DBShadow:DB$ Pump | NumAtt$ -1 | NumDef$ -1 | KW$ Shadow | SpellDescription$ CARDNAME gets -1/-1 and gains shadow until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jodahs_avenger.jpg
 Oracle:{0}: Until end of turn, Jodah's Avenger gets -1/-1 and gains your choice of double strike, protection from red, vigilance, or shadow. (A creature with shadow can block or be blocked by only creatures with shadow.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/l/liars_pendulum.txt b/forge-gui/res/cardsfolder/l/liars_pendulum.txt
index 36ebcbedebb..1c5d0909fb5 100644
--- a/forge-gui/res/cardsfolder/l/liars_pendulum.txt
+++ b/forge-gui/res/cardsfolder/l/liars_pendulum.txt
@@ -3,8 +3,8 @@ ManaCost:1
 Types:Artifact
 A:AB$ NameCard | Cost$ 2 T | Defined$ You | SubAbility$ DBGuess | SpellDescription$ Name a card. Target opponent guesses whether a card with that name is in your hand. You may reveal your hand. If you do and your opponent guessed wrong, draw a card.
 SVar:DBGuess:DB$ GenericChoice | ValidTgts$ Opponent | Choices$ GuessInHand,GuessNotInHand | AILogic$ Random | ShowChoice$ True
-SVar:GuessInHand:DB$ RevealHand | Defined$ You | Optional$ True | RememberRevealedPlayer$ True | SubAbility$ DBInHandDraw | ChoiceDescription$ A card with that name is in that player's hand
-SVar:GuessNotInHand:DB$ RevealHand | Defined$ You | Optional$ True | RememberRevealedPlayer$ True | SubAbility$ DBNotInHandDraw | ChoiceDescription$ A card with that name is not in that player's hand
+SVar:GuessInHand:DB$ RevealHand | Defined$ You | Optional$ True | RememberRevealedPlayer$ True | SubAbility$ DBInHandDraw | SpellDescription$ A card with that name is in that player's hand
+SVar:GuessNotInHand:DB$ RevealHand | Defined$ You | Optional$ True | RememberRevealedPlayer$ True | SubAbility$ DBNotInHandDraw | SpellDescription$ A card with that name is not in that player's hand
 SVar:DBInHandDraw:DB$ Draw | Defined$ You | ConditionPlayerDefined$ Remembered | ConditionPlayerContains$ You | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | References$ X | SubAbility$ DBCleanup
 SVar:DBNotInHandDraw:DB$ Draw | Defined$ You | ConditionPlayerDefined$ Remembered | ConditionPlayerContains$ You | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/l/liliana_of_the_dark_realms.txt b/forge-gui/res/cardsfolder/l/liliana_of_the_dark_realms.txt
index 28448294757..a83df483284 100644
--- a/forge-gui/res/cardsfolder/l/liliana_of_the_dark_realms.txt
+++ b/forge-gui/res/cardsfolder/l/liliana_of_the_dark_realms.txt
@@ -7,8 +7,8 @@ A:AB$ Pump | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creat
 A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Liliana Of The Dark Realms Emblem | Image$ liliana_of_the_dark_realms_emblem | StaticAbilities$ SwampBoost | SVars$ BlackTap | Stackable$ False | Duration$ Permanent | SpellDescription$ You get an emblem with "Swamps you control have '{T}: Add {B}{B}{B}{B} to your mana pool.'".
 SVar:X:Count$Valid Swamp.YouCtrl
 SVar:ABChoice:DB$ GenericChoice | Defined$ You | Cost$ 0 | Choices$ ABPump1,ABPump2
-SVar:ABPump1:DB$ Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ +X | NumDef$ +X | References$ X | ChoiceDescription$ +X/+X
-SVar:ABPump2:DB$ Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ -X | NumDef$ -X | References$ X | ChoiceDescription$ -X/-X
+SVar:ABPump1:DB$ Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ +X | NumDef$ +X | References$ X | SpellDescription$ +X/+X
+SVar:ABPump2:DB$ Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ -X | NumDef$ -X | References$ X | SpellDescription$ -X/-X
 SVar:SwampBoost:Mode$ Continuous | EffectZone$ Command | Affected$ Swamp.YouCtrl | AffectedZone$ Battlefield | AddAbility$ BlackTap | Description$ Swamps you control have '{T}: Add {B}{B}{B}{B} to your mana pool.'
 SVar:BlackTap:AB$ Mana | Cost$ T | Produced$ B | Amount$ 4 | SpellDescription$ Add {B}{B}{B}{B} to your mana pool.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/liliana_of_the_dark_realms.jpg
diff --git a/forge-gui/res/cardsfolder/l/lunar_avenger.txt b/forge-gui/res/cardsfolder/l/lunar_avenger.txt
index 570d9c34032..5b656c3252e 100644
--- a/forge-gui/res/cardsfolder/l/lunar_avenger.txt
+++ b/forge-gui/res/cardsfolder/l/lunar_avenger.txt
@@ -4,9 +4,9 @@ Types:Artifact Creature Golem
 PT:2/2
 K:Sunburst
 A:AB$ GenericChoice | Cost$ SubCounter<1/P1P1> | Choices$ DBFlying,DBFirstStrike,DBHaste | Defined$ You | SpellDescription$ CARDNAME gains your choice of flying, first strike, or haste until end of turn.
-SVar:DBFlying:DB$ Pump | KW$ Flying | ChoiceDescription$ gains flying until end of turn.
-SVar:DBFirstStrike:DB$ Pump | KW$ First Strike | ChoiceDescription$ gains first strike until end of turn.
-SVar:DBHaste:DB$ Pump | KW$ Haste | ChoiceDescription$ gains haste until end of turn.
+SVar:DBFlying:DB$ Pump | KW$ Flying | SpellDescription$ gains flying until end of turn.
+SVar:DBFirstStrike:DB$ Pump | KW$ First Strike | SpellDescription$ gains first strike until end of turn.
+SVar:DBHaste:DB$ Pump | KW$ Haste | SpellDescription$ gains haste until end of turn.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lunar_avenger.jpg
 Oracle:Sunburst (This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.)\nRemove a +1/+1 counter from Lunar Avenger: Lunar Avenger gains your choice of flying, first strike, or haste until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/magmasaur.txt b/forge-gui/res/cardsfolder/m/magmasaur.txt
index e5d91c88a6d..a79275a5ce6 100644
--- a/forge-gui/res/cardsfolder/m/magmasaur.txt
+++ b/forge-gui/res/cardsfolder/m/magmasaur.txt
@@ -5,8 +5,8 @@ PT:0/0
 K:etbCounter:P1P1:5
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ Choices | TriggerDescription$ At the beginning of your upkeep, you may remove a +1/+1 counter from CARDNAME. If you don't, sacrifice CARDNAME and it deals damage equal to the number of +1/+1 counters on it to each creature without flying and each player.
 SVar:Choices:AB$ GenericChoice | Cost$ 0 | Choices$ Shrink,SelfDestruct | Defined$ You
-SVar:Shrink:DB$ RemoveCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | UpTo$ True | RememberRemoved$ True | SubAbility$ SelfDestruct | ChoiceDescription$ Remove a +1/+1 counter from CARDNAME.
-SVar:SelfDestruct:DB$ Sacrifice | Defined$ Self | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | References$ X | SubAbility$ LetEmHaveIt | ChoiceDescription$ Sacrifice CARDNAME and it deals damage equal to the number of +1/+1 counters on it to each creature without flying and each player.
+SVar:Shrink:DB$ RemoveCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | UpTo$ True | RememberRemoved$ True | SubAbility$ SelfDestruct | SpellDescription$ Remove a +1/+1 counter from CARDNAME.
+SVar:SelfDestruct:DB$ Sacrifice | Defined$ Self | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | References$ X | SubAbility$ LetEmHaveIt | SpellDescription$ Sacrifice CARDNAME and it deals damage equal to the number of +1/+1 counters on it to each creature without flying and each player.
 SVar:LetEmHaveIt:DB$ DamageAll | ValidCards$ Creature.withoutFlying | ValidPlayers$ Each | NumDmg$ Y | References$ Y | SubAbility$ DBCleanup | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$RememberedSize
diff --git a/forge-gui/res/cardsfolder/m/master_of_the_wild_hunt_avatar.txt b/forge-gui/res/cardsfolder/m/master_of_the_wild_hunt_avatar.txt
index 60bd524a1f5..d2d21b6fd56 100644
--- a/forge-gui/res/cardsfolder/m/master_of_the_wild_hunt_avatar.txt
+++ b/forge-gui/res/cardsfolder/m/master_of_the_wild_hunt_avatar.txt
@@ -3,9 +3,9 @@ ManaCost:no cost
 Types:Vanguard
 HandLifeModifier:+1/+3
 A:AB$ GenericChoice | Cost$ 2 G | Choices$ Wolf,Antelope,Cat,Rhino | ActivationZone$ Command | AtRandom$ True | StackDescription$ SpellDescription | SpellDescription$ Put a green creature token onto the battlefield that's a 2/2 Wolf, a 2/3 Antelope with forestwalk, a 3/2 Cat with shroud, or a 4/4 Rhino with trample, chosen at random.
-SVar:Wolf:DB$ Token | TokenAmount$ 1 | TokenName$ Wolf | TokenTypes$ Creature,Wolf | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2 | ChoiceDescription$ Wolf
-SVar:Antelope:DB$ Token | TokenAmount$ 1 | TokenName$ Antelope | TokenTypes$ Creature,Antelope | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 3 | TokenKeywords$ Forestwalk | ChoiceDescription$ Antelope
-SVar:Cat:DB$ Token | TokenAmount$ 1 | TokenName$ Cat | TokenTypes$ Creature,Cat | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 2 | TokenKeywords$ Shroud | ChoiceDescription$ Cat
-SVar:Rhino:DB$ Token | TokenAmount$ 1 | TokenName$ Rhino | TokenTypes$ Creature,Rhino | TokenOwner$ You | TokenColors$ Green | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Trample | ChoiceDescription$ Rhino
+SVar:Wolf:DB$ Token | TokenAmount$ 1 | TokenName$ Wolf | TokenTypes$ Creature,Wolf | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2 | SpellDescription$ Wolf
+SVar:Antelope:DB$ Token | TokenAmount$ 1 | TokenName$ Antelope | TokenTypes$ Creature,Antelope | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 3 | TokenKeywords$ Forestwalk | SpellDescription$ Antelope
+SVar:Cat:DB$ Token | TokenAmount$ 1 | TokenName$ Cat | TokenTypes$ Creature,Cat | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 2 | TokenKeywords$ Shroud | SpellDescription$ Cat
+SVar:Rhino:DB$ Token | TokenAmount$ 1 | TokenName$ Rhino | TokenTypes$ Creature,Rhino | TokenOwner$ You | TokenColors$ Green | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Trample | SpellDescription$ Rhino
 SVar:Picture:http://www.cardforge.org/fpics/vgd-lq/master_of_the_wild_hunt_avatar.jpg
 Oracle:Hand +1, life +3\n{2}{G}: Put a green creature token onto the battlefield that's a 2/2 Wolf, a 2/3 Antelope with forestwalk, a 3/2 Cat with shroud, or a 4/4 Rhino with trample, chosen at random.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/n/natures_blessing.txt b/forge-gui/res/cardsfolder/n/natures_blessing.txt
index 43e04b9b340..7aadb7b2c5a 100644
--- a/forge-gui/res/cardsfolder/n/natures_blessing.txt
+++ b/forge-gui/res/cardsfolder/n/natures_blessing.txt
@@ -2,10 +2,10 @@ Name:Nature's Blessing
 ManaCost:2 G W
 Types:Enchantment
 A:AB$ GenericChoice | Cost$ G W Discard<1/Card> | ValidTgts$ Creature | Defined$ You | Choices$ DBPutCounter,DBBanding,DBFirstStrike,DBTrample | SpellDescription$ Put a +1/+1 counter on target creature or that creature gains banding, first strike, or trample.
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1 | ChoiceDescription$ Put a +1/+1 counter on target creature.
-SVar:DBBanding:DB$ Pump | Defined$ Targeted | KW$ Banding | Permanent$ True | ChoiceDescription$ Target creature gains Banding
-SVar:DBFirstStrike:DB$ Pump | Defined$ Targeted | KW$ First Strike | Permanent$ True | ChoiceDescription$ Target creature gains First Strike
-SVar:DBTrample:DB$ Pump | Defined$ Targeted | KW$ Trample | Permanent$ True | ChoiceDescription$ Target creature gains Trample
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on target creature.
+SVar:DBBanding:DB$ Pump | Defined$ Targeted | KW$ Banding | Permanent$ True | SpellDescription$ Target creature gains Banding
+SVar:DBFirstStrike:DB$ Pump | Defined$ Targeted | KW$ First Strike | Permanent$ True | SpellDescription$ Target creature gains First Strike
+SVar:DBTrample:DB$ Pump | Defined$ Targeted | KW$ Trample | Permanent$ True | SpellDescription$ Target creature gains Trample
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natures_blessing.jpg
 Oracle:{G}{W}, Discard a card: Put a +1/+1 counter on target creature or that creature gains banding, first strike, or trample. (This effect lasts indefinitely. Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding a player controls are blocking or being blocked by a creature, that player divides that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.)
diff --git a/forge-gui/res/cardsfolder/p/petals_of_insight.txt b/forge-gui/res/cardsfolder/p/petals_of_insight.txt
index 53e1e570b02..18eac19d6ea 100644
--- a/forge-gui/res/cardsfolder/p/petals_of_insight.txt
+++ b/forge-gui/res/cardsfolder/p/petals_of_insight.txt
@@ -3,9 +3,9 @@ ManaCost:4 U
 Types:Sorcery Arcane
 A:SP$ Dig | Cost$ 4 U | DigNum$ 3 | NoMove$ True | DestinationZone$ Library | LibraryPosition$ 0 | SubAbility$ DBPetalChoose | SpellDescription$ Look at the top three cards of your library. You may put those cards on the bottom of your library in any order. If you do, return CARDNAME to its owner's hand. Otherwise, draw three cards.
 SVar:DBPetalChoose:DB$ GenericChoice | Choices$ ReturnPetals,DrawCards | Defined$ You
-SVar:ReturnPetals:DB$ Dig | DigNum$ 3 | ChangeNum$ All | DestinationZone$ Library | LibraryPosition$ -1 | SubAbility$ DBChangeZone | ChoiceDescription$ You may put those cards on the bottom of your library in any order. If you do, return CARDNAME to its owner's hand.
+SVar:ReturnPetals:DB$ Dig | DigNum$ 3 | ChangeNum$ All | DestinationZone$ Library | LibraryPosition$ -1 | SubAbility$ DBChangeZone | SpellDescription$ You may put those cards on the bottom of your library in any order. If you do, return CARDNAME to its owner's hand.
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Stack | Destination$ Hand | Defined$ Self
-SVar:DrawCards:DB$ Draw | NumCards$ 3 | ChoiceDescription$ Otherwise, draw three cards.
+SVar:DrawCards:DB$ Draw | NumCards$ 3 | SpellDescription$ Otherwise, draw three cards.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/petals_of_insight.jpg
 Oracle:Look at the top three cards of your library. You may put those cards on the bottom of your library in any order. If you do, return Petals of Insight to its owner's hand. Otherwise, draw three cards.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/plague_boiler.txt b/forge-gui/res/cardsfolder/p/plague_boiler.txt
index 6275fe3e264..456c9122d48 100644
--- a/forge-gui/res/cardsfolder/p/plague_boiler.txt
+++ b/forge-gui/res/cardsfolder/p/plague_boiler.txt
@@ -4,8 +4,8 @@ Types:Artifact
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ PutPlagueCounter | TriggerDescription$ At the beginning of your upkeep, put a plague counter on CARDNAME.
 SVar:PutPlagueCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ PLAGUE | CounterNum$ 1
 A:AB$ GenericChoice | Cost$ 1 B G | Choices$ DBPutPlagueCounter,DBRemovePlagueCounter | SpellDescription$ Put a plague counter on CARDNAME or remove a plague counter from it.
-SVar:DBRemovePlagueCounter:DB$ RemoveCounter | Defined$ Self | CounterType$ PLAGUE | CounterNum$ 1 | ChoiceDescription$ Remove a plague counter on this card.
-SVar:DBPutPlagueCounter:DB$ PutCounter | Defined$ Self | CounterType$ PLAGUE | CounterNum$ 1 | ChoiceDescription$ Put a plague counter on this card.
+SVar:DBRemovePlagueCounter:DB$ RemoveCounter | Defined$ Self | CounterType$ PLAGUE | CounterNum$ 1 | SpellDescription$ Remove a plague counter on this card.
+SVar:DBPutPlagueCounter:DB$ PutCounter | Defined$ Self | CounterType$ PLAGUE | CounterNum$ 1 | SpellDescription$ Put a plague counter on this card.
 T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Card.Self+counters_GE3_PLAGUE | Execute$ TrigSac | TriggerDescription$ When CARDNAME has three or more plague counters on it, sacrifice it. If you do, destroy all nonland permanents.
 SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | Defined$ Self | SubAbility$ DBDestroyAll
 SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Permanent.nonLand
diff --git a/forge-gui/res/cardsfolder/p/primal_clay.txt b/forge-gui/res/cardsfolder/p/primal_clay.txt
index 697bcee4c7d..4338d57d947 100644
--- a/forge-gui/res/cardsfolder/p/primal_clay.txt
+++ b/forge-gui/res/cardsfolder/p/primal_clay.txt
@@ -4,9 +4,9 @@ Types:Artifact Creature Shapeshifter
 PT:*/*
 K:ETBReplacement:Other:MoldChoice
 SVar:MoldChoice:DB$ GenericChoice | Defined$ You | Choices$ GroundMold,AirMold,WallMold | SpellDescription$ As CARDNAME enters the battlefield, it becomes your choice of a 3/3 artifact creature, a 2/2 artifact creature with flying, or a 1/6 Wall artifact creature with defender in addition to its other types.
-SVar:GroundMold:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 3 | Toughness$ 3 | ChoiceDescription$ CARDNAME is 3/3
-SVar:AirMold:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 2 | Toughness$ 2 | Keywords$ Flying | ChoiceDescription$ CARDNAME is 2/2 with flying
-SVar:WallMold:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 1 | Toughness$ 6 | Types$ Wall | Keywords$ Defender | ChoiceDescription$ CARDNAME is 1/6 with defender and is a wall in addition to its other types
+SVar:GroundMold:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 3 | Toughness$ 3 | SpellDescription$ CARDNAME is 3/3
+SVar:AirMold:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 2 | Toughness$ 2 | Keywords$ Flying | SpellDescription$ CARDNAME is 2/2 with flying
+SVar:WallMold:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 1 | Toughness$ 6 | Types$ Wall | Keywords$ Defender | SpellDescription$ CARDNAME is 1/6 with defender and is a wall in addition to its other types
 SVar:RemAIDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/4e/en-us/card2065.jpg
 Oracle:As Primal Clay enters the battlefield, it becomes your choice of a 3/3 artifact creature, a 2/2 artifact creature with flying, or a 1/6 Wall artifact creature with defender in addition to its other types.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/p/primal_plasma.txt b/forge-gui/res/cardsfolder/p/primal_plasma.txt
index 37d1a237043..247fceae27d 100644
--- a/forge-gui/res/cardsfolder/p/primal_plasma.txt
+++ b/forge-gui/res/cardsfolder/p/primal_plasma.txt
@@ -4,9 +4,9 @@ Types:Creature Elemental Shapeshifter
 PT:*/*
 R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ PlasmaChoice | Description$ As CARDNAME enters the battlefield, it becomes your choice of a 3/3 creature, a 2/2 creature with flying, or a 1/6 creature with defender.
 SVar:PlasmaChoice:AB$ GenericChoice | Cost$ 0 | Defined$ You | Choices$ GroundPlasma,AirPlasma,WallPlasma
-SVar:GroundPlasma:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 3 | Toughness$ 3 | ChoiceDescription$ CARDNAME is 3/3 | SubAbility$ DBMove
-SVar:AirPlasma:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 2 | Toughness$ 2 | Keywords$ Flying | ChoiceDescription$ CARDNAME is 2/2 with flying | SubAbility$ DBMove
-SVar:WallPlasma:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 1 | Toughness$ 6 | Keywords$ Defender | ChoiceDescription$ CARDNAME is 1/6 with defender | SubAbility$ DBMove
+SVar:GroundPlasma:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 3 | Toughness$ 3 | SpellDescription$ CARDNAME is 3/3 | SubAbility$ DBMove
+SVar:AirPlasma:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 2 | Toughness$ 2 | Keywords$ Flying | SpellDescription$ CARDNAME is 2/2 with flying | SubAbility$ DBMove
+SVar:WallPlasma:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 1 | Toughness$ 6 | Keywords$ Defender | SpellDescription$ CARDNAME is 1/6 with defender | SubAbility$ DBMove
 SVar:DBMove:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ All | Destination$ Battlefield
 SVar:RemAIDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/plc/en-us/card124757.jpg
diff --git a/forge-gui/res/cardsfolder/p/putrid_warrior.txt b/forge-gui/res/cardsfolder/p/putrid_warrior.txt
index 54924b8a982..80b955fb8e7 100644
--- a/forge-gui/res/cardsfolder/p/putrid_warrior.txt
+++ b/forge-gui/res/cardsfolder/p/putrid_warrior.txt
@@ -4,8 +4,8 @@ Types:Creature Zombie Soldier Warrior
 PT:2/2
 T:Mode$ DamageDone | ValidSource$ Card.Self | Execute$ TrigChoice | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, choose one - Each player loses 1 life; or each player gains 1 life.
 SVar:TrigChoice:AB$ GenericChoice | Cost$ 0 | Defined$ You | Choices$ SVar1,SVar2
-SVar:SVar1:DB$ LoseLife | Defined$ Each | LifeAmount$ 1 | ChoiceDescription$ Each player loses 1 life.
-SVar:SVar2:DB$ GainLife | Defined$ Each | LifeAmount$ 1 | ChoiceDescription$ Each player gains 1 life.
+SVar:SVar1:DB$ LoseLife | Defined$ Each | LifeAmount$ 1 | SpellDescription$ Each player loses 1 life.
+SVar:SVar2:DB$ GainLife | Defined$ Each | LifeAmount$ 1 | SpellDescription$ Each player gains 1 life.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/putrid_warrior.jpg
 Oracle:Whenever Putrid Warrior deals damage, choose one - Each player loses 1 life; or each player gains 1 life.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/r/reign_of_terror.txt b/forge-gui/res/cardsfolder/r/reign_of_terror.txt
index fd5914647d9..3249661dd44 100644
--- a/forge-gui/res/cardsfolder/r/reign_of_terror.txt
+++ b/forge-gui/res/cardsfolder/r/reign_of_terror.txt
@@ -2,8 +2,8 @@ Name:Reign of Terror
 ManaCost:3 B B
 Types:Sorcery
 A:SP$ GenericChoice | Cost$ 3 B B | Choices$ DestroyWhite,DestroyGreen | Defined$ You | StackDescription$ SpellDescription | SpellDescription$ Destroy all white or green creatures. They can't be regenerated. You lose 2 life for each creature that died this way.
-SVar:DestroyWhite:DB$ DestroyAll | ValidCards$ Creature.White | NoRegen$ True | RememberDestroyed$ True | SubAbility$ DBLoseLife | ChoiceDescription$ Destroy all white creatures
-SVar:DestroyGreen:DB$ DestroyAll | ValidCards$ Creature.Green | NoRegen$ True | RememberDestroyed$ True | SubAbility$ DBLoseLife | ChoiceDescription$ Destroy all green creatures
+SVar:DestroyWhite:DB$ DestroyAll | ValidCards$ Creature.White | NoRegen$ True | RememberDestroyed$ True | SubAbility$ DBLoseLife | SpellDescription$ Destroy all white creatures
+SVar:DestroyGreen:DB$ DestroyAll | ValidCards$ Creature.Green | NoRegen$ True | RememberDestroyed$ True | SubAbility$ DBLoseLife | SpellDescription$ Destroy all green creatures
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | Defined$ You | SubAbility$ DBCleanup | References$ X
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$RememberedSize/Twice
diff --git a/forge-gui/res/cardsfolder/r/rite_of_ruin.txt b/forge-gui/res/cardsfolder/r/rite_of_ruin.txt
index 1b95249539c..8517e9bd450 100644
--- a/forge-gui/res/cardsfolder/r/rite_of_ruin.txt
+++ b/forge-gui/res/cardsfolder/r/rite_of_ruin.txt
@@ -2,12 +2,12 @@ Name:Rite of Ruin
 ManaCost:5 R R
 Types:Sorcery
 A:SP$ GenericChoice | Cost$ 5 R R | Choices$ ChooseC1L2A3,ChooseL1C2A3,ChooseA1L2C3,ChooseA1C2L3,ChooseC1A2L3,ChooseL1A2C3 | Defined$ You | StackDescription$ SpellDescription | SpellDescription$ Choose an order for artifacts, creatures, and lands. Each player sacrifices one permanent of the first type, sacrifices two of the second type, then sacrifices three of the third type.
-SVar:ChooseC1L2A3:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseC1 | SubAbility$ SacC1L2A3 | ChoiceDescription$ Creature,Land,Artifact
-SVar:ChooseL1C2A3:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseL1 | SubAbility$ SacL1C2A3 | ChoiceDescription$ Land,Creature,Artifact
-SVar:ChooseA1L2C3:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseA1 | SubAbility$ SacA1L2C3 | ChoiceDescription$ Artifact,Land,Creature
-SVar:ChooseA1C2L3:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseA1 | SubAbility$ SacA1C2L3 | ChoiceDescription$ Artifact,Creature,Land
-SVar:ChooseC1A2L3:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseC1 | SubAbility$ SacC1A2L3 | ChoiceDescription$ Creature,Artifact,Land
-SVar:ChooseL1A2C3:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseL1 | SubAbility$ SacL1A2C3 | ChoiceDescription$ Land,Artifact,Creature
+SVar:ChooseC1L2A3:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseC1 | SubAbility$ SacC1L2A3 | SpellDescription$ Creature,Land,Artifact
+SVar:ChooseL1C2A3:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseL1 | SubAbility$ SacL1C2A3 | SpellDescription$ Land,Creature,Artifact
+SVar:ChooseA1L2C3:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseA1 | SubAbility$ SacA1L2C3 | SpellDescription$ Artifact,Land,Creature
+SVar:ChooseA1C2L3:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseA1 | SubAbility$ SacA1C2L3 | SpellDescription$ Artifact,Creature,Land
+SVar:ChooseC1A2L3:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseC1 | SubAbility$ SacC1A2L3 | SpellDescription$ Creature,Artifact,Land
+SVar:ChooseL1A2C3:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseL1 | SubAbility$ SacL1A2C3 | SpellDescription$ Land,Artifact,Creature
 SVar:ChooseC1:DB$ ChooseCard | Defined$ Remembered | Choices$ Creature.RememberedPlayerCtrl | Amount$ 1 | Mandatory$ True | RememberChosen$ True
 SVar:ChooseC2:DB$ ChooseCard | Defined$ Remembered | Choices$ Creature.RememberedPlayerCtrl | Amount$ 2 | Mandatory$ True | RememberChosen$ True
 SVar:ChooseC3:DB$ ChooseCard | Defined$ Remembered | Choices$ Creature.RememberedPlayerCtrl | Amount$ 3 | Mandatory$ True | RememberChosen$ True
diff --git a/forge-gui/res/cardsfolder/s/shaper_parasite.txt b/forge-gui/res/cardsfolder/s/shaper_parasite.txt
index 944d9cdafd8..952f84c4f4c 100644
--- a/forge-gui/res/cardsfolder/s/shaper_parasite.txt
+++ b/forge-gui/res/cardsfolder/s/shaper_parasite.txt
@@ -5,8 +5,8 @@ PT:2/3
 K:Morph:2 U
 T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ TrigChoice | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME is turned face up, target creature gets +2/-2 or -2/+2 until end of turn.
 SVar:TrigChoice:AB$ GenericChoice | ValidTgts$ Creature | TgtPrompt$ Select target creature | Cost$ 0 | Defined$ You | Choices$ TrigPump1,TrigPump2
-SVar:TrigPump1:DB$Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ +2 | NumDef$ -2 | IsCurse$ True | ChoiceDescription$ +2/-2
-SVar:TrigPump2:DB$Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ -2 | NumDef$ +2 | IsCurse$ True | ChoiceDescription$ -2/+2
+SVar:TrigPump1:DB$Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ +2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ +2/-2
+SVar:TrigPump2:DB$Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ -2 | NumDef$ +2 | IsCurse$ True | SpellDescription$ -2/+2
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shaper_parasite.jpg
 Oracle:Morph {2}{U} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)\nWhen Shaper Parasite is turned face up, target creature gets +2/-2 or -2/+2 until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/t/thrull_wizard.txt b/forge-gui/res/cardsfolder/t/thrull_wizard.txt
index c8a11ae1e78..19308c17621 100644
--- a/forge-gui/res/cardsfolder/t/thrull_wizard.txt
+++ b/forge-gui/res/cardsfolder/t/thrull_wizard.txt
@@ -3,8 +3,8 @@ ManaCost:2 B
 Types:Creature Thrull Wizard
 PT:1/1
 A:AB$ GenericChoice | Cost$ 1 B | TgtPrompt$ Select target spell | TargetType$ Spell | ValidTgts$ Card.Black | TgtZone$ Stack | Choices$ PayB,Pay3 | Defined$ TargetedController | SpellDescription$ Counter target black spell unless that spell's controller pays {B} or {3}
-SVar:PayB:DB$ Counter | Defined$ Targeted | UnlessCost$ B | ChoiceDescription$ Counter spell unless you pay B
-SVar:Pay3:DB$ Counter | Defined$ Targeted | UnlessCost$ 3 | ChoiceDescription$ Counter spell unless you pay 3
+SVar:PayB:DB$ Counter | Defined$ Targeted | UnlessCost$ B | SpellDescription$ Counter spell unless you pay B
+SVar:Pay3:DB$ Counter | Defined$ Targeted | UnlessCost$ 3 | SpellDescription$ Counter spell unless you pay 3
 SVar:RemRandomDeck:True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thrull_wizard.jpg
diff --git a/forge-gui/res/cardsfolder/u/urzas_avenger.txt b/forge-gui/res/cardsfolder/u/urzas_avenger.txt
index 61c256dd8fa..07ef2f7010a 100644
--- a/forge-gui/res/cardsfolder/u/urzas_avenger.txt
+++ b/forge-gui/res/cardsfolder/u/urzas_avenger.txt
@@ -4,10 +4,10 @@ Types:Artifact Creature Shapeshifter
 PT:4/4
 A:AB$ Pump | Cost$ 0 | NumAtt$ -1 | NumDef$ -1 | SubAbility$ DBChoose | SpellDescription$ CARDNAME gets -1/-1 and gains your choice of banding, flying, first strike, or trample until end of turn.
 SVar:DBChoose:DB$ GenericChoice | Defined$ You | Choices$ DBFlying,DBBanding,DBFirstStrike,DBTrample
-SVar:DBFlying:DB$ Pump | KW$ Flying | ChoiceDescription$ Target creature gains Flying until end of turn.
-SVar:DBBanding:DB$ Pump | KW$ Banding | ChoiceDescription$ Target creature gains Banding until end of turn.
-SVar:DBFirstStrike:DB$ Pump | KW$ First Strike | ChoiceDescription$ Target creature gains First Strike until end of turn.
-SVar:DBTrample:DB$ Pump | KW$ Trample | ChoiceDescription$ Target creature gains Trample until end of turn.
+SVar:DBFlying:DB$ Pump | KW$ Flying | SpellDescription$ Target creature gains Flying until end of turn.
+SVar:DBBanding:DB$ Pump | KW$ Banding | SpellDescription$ Target creature gains Banding until end of turn.
+SVar:DBFirstStrike:DB$ Pump | KW$ First Strike | SpellDescription$ Target creature gains First Strike until end of turn.
+SVar:DBTrample:DB$ Pump | KW$ Trample | SpellDescription$ Target creature gains Trample until end of turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/urzas_avenger.jpg
 Oracle:{0}: Urza's Avenger gets -1/-1 and gains your choice of banding, flying, first strike, or trample until end of turn. (Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding you control are blocking or being blocked by a creature, you divide that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.)
diff --git a/forge-gui/res/cardsfolder/w/walking_sponge.txt b/forge-gui/res/cardsfolder/w/walking_sponge.txt
index 5c3882ff734..19c50a0a0b7 100644
--- a/forge-gui/res/cardsfolder/w/walking_sponge.txt
+++ b/forge-gui/res/cardsfolder/w/walking_sponge.txt
@@ -4,9 +4,9 @@ Types:Creature Sponge
 PT:1/1
 A:AB$ Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | StackDescription$ None | SubAbility$ MakeChoice | SpellDescription$ Target creature loses your choice of flying, first strike, or trample until end of turn.
 SVar:MakeChoice:DB$ GenericChoice | Choices$ SpongeFly,SpongeStrike,SpongeTramp
-SVar:SpongeFly:DB$Animate | Defined$ Targeted | RemoveKeywords$ Flying | ChoiceDescription$ Targeted creature loses flying.
-SVar:SpongeStrike:DB$Animate | Defined$ Targeted | RemoveKeywords$ First Strike | ChoiceDescription$ Targeted creature loses first strike.
-SVar:SpongeTramp:DB$Animate | Defined$ Targeted | RemoveKeywords$ Trample | ChoiceDescription$ Targeted creature loses trample.
+SVar:SpongeFly:DB$Animate | Defined$ Targeted | RemoveKeywords$ Flying | SpellDescription$ Targeted creature loses flying.
+SVar:SpongeStrike:DB$Animate | Defined$ Targeted | RemoveKeywords$ First Strike | SpellDescription$ Targeted creature loses first strike.
+SVar:SpongeTramp:DB$Animate | Defined$ Targeted | RemoveKeywords$ Trample | SpellDescription$ Targeted creature loses trample.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/walking_sponge.jpg
 Oracle:{T}: Target creature loses your choice of flying, first strike, or trample until end of turn.
\ No newline at end of file