diff --git a/forge-gui/res/cardsfolder/c/candelabra_of_tawnos.txt b/forge-gui/res/cardsfolder/c/candelabra_of_tawnos.txt
index 43e959593b8..cd0eafff8fa 100644
--- a/forge-gui/res/cardsfolder/c/candelabra_of_tawnos.txt
+++ b/forge-gui/res/cardsfolder/c/candelabra_of_tawnos.txt
@@ -1,10 +1,7 @@
 Name:Candelabra of Tawnos
 ManaCost:1
 Types:Artifact
-A:AB$ Untap | Cost$ X T | TargetMin$ 0 | TargetMax$ MaxTgts | ValidTgts$ Land | TgtPrompt$ Select target Land | References$ X,MaxTgts | SpellDescription$ Untap X target lands.
-# It may seem wrong to not use X in the target, but since the Targets are what defines X, it's redundant (and not supported by the code)
-SVar:X:Targeted$Amount
-SVar:MaxTgts:Count$Valid Land
+A:AB$ Untap | Cost$ X T | TargetMin$ X | TargetMax$ X | ValidTgts$ Land | TgtPrompt$ Select X target lands | References$ X | SpellDescription$ Untap X target lands.
+SVar:X:Count$xPaid
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/candelabra_of_tawnos.jpg
 Oracle:{X}, {T}: Untap X target lands.
diff --git a/forge-gui/res/cardsfolder/c/champion_of_stray_souls.txt b/forge-gui/res/cardsfolder/c/champion_of_stray_souls.txt
index 2a93116ae40..9a486103fca 100644
--- a/forge-gui/res/cardsfolder/c/champion_of_stray_souls.txt
+++ b/forge-gui/res/cardsfolder/c/champion_of_stray_souls.txt
@@ -3,10 +3,8 @@ ManaCost:4 B B
 Types:Creature Skeleton Warrior
 PT:4/4
 # TODO: The AI will never activate this ability since it can't properly pay the cost. Consider updating.
-A:AB$ ChangeZone | Cost$ 3 B B T Sac<X/Creature.Other/other creatures> | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature you control | TargetMin$ 0 | TargetMax$ Y | References$ X,Y | AILogic$ Never | SpellDescription$ Return X target creatures from your graveyard to the battlefield.
-SVar:X:Targeted$Amount
-SVar:Y:Count$ValidGraveyard Creature.YouOwn
+A:AB$ ChangeZone | Cost$ 3 B B T Sac<X/Creature.Other/other creatures> | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select X target creature cards from your graveyard | TargetMin$ ChosenX | TargetMax$ ChosenX | References$ X | AILogic$ Never | SpellDescription$ Return X target creatures from your graveyard to the battlefield.
+SVar:X:XChoice
 A:AB$ ChangeZone | Cost$ 5 B B | Origin$ Graveyard | Destination$ Library | ActivationZone$ Graveyard | Defined$ Self | SpellDescription$ Put CARDNAME on top of your library from your graveyard.
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/champion_of_stray_souls.jpg
 Oracle:{3}{B}{B}, {T}, Sacrifice X other creatures: Return X target creature cards from your graveyard to the battlefield.\n{5}{B}{B}: Put Champion of Stray Souls on top of your library from your graveyard.
diff --git a/forge-gui/res/cardsfolder/c/curse_of_the_swine.txt b/forge-gui/res/cardsfolder/c/curse_of_the_swine.txt
index 26ea2671d31..d6fc97832c7 100644
--- a/forge-gui/res/cardsfolder/c/curse_of_the_swine.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_the_swine.txt
@@ -1,12 +1,10 @@
 Name:Curse of the Swine
 ManaCost:X U U
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ X U U | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ MaxTgts | References$ X,MaxTgts | Origin$ Battlefield | Destination$ Exile | RememberLKI$ True | SubAbility$ DBToken | SpellDescription$ Exile X target creatures. For each creature exiled this way, its controller creates a 2/2 green Boar creature token.
+A:SP$ ChangeZone | Cost$ X U U | ValidTgts$ Creature | TargetMin$ X | TargetMax$ X | References$ X | Origin$ Battlefield | Destination$ Exile | RememberLKI$ True | SubAbility$ DBToken | SpellDescription$ Exile X target creatures. For each creature exiled this way, its controller creates a 2/2 green Boar creature token.
 SVar:DBToken:DB$ RepeatEach | UseImprinted$ True | DefinedCards$ DirectRemembered | RepeatSubAbility$ TokenBoar | SubAbility$ DBCleanup | ChangeZoneTable$ True
 SVar:TokenBoar:DB$ Token | TokenAmount$ 1 | TokenScript$ g_2_2_boar | TokenOwner$ ImprintedController | LegacyImage$ g 2 2 boar ths
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Targeted$Amount
-SVar:MaxTgts:Count$Valid Creature
+SVar:X:Count$xPaid
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_the_swine.jpg
 Oracle:Exile X target creatures. For each creature exiled this way, its controller creates a 2/2 green Boar creature token.
diff --git a/forge-gui/res/cardsfolder/e/eliminate_the_competition.txt b/forge-gui/res/cardsfolder/e/eliminate_the_competition.txt
index f7ad8574bf8..6bcbfad465b 100644
--- a/forge-gui/res/cardsfolder/e/eliminate_the_competition.txt
+++ b/forge-gui/res/cardsfolder/e/eliminate_the_competition.txt
@@ -1,11 +1,9 @@
 Name:Eliminate the Competition
 ManaCost:4 B
 Types:Sorcery
-A:SP$ Destroy | Cost$ 4 B Sac<X/Creature> | TargetMin$ 0 | TargetMax$ MaxTgts | ValidTgts$ Creature | References$ X,MaxTgts | TgtPrompt$ Select target creatures | AIMaxTgtsCount$ Valid Creature.YouCtrl+cmcLE2 | SpellDescription$ Destroy X target creatures.
-# It may seem wrong to not use X in the target, but since the Targets are what defines X, it's redundant (and not supported by the code)
-SVar:X:Targeted$Amount
+A:SP$ Destroy | Cost$ 4 B Sac<X/Creature> | TargetMin$ ChosenX | TargetMax$ ChosenX | ValidTgts$ Creature | References$ X | TgtPrompt$ Select X target creatures | AIMaxTgtsCount$ Valid Creature.YouCtrl+cmcLE2 | SpellDescription$ Destroy X target creatures.
+SVar:X:XChoice
 SVar:MaxTgts:Count$Valid Creature
 #ChosenX SVar created by Cost payment
 SVar:AIPreference:SacCost$Creature.token,Creature.cmcLE2
-SVar:Picture:http://www.wizards.com/global/images/magic/general/eliminate_the_competition.jpg
 Oracle:As an additional cost to cast Eliminate the Competition, sacrifice X creatures.\nDestroy X target creatures.
diff --git a/forge-gui/res/cardsfolder/g/glimpse_the_sun_god.txt b/forge-gui/res/cardsfolder/g/glimpse_the_sun_god.txt
index 5cb34faaafb..6f88105032e 100644
--- a/forge-gui/res/cardsfolder/g/glimpse_the_sun_god.txt
+++ b/forge-gui/res/cardsfolder/g/glimpse_the_sun_god.txt
@@ -1,9 +1,7 @@
 Name:Glimpse the Sun God
 ManaCost:X W
 Types:Instant
-A:SP$ Tap | Cost$ X W | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ MaxTgts | References$ X,MaxTgts | SubAbility$ DBScry | SpellDescription$ Tap X target creatures. Scry 1.
+A:SP$ Tap | Cost$ X W | ValidTgts$ Creature | TgtPrompt$ Select X target creatures | TargetMin$ X | TargetMax$ X | References$ X | SubAbility$ DBScry | SpellDescription$ Tap X target creatures. Scry 1.
 SVar:DBScry:DB$ Scry | ScryNum$ 1
-SVar:X:Targeted$Amount
-SVar:MaxTgts:Count$Valid Creature
-SVar:Picture:http://www.wizards.com/global/images/magic/general/glimpse_the_sun_god.jpg
+SVar:X:Count$xPaid
 Oracle:Tap X target creatures. Scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)
diff --git a/forge-gui/res/cardsfolder/h/hour_of_eternity.txt b/forge-gui/res/cardsfolder/h/hour_of_eternity.txt
index bc9be60a0c6..0b24c03136a 100644
--- a/forge-gui/res/cardsfolder/h/hour_of_eternity.txt
+++ b/forge-gui/res/cardsfolder/h/hour_of_eternity.txt
@@ -1,12 +1,10 @@
 Name:Hour of Eternity
 ManaCost:X X U U U
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ X X U U U | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target card in a graveyard | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ MaxTgts | References$ MaxTgts | SubAbility$ DBClone | RememberChanged$ True | SpellDescription$ Exile X target creature cards from your graveyard. For each card exiled this way, create a token that's a copy of that card, except it's a 4/4 black Zombie.
+A:SP$ ChangeZone | Cost$ X X U U U | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose X target creature cards from your graveyard | ValidTgts$ Creature.YouOwn | TargetMin$ X | TargetMax$ X | References$ X | SubAbility$ DBClone | RememberChanged$ True | SpellDescription$ Exile X target creature cards from your graveyard. For each card exiled this way, create a token that's a copy of that card, except it's a 4/4 black Zombie.
 SVar:DBClone:DB$ CopyPermanent | Defined$ Remembered | SetPower$ 4 | SetToughness$ 4 | SetColor$ Black | SetCreatureTypes$ Zombie | NumCopies$ 1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Targeted$Amount
-SVar:MaxTgts:Count$TypeInYourYard.Creature
+SVar:X:Count$xPaid
 AI:RemoveDeck:All
 DeckHas:Ability$Token
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hour_of_eternity.jpg
 Oracle:Exile X target creature cards from your graveyard. For each card exiled this way, create a token that's a copy of that card, except it's a 4/4 black Zombie.
diff --git a/forge-gui/res/cardsfolder/o/open_into_wonder.txt b/forge-gui/res/cardsfolder/o/open_into_wonder.txt
index bf29dfc6d50..0fffc0e507a 100644
--- a/forge-gui/res/cardsfolder/o/open_into_wonder.txt
+++ b/forge-gui/res/cardsfolder/o/open_into_wonder.txt
@@ -1,12 +1,9 @@
 Name:Open into Wonder
 ManaCost:X U U
 Types:Sorcery
-A:SP$ Pump | Cost$ X U U | ValidTgts$ Creature | KW$ HIDDEN Unblockable | AILogic$ Pump | TargetMin$ 0 | TargetMax$ MaxTgts | TgtPrompt$ Select target creature | References$ X,MaxTgts | SubAbility$ DBAnimate | SpellDescription$ X target creatures can't be blocked this turn. Until end of turn, those creatures gain "Whenever this creature deals combat damage to a player, draw a card."
-# It may seem wrong to not use X in the target, but since the Targets are what defines X, it's redundant (and not supported by the code)
+A:SP$ Pump | Cost$ X U U | ValidTgts$ Creature | KW$ HIDDEN Unblockable | AILogic$ Pump | TargetMin$ X | TargetMax$ X | TgtPrompt$ Select X target creatures | References$ X | SubAbility$ DBAnimate | SpellDescription$ X target creatures can't be blocked this turn. Until end of turn, those creatures gain "Whenever this creature deals combat damage to a player, draw a card."
 SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Triggers$ OpenIntoWonderTrigger | sVars$ OpenIntoWonderDraw
 SVar:OpenIntoWonderTrigger:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ OpenIntoWonderDraw | CombatDamage$ True | TriggerDescription$ Whenever this creature deals combat damage to a player, draw a card.
 SVar:OpenIntoWonderDraw:DB$Draw | NumCards$ 1
-SVar:X:Targeted$Amount
-SVar:MaxTgts:Count$Valid Creature
-SVar:Picture:http://www.wizards.com/global/images/magic/general/open_into_wonder.jpg
-Oracle:X target creatures can't be blocked this turn. Until end of turn, those creatures gain "Whenever this creature deals combat damage to a player, draw a card."
\ No newline at end of file
+SVar:X:Count$xPaid
+Oracle:X target creatures can't be blocked this turn. Until end of turn, those creatures gain "Whenever this creature deals combat damage to a player, draw a card."
diff --git a/forge-gui/res/cardsfolder/p/prismatic_boon.txt b/forge-gui/res/cardsfolder/p/prismatic_boon.txt
index f0ed3f9006b..8727fa989bb 100644
--- a/forge-gui/res/cardsfolder/p/prismatic_boon.txt
+++ b/forge-gui/res/cardsfolder/p/prismatic_boon.txt
@@ -1,9 +1,6 @@
 Name:Prismatic Boon
 ManaCost:X W U
 Types:Instant
-A:SP$ Protection | Cost$ X W U | TargetMin$ 0 | TargetMax$ MaxTgts | References$ X,MaxTgts | ValidTgts$ Creature | TgtPrompt$ Select target creatures | Gains$ Choice | Choices$ AnyColor | SpellDescription$ X target creatures gain protection from the chosen color until end of turn.
-# It may seem wrong to not use X in the target, but since the Targets are what defines X, it's redundant (and not supported by the code)
-SVar:X:Targeted$Amount
-SVar:MaxTgts:Count$Valid Creature
-SVar:Picture:http://www.wizards.com/global/images/magic/general/prismatic_boon.jpg
+A:SP$ Protection | Cost$ X W U | TargetMin$ X | TargetMax$ X | References$ X | ValidTgts$ Creature | TgtPrompt$ Select X target creatures | Gains$ Choice | Choices$ AnyColor | SpellDescription$ X target creatures gain protection from the chosen color until end of turn.
+SVar:X:Count$xPaid
 Oracle:Choose a color. X target creatures gain protection from the chosen color until end of turn.
diff --git a/forge-gui/res/cardsfolder/r/return_to_the_ranks.txt b/forge-gui/res/cardsfolder/r/return_to_the_ranks.txt
index f9640b44284..42676b1a869 100644
--- a/forge-gui/res/cardsfolder/r/return_to_the_ranks.txt
+++ b/forge-gui/res/cardsfolder/r/return_to_the_ranks.txt
@@ -2,8 +2,6 @@ Name:Return to the Ranks
 ManaCost:X W W
 Types:Sorcery
 K:Convoke
-A:SP$ ChangeZone | Cost$ X W W | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn+cmcLE2 | TgtPrompt$ Select target creature with converted mana cost 2 or less | TargetMin$ 0 | TargetMax$ MaxTgts | References$ X,MaxTgts | SpellDescription$ Return X target creature cards with converted mana cost 2 or less from your graveyard to the battlefield.
-SVar:X:Targeted$Amount
-SVar:MaxTgts:Count$ValidGraveyard Creature.YouOwn+cmcLE2
-SVar:Picture:http://www.wizards.com/global/images/magic/general/return_to_the_ranks.jpg
+A:SP$ ChangeZone | Cost$ X W W | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn+cmcLE2 | TgtPrompt$ Select X target creatures with converted mana cost 2 or less | TargetMin$ X | TargetMax$ X | References$ X | SpellDescription$ Return X target creature cards with converted mana cost 2 or less from your graveyard to the battlefield.
+SVar:X:Count$xPaid
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nReturn X target creature cards with converted mana cost 2 or less from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/r/runed_arch.txt b/forge-gui/res/cardsfolder/r/runed_arch.txt
index 84a1abb1892..2c40279a117 100644
--- a/forge-gui/res/cardsfolder/r/runed_arch.txt
+++ b/forge-gui/res/cardsfolder/r/runed_arch.txt
@@ -2,10 +2,7 @@ Name:Runed Arch
 ManaCost:3
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Pump | Cost$ X T Sac<1/CARDNAME> | KW$ HIDDEN Unblockable | TargetMin$ 0 | TargetMax$ MaxTgts | References$ X,MaxTgts | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select target creature with power 2 or less | SpellDescription$ X target creatures with power 2 or less can't be blocked this turn.
-# It may seem wrong to not use X in the target, but since the Targets are what defines X, it's redundant (and not supported by the code)
-SVar:X:Targeted$Amount
-SVar:MaxTgts:Count$Valid Creature.powerLE2
+A:AB$ Pump | Cost$ X T Sac<1/CARDNAME> | KW$ HIDDEN Unblockable | TargetMin$ X | TargetMax$ X | References$ X | ValidTgts$ Creature.powerLE2 | TgtPrompt$ Select X target creatures with power 2 or less | SpellDescription$ X target creatures with power 2 or less can't be blocked this turn.
+SVar:X:Count$xPaid
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/runed_arch.jpg
 Oracle:Runed Arch enters the battlefield tapped.\n{X}, {T}, Sacrifice Runed Arch: X target creatures with power 2 or less can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/s/shattered_crypt.txt b/forge-gui/res/cardsfolder/s/shattered_crypt.txt
index 9c1eb5a7020..dcb51492772 100644
--- a/forge-gui/res/cardsfolder/s/shattered_crypt.txt
+++ b/forge-gui/res/cardsfolder/s/shattered_crypt.txt
@@ -1,10 +1,8 @@
 Name:Shattered Crypt
 ManaCost:X B B
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ X B B | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ MaxTgts | SubAbility$ DBLoseLife | References$ X,MaxTgts | SpellDescription$ Return X target creature cards from your graveyard to your hand. You lose X life.
-SVar:DBLoseLife:DB$LoseLife | Defined$ You | LifeAmount$ X | References$ X
-SVar:X:Targeted$Amount
-SVar:MaxTgts:Count$TypeInYourYard.Creature
+A:SP$ ChangeZone | Cost$ X B B | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select X target creature cards from your graveyard | TargetMin$ X | TargetMax$ X | SubAbility$ DBLoseLife | References$ X | SpellDescription$ Return X target creature cards from your graveyard to your hand. You lose X life.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X | References$ X
+SVar:X:Count$xPaid
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/shattered_crypt.jpg
 Oracle:Return X target creature cards from your graveyard to your hand. You lose X life.
diff --git a/forge-gui/res/cardsfolder/s/sword_of_light_and_shadow.txt b/forge-gui/res/cardsfolder/s/sword_of_light_and_shadow.txt
index c9759ebcf45..9ef8fc0e13a 100644
--- a/forge-gui/res/cardsfolder/s/sword_of_light_and_shadow.txt
+++ b/forge-gui/res/cardsfolder/s/sword_of_light_and_shadow.txt
@@ -4,8 +4,7 @@ Types:Artifact Equipment
 K:Equip:2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddSVar$ SwordOfLightAndShadowCE | AddKeyword$ Protection from white & Protection from black | Description$ Equipped creature gets +2/+2 and has protection from white and from black.
 T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigGainLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage to a player, you gain 3 life and you may return up to one target creature card from your graveyard to your hand.
-SVar:TrigGainLife:DB$GainLife | Defined$ You | LifeAmount$ 3 | SubAbility$ DBReturn
-SVar:DBReturn:DB$ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature in your graveyard
+SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3 | SubAbility$ DBReturn
+SVar:DBReturn:DB$ ChangeZone | Optional$ You | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select target creature in your graveyard | SpellDescription$ You may return up to one target creature card from your graveyard to your hand.
 SVar:SwordOfLightAndShadowCE:SVar:MustBeBlocked:AttackingPlayerConservative
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sword_of_light_and_shadow.jpg
 Oracle:Equipped creature gets +2/+2 and has protection from white and from black.\nWhenever equipped creature deals combat damage to a player, you gain 3 life and you may return up to one target creature card from your graveyard to your hand.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/t/thrive.txt b/forge-gui/res/cardsfolder/t/thrive.txt
index 6cad2e00d33..43f5bd2cc5a 100644
--- a/forge-gui/res/cardsfolder/t/thrive.txt
+++ b/forge-gui/res/cardsfolder/t/thrive.txt
@@ -1,9 +1,6 @@
 Name:Thrive
 ManaCost:X G
 Types:Sorcery
-A:SP$ PutCounter | Cost$ X G | CounterNum$ 1 | CounterType$ P1P1 | TargetMin$ 0 | TargetMax$ MaxTgts | References$ X,MaxTgts | ValidTgts$ Creature | TgtPrompt$ Select target creatures | SpellDescription$ Put a +1/+1 counter on each of X target creatures.
-# It may seem wrong to not use X in the target, but since the Targets are what defines X, it's redundant (and not supported by the code)
-SVar:X:Targeted$Amount
-SVar:MaxTgts:Count$Valid Creature
-SVar:Picture:http://www.wizards.com/global/images/magic/general/thrive.jpg
+A:SP$ PutCounter | Cost$ X G | CounterNum$ 1 | CounterType$ P1P1 | TargetMin$ X | TargetMax$ X | References$ X | ValidTgts$ Creature | TgtPrompt$ Select X target creatures | SpellDescription$ Put a +1/+1 counter on each of X target creatures.
+SVar:X:Count$xPaid
 Oracle:Put a +1/+1 counter on each of X target creatures.
diff --git a/forge-gui/res/cardsfolder/t/turbulent_dreams.txt b/forge-gui/res/cardsfolder/t/turbulent_dreams.txt
index 1908088b897..275408c2530 100644
--- a/forge-gui/res/cardsfolder/t/turbulent_dreams.txt
+++ b/forge-gui/res/cardsfolder/t/turbulent_dreams.txt
@@ -1,9 +1,7 @@
 Name:Turbulent Dreams
 ManaCost:U U
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ U U Discard<X/Card> | Origin$ Battlefield | Destination$ Hand | TargetMin$ 0 | TargetMax$ MaxTgts | References$ X,MaxTgts | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | SpellDescription$ Return X target nonland permanents to their owners' hands.
-SVar:X:Targeted$Amount
-SVar:MaxTgts:Count$Valid Permanent.nonLand
+A:SP$ ChangeZone | Cost$ U U Discard<X/Card> | Origin$ Battlefield | Destination$ Hand | TargetMin$ ChosenX | TargetMax$ ChosenX | References$ X | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select X target nonland permanents | SpellDescription$ Return X target nonland permanents to their owners' hands.
+SVar:X:XChoice
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/turbulent_dreams.jpg
 Oracle:As an additional cost to cast Turbulent Dreams, discard X cards.\nReturn X target nonland permanents to their owners' hands.
diff --git a/forge-gui/res/cardsfolder/w/winter_blast.txt b/forge-gui/res/cardsfolder/w/winter_blast.txt
index 5b972c2a61b..4e3482b7c1d 100644
--- a/forge-gui/res/cardsfolder/w/winter_blast.txt
+++ b/forge-gui/res/cardsfolder/w/winter_blast.txt
@@ -1,10 +1,8 @@
 Name:Winter Blast
 ManaCost:X G
 Types:Sorcery
-A:SP$ Tap | Cost$ X G | ValidTgts$ Creature | TgtPrompt$ Select target creature | TargetMin$ 0 | TargetMax$ MaxTgts | References$ X,MaxTgts | RememberTargets$ True | SubAbility$ DBDamage | SpellDescription$ Tap X target creatures. CARDNAME deals 2 damage to each of those creatures with flying.
+A:SP$ Tap | Cost$ X G | ValidTgts$ Creature | TgtPrompt$ Select X target creatures | TargetMin$ X | TargetMax$ X | References$ X | RememberTargets$ True | SubAbility$ DBDamage | SpellDescription$ Tap X target creatures. CARDNAME deals 2 damage to each of those creatures with flying.
 SVar:DBDamage:DB$ DamageAll | NumDmg$ 2 | ValidCards$ Card.IsRemembered+withFlying | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Targeted$Amount
-SVar:MaxTgts:Count$Valid Creature
-SVar:Picture:http://www.wizards.com/global/images/magic/general/winter_blast.jpg
+SVar:X:Count$xPaid
 Oracle:Tap X target creatures. Winter Blast deals 2 damage to each of those creatures with flying.
diff --git a/forge-gui/res/cardsfolder/w/winters_chill.txt b/forge-gui/res/cardsfolder/w/winters_chill.txt
index b64353afcd0..bd48da320fc 100644
--- a/forge-gui/res/cardsfolder/w/winters_chill.txt
+++ b/forge-gui/res/cardsfolder/w/winters_chill.txt
@@ -2,7 +2,7 @@ Name:Winter's Chill
 ManaCost:X U
 Types:Instant
 Text:Cast CARDNAME only during combat before blockers are declared.\r\nX can't be greater than the number of snow lands you control.\r\n
-A:SP$ RepeatEach | Cost$ X U | TargetMin$ 0 | TargetMax$ MaxTgts | References$ X,MaxTgts | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking creature | ActivationPhases$ BeginCombat->Declare Attackers | IsCurse$ True | DefinedCards$ Targeted | RepeatSubAbility$ DBChoose | StackDescription$ SpellDescription | SpellDescription$ Choose X target attacking creatures. For each of those creatures, its controller may pay {1} or {2}. If that player doesn't, destroy that creature at end of combat. If that player pays only {1}, prevent all combat damage that would be dealt to and dealt by that creature this combat.
+A:SP$ RepeatEach | Cost$ X U | TargetMin$ X | TargetMax$ X | References$ X | ValidTgts$ Creature.attacking | TgtPrompt$ Select X target attacking creatures | ActivationPhases$ BeginCombat->Declare Attackers | IsCurse$ True | DefinedCards$ Targeted | RepeatSubAbility$ DBChoose | StackDescription$ SpellDescription | SpellDescription$ Choose X target attacking creatures. For each of those creatures, its controller may pay {1} or {2}. If that player doesn't, destroy that creature at end of combat. If that player pays only {1}, prevent all combat damage that would be dealt to and dealt by that creature this combat.
 SVar:DBChoose:DB$ GenericChoice | Defined$ RememberedController | Choices$ Pay2,Pay1 | AILogic$ PayUnlessCost | SubAbility$ DBEffect
 SVar:Pay2:DB$ Cleanup | ClearRemembered$ True | UnlessCost$ 2 | UnlessPayer$ RememberedController | UnlessSwitched$ True | SpellDescription$ You may pay {2} to avoid negative effects | ShowCurrentCard$ Remembered
 SVar:Pay1:DB$ Pump | Defined$ Remembered | KW$ Prevent all combat damage that would be dealt to and dealt by CARDNAME. | UntilEndOfCombat$ True | UnlessCost$ 1 | UnlessPayer$ RememberedController | UnlessSwitched$ True | UnlessResolveSubs$ WhenPaid | SubAbility$ DBCleanup | ShowCurrentCard$ Remembered | SpellDescription$ You may pay {1}, prevent all combat damage that would be dealt to and dealt by that creature this combat.
@@ -12,9 +12,7 @@ SVar:TrigEOC:Mode$ Phase | TriggerZones$ Command | Phase$ EndCombat | Execute$ T
 SVar:TrigDestroy:DB$ Destroy | Defined$ Remembered | SubAbility$ ExileSelf
 SVar:ExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:OutOfSight:Mode$ ChangesZone | TriggerZones$ Command | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsRemembered | Execute$ ExileSelf | Static$ True
-SVar:X:Targeted$Amount
-SVar:MaxTgts:Count$Valid Land.Snow+YouCtrl
+SVar:X:Count$xPaid
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
-SVar:Picture:http://www.wizards.com/global/images/magic/general/winters_chill.jpg
 Oracle:Cast Winter's Chill only during combat before blockers are declared.\nX can't be greater than the number of snow lands you control.\nChoose X target attacking creatures. For each of those creatures, its controller may pay {1} or {2}. If that player doesn't, destroy that creature at end of combat. If that player pays only {1}, prevent all combat damage that would be dealt to and dealt by that creature this combat.