diff --git a/forge-gui/res/cardsfolder/a/abunas_chant.txt b/forge-gui/res/cardsfolder/a/abunas_chant.txt
index 03ae586fa7c..e2469072408 100644
--- a/forge-gui/res/cardsfolder/a/abunas_chant.txt
+++ b/forge-gui/res/cardsfolder/a/abunas_chant.txt
@@ -1,9 +1,9 @@
 Name:Abuna's Chant
 ManaCost:3 W
 Types:Instant
-K:Entwine 2
-A:SP$ Charm | Cost$ 3 W | Choices$ DBGainLife,DBPreventDmg | SpellDescription$ Choose one - You gain 5 life; or prevent the next 5 damage that would be dealt to target creature this turn.
-SVar:DBGainLife:DB$ GainLife | LifeAmount$ 5 | SpellDescription$ You gain 5 life;
+K:Entwine:2
+A:SP$ Charm | Cost$ 3 W | Choices$ DBGainLife,DBPreventDmg
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 5 | SpellDescription$ You gain 5 life.
 SVar:DBPreventDmg:DB$ PreventDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | Amount$ 5 | SpellDescription$ Prevent the next 5 damage that would be dealt to target creature this turn.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/abunas_chant.jpg
diff --git a/forge-gui/res/cardsfolder/b/barbed_lightning.txt b/forge-gui/res/cardsfolder/b/barbed_lightning.txt
index 9975fd4f0e1..4c53ecb9d67 100644
--- a/forge-gui/res/cardsfolder/b/barbed_lightning.txt
+++ b/forge-gui/res/cardsfolder/b/barbed_lightning.txt
@@ -1,10 +1,9 @@
 Name:Barbed Lightning
 ManaCost:2 R
 Types:Instant
-K:Entwine 2
-A:SP$ Charm | Cost$ 2 R | Choices$ DBDmgC,DBDmgP | CharmNum$ 1 | SpellDescription$ Choose one - CARDNAME deals 3 damage to target creature; or CARDNAME deals 3 damage to target player.
-SVar:DBDmgC:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature;
+K:Entwine:2
+A:SP$ Charm | Cost$ 2 R | Choices$ DBDmgC,DBDmgP | CharmNum$ 1
+SVar:DBDmgC:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature.
 SVar:DBDmgP:DB$ DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target player.
-SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/barbed_lightning.jpg
 Oracle:Choose one -\n• Barbed Lightning deals 3 damage to target creature.\n• Barbed Lightning deals 3 damage to target player.\nEntwine {2} (Choose both if you pay the entwine cost.)
diff --git a/forge-gui/res/cardsfolder/b/betrayal_of_flesh.txt b/forge-gui/res/cardsfolder/b/betrayal_of_flesh.txt
index 86ef03286a7..7b1fe0ed921 100644
--- a/forge-gui/res/cardsfolder/b/betrayal_of_flesh.txt
+++ b/forge-gui/res/cardsfolder/b/betrayal_of_flesh.txt
@@ -1,9 +1,9 @@
 Name:Betrayal of Flesh
 ManaCost:5 B
 Types:Instant
-K:Entwine Sac<3/Land>
-A:SP$ Charm | Cost$ 5 B | Choices$ DBDestroy,DBChange | CharmNum$ 1 | SpellDescription$ Choose one - Destroy target creature; or return target creature card from your graveyard to the battlefield.
-SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Destroy target creature
+K:Entwine:Sac<3/Land>
+A:SP$ Charm | Cost$ 5 B | Choices$ DBDestroy,DBChange | CharmNum$ 1
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Destroy target creature.
 SVar:DBChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return target creature card from your graveyard to the battlefield.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/betrayal_of_flesh.jpg
diff --git a/forge-gui/res/cardsfolder/b/blinding_beam.txt b/forge-gui/res/cardsfolder/b/blinding_beam.txt
index 3e67e74252b..520148abb0c 100644
--- a/forge-gui/res/cardsfolder/b/blinding_beam.txt
+++ b/forge-gui/res/cardsfolder/b/blinding_beam.txt
@@ -1,11 +1,11 @@
 Name:Blinding Beam
 ManaCost:2 W
 Types:Instant
-K:Entwine 1
-A:SP$ Charm | Cost$ 2 W | Choices$ DBTap,DBEffect | CharmNum$ 1 | SpellDescription$ Choose one - Tap two target creatures; or creatures don't untap during target player's next untap step.
-SVar:DBTap:DB$ Tap | ValidTgts$ Creature | TargetMin$ 2 | TargetMax$ 2 | TgtPrompt$ Select two target creatures | SpellDescription$  Tap two target creatures;
+K:Entwine:1
+A:SP$ Charm | Cost$ 2 W | Choices$ DBTap,DBEffect | CharmNum$ 1
+SVar:DBTap:DB$ Tap | ValidTgts$ Creature | TargetMin$ 2 | TargetMax$ 2 | TgtPrompt$ Select two target creatures | SpellDescription$  Tap two target creatures
 SVar:DBEffect:DB$ Effect | ValidTgts$ Player | TgtPrompt$ Select target player | IsCurse$ True | StaticAbilities$ DontUntap | Triggers$ RestoreSight | SVars$ ExileEffect | RememberObjects$ Targeted | Duration$ Permanent | SpellDescription$ Creatures don't untap during target player's next untap step.
-SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ This card doesn't untap during your next untap step.
+SVar:DontUntap:Mode$ Continuous | PlayerTurn$ Remembered | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature | AddHiddenKeyword$ This card doesn't untap.
 SVar:RestoreSight:Mode$ Phase | Phase$ Untap | ValidPlayer$ Player.IsRemembered | TriggerZones$ Command | Execute$ ExileEffect | Static$ True 
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/d/dreams_grip.txt b/forge-gui/res/cardsfolder/d/dreams_grip.txt
index 41bfeeb6c89..a63a3cb6a76 100644
--- a/forge-gui/res/cardsfolder/d/dreams_grip.txt
+++ b/forge-gui/res/cardsfolder/d/dreams_grip.txt
@@ -1,9 +1,9 @@
 Name:Dream's Grip
 ManaCost:U
 Types:Instant
-K:Entwine 1
-A:SP$ Charm | Cost$ U | Choices$ DBTap,DBUntap | CharmNum$ 1 | SpellDescription$ Choose one - Tap target permanent; or untap target permanent.
-SVar:DBTap:DB$ Tap | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to tap | SpellDescription$ Tap target permanent;
+K:Entwine:1
+A:SP$ Charm | Cost$ U | Choices$ DBTap,DBUntap | CharmNum$ 1
+SVar:DBTap:DB$ Tap | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to tap | SpellDescription$ Tap target permanent.
 SVar:DBUntap:DB$ Untap | ValidTgts$ Permanent | TgtPrompt$ Select target permanent to untap | SpellDescription$ Untap target permanent.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dreams_grip.jpg
diff --git a/forge-gui/res/cardsfolder/g/grab_the_reins.txt b/forge-gui/res/cardsfolder/g/grab_the_reins.txt
index 1d73d88a8ce..918e08c0eb9 100644
--- a/forge-gui/res/cardsfolder/g/grab_the_reins.txt
+++ b/forge-gui/res/cardsfolder/g/grab_the_reins.txt
@@ -1,9 +1,9 @@
 Name:Grab the Reins
 ManaCost:3 R
 Types:Instant
-K:Entwine 2 R
-A:SP$ Charm | Cost$ 3 R | Choices$ DBGainControl,DBSac | CharmNum$ 1 | SpellDescription$ Choose one - Until end of turn, you gain control of target creature and it gains haste; Sacrifice a creature. CARDNAME deals damage equal to that creature's power to target creature or player.
-SVar:DBGainControl:DB$ GainControl | ValidTgts$ Creature | TgtPrompt$ Select target creature to gain control of | LoseControl$ EOT | AddKWs$ Haste | SpellDescription$ Until end of turn, you gain control of target creature and it gains haste;
+K:Entwine:2 R
+A:SP$ Charm | Cost$ 3 R | Choices$ DBGainControl,DBSac | CharmNum$ 1
+SVar:DBGainControl:DB$ GainControl | ValidTgts$ Creature | TgtPrompt$ Select target creature to gain control of | LoseControl$ EOT | AddKWs$ Haste | SpellDescription$ Until end of turn, you gain control of target creature and it gains haste.
 SVar:DBSac:DB$ Sacrifice | Amount$ 1 | SacValid$ Creature | RememberSacrificed$ True | SubAbility$ GrabDmg | SpellDescription$ Sacrifice a creature, then CARDNAME deals damage equal to that creature's power to target creature or player.
 SVar:GrabDmg:DB$ DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to deal the damage to | NumDmg$ X | SubAbility$ DBCleanup | References$ X
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/i/incite_war.txt b/forge-gui/res/cardsfolder/i/incite_war.txt
index 583ba857525..7db2077620c 100644
--- a/forge-gui/res/cardsfolder/i/incite_war.txt
+++ b/forge-gui/res/cardsfolder/i/incite_war.txt
@@ -1,9 +1,9 @@
 Name:Incite War
 ManaCost:2 R
 Types:Instant
-K:Entwine 2
-A:SP$ Charm | Cost$ 2 R | Choices$ DBEffect,DBPumpAll | CharmNum$ 1 | SpellDescription$ Choose one - Creatures target player controls attack this turn if able; or creatures you control gain first strike until end of turn.
-SVar:DBEffect:DB$ Effect | Name$ Incite War Effect | ValidTgts$ Player | TgtPrompt$ Select target player | StaticAbilities$ MustAttack | References$ MustAttack | RememberObjects$ Targeted | SpellDescription$ Creatures target player controls attack this turn if able;
+K:Entwine:2
+A:SP$ Charm | Cost$ 2 R | Choices$ DBEffect,DBPumpAll | CharmNum$ 1
+SVar:DBEffect:DB$ Effect | Name$ Incite War Effect | ValidTgts$ Player | TgtPrompt$ Select target player | StaticAbilities$ MustAttack | References$ MustAttack | RememberObjects$ Targeted | SpellDescription$ Creatures target player controls attack this turn if able.
 SVar:MustAttack:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ CARDNAME attacks each turn if able. | Description$ Creatures target player controls attack this turn if able.
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ First Strike | SpellDescription$ Creatures you control gain first strike until end of turn.
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/j/journey_of_discovery.txt b/forge-gui/res/cardsfolder/j/journey_of_discovery.txt
index a6a5792c583..b49809052db 100644
--- a/forge-gui/res/cardsfolder/j/journey_of_discovery.txt
+++ b/forge-gui/res/cardsfolder/j/journey_of_discovery.txt
@@ -1,9 +1,9 @@
 Name:Journey of Discovery
 ManaCost:2 G
 Types:Sorcery
-K:Entwine 2 G
-A:SP$ Charm | Cost$ 2 G | Choices$ DBChangeZone,DBEffect | CharmNum$ 1 | SpellDescription$ Choose one - Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle your library; or you may play up to two additional lands this turn.
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle your library;
+K:Entwine:2 G
+A:SP$ Charm | Cost$ 2 G | Choices$ DBChangeZone,DBEffect | CharmNum$ 1
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic | ChangeNum$ 2 | SpellDescription$ Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle your library.
 SVar:DBEffect:DB$ Effect | Name$ Journey of Discovery Effect | StaticAbilities$ JourneyOfDis | AILogic$ Always | SpellDescription$ You may play up to two additional lands this turn.
 SVar:JourneyOfDis:Mode$ Continuous | Affected$ You | AddKeyword$ AdjustLandPlays:2 | EffectZone$ Command | Description$ You may play two additional lands this turn.
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/o/one_dozen_eyes.txt b/forge-gui/res/cardsfolder/o/one_dozen_eyes.txt
index f3ac76b3e2c..9431542f9b7 100644
--- a/forge-gui/res/cardsfolder/o/one_dozen_eyes.txt
+++ b/forge-gui/res/cardsfolder/o/one_dozen_eyes.txt
@@ -1,9 +1,10 @@
 Name:One Dozen Eyes
 ManaCost:5 G
 Types:Sorcery
-K:Entwine G G G
-A:SP$ Charm | Cost$ 5 G | Choices$ DBToken,DBToken2 | CharmNum$ 1 | SpellDescription$ Choose one - Put a 5/5 green Beast creature token onto the battlefield; or put five 1/1 green Insect creature tokens onto the battlefield.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | SpellDescription$ Put a 5/5 green Beast creature token onto the battlefield;
-SVar:DBToken2:DB$ Token | TokenAmount$ 5 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ g 1 1 insect MRD | SpellDescription$ Put five 1/1 green Insect creature tokens onto the battlefield.
+K:Entwine:G G G
+A:SP$ Charm | Cost$ 5 G | Choices$ DBToken,DBToken2 | CharmNum$ 1
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 5 | TokenToughness$ 5 | SpellDescription$ Create a 5/5 green Beast creature token.
+SVar:DBToken2:DB$ Token | TokenAmount$ 5 | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ g 1 1 insect MRD | SpellDescription$ Create five 1/1 green Insect creature tokens.
+DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/one_dozen_eyes.jpg
-Oracle:Choose one -\n• Put a 5/5 green Beast creature token onto the battlefield.\n• Put five 1/1 green Insect creature tokens onto the battlefield.\nEntwine {G}{G}{G} (Choose both if you pay the entwine cost.)
+Oracle:Choose one -\n• Create a 5/5 green Beast creature token.\n• Create five 1/1 green Insect creature tokens.\nEntwine {G}{G}{G} (Choose both if you pay the entwine cost.)
diff --git a/forge-gui/res/cardsfolder/p/plunge_into_darkness.txt b/forge-gui/res/cardsfolder/p/plunge_into_darkness.txt
index a870c9d07eb..0dd72175667 100644
--- a/forge-gui/res/cardsfolder/p/plunge_into_darkness.txt
+++ b/forge-gui/res/cardsfolder/p/plunge_into_darkness.txt
@@ -1,8 +1,8 @@
 Name:Plunge into Darkness
 ManaCost:1 B
 Types:Instant
-K:Entwine B
-A:SP$ Charm | Cost$ 1 B | Choices$ DBSac,DBChooseNumber | CharmNum$ 1 | SpellDescription$ Choose one - Sacrifice any number of creatures, then you gain 3 life for each sacrificed creature; or pay X life, then look at the top X cards of your library. Put one of those cards into your hand, and exile the rest.
+K:Entwine:B
+A:SP$ Charm | Cost$ 1 B | Choices$ DBSac,DBChooseNumber | CharmNum$ 1
 SVar:DBSac:DB$ Sacrifice | Defined$ You | Amount$ SacX | References$ SacX | SacValid$ Creature | RememberSacrificed$ True | Optional$ True | SubAbility$ DBGainLife | SpellDescription$  Sacrifice any number of creatures, then you gain 3 life for each sacrificed creature.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ GainLifeX | References$ GainLifeX | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
diff --git a/forge-gui/res/cardsfolder/p/promise_of_power.txt b/forge-gui/res/cardsfolder/p/promise_of_power.txt
index 462a74323f0..c275f938c46 100644
--- a/forge-gui/res/cardsfolder/p/promise_of_power.txt
+++ b/forge-gui/res/cardsfolder/p/promise_of_power.txt
@@ -1,9 +1,9 @@
 Name:Promise of Power
 ManaCost:2 B B B
 Types:Sorcery
-K:Entwine 4
-A:SP$ Charm | Cost$ 2 B B B | Choices$ DBDraw,DBToken | CharmNum$ 1 | SpellDescription$ Choose one - You draw five cards and you lose 5 life; or put an X/X black Demon creature token with flying onto the battlefield, where X is the number of cards in your hand.
-SVar:DBDraw:DB$ Draw | NumCards$ 5 | SpellDescription$ You draw five cards and you lose 5 life; | SubAbility$ DBLoseLife
+K:Entwine:4
+A:SP$ Charm | Cost$ 2 B B B | Choices$ DBDraw,DBToken | CharmNum$ 1
+SVar:DBDraw:DB$ Draw | NumCards$ 5 | SpellDescription$ You draw five cards and you lose 5 life. | SubAbility$ DBLoseLife
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 5
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Demon | TokenTypes$ Creature,Demon | TokenOwner$ You | TokenColors$ Black | TokenKeywords$ Flying | TokenPower$ X | TokenToughness$ X | References$ X | SpellDescription$ Put an X/X black Demon creature token with flying onto the battlefield, where X is the number of cards in your hand.
 SVar:X:Count$NumCardsInYourHand
diff --git a/forge-gui/res/cardsfolder/r/rain_of_rust.txt b/forge-gui/res/cardsfolder/r/rain_of_rust.txt
index d9047952666..26286ee13c6 100644
--- a/forge-gui/res/cardsfolder/r/rain_of_rust.txt
+++ b/forge-gui/res/cardsfolder/r/rain_of_rust.txt
@@ -1,9 +1,9 @@
 Name:Rain of Rust
 ManaCost:3 R R
 Types:Instant
-K:Entwine 3 R
-A:SP$ Charm | Cost$ 3 R R | Choices$ DBDestroyArtifact,DBDestroyLand | CharmNum$ 1 | SpellDescription$ Choose one - Destroy target artifact; or destroy target land.
-SVar:DBDestroyArtifact:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact;
+K:Entwine:3 R
+A:SP$ Charm | Cost$ 3 R R | Choices$ DBDestroyArtifact,DBDestroyLand | CharmNum$ 1
+SVar:DBDestroyArtifact:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Destroy target artifact.
 SVar:DBDestroyLand:DB$ Destroy | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Destroy target land.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rain_of_rust.jpg
diff --git a/forge-gui/res/cardsfolder/r/reap_and_sow.txt b/forge-gui/res/cardsfolder/r/reap_and_sow.txt
index e17f2bf12bb..54a247f6a8e 100644
--- a/forge-gui/res/cardsfolder/r/reap_and_sow.txt
+++ b/forge-gui/res/cardsfolder/r/reap_and_sow.txt
@@ -1,8 +1,8 @@
 Name:Reap and Sow
 ManaCost:3 G
 Types:Sorcery
-K:Entwine 1 G
-A:SP$ Charm | Cost$ 3 G | Choices$ DBDestroyLand,DBChange | CharmNum$ 1 | SpellDescription$ Choose one - Destroy target land; or search your library for a land card, put that card onto the battlefield, then shuffle your library.
+K:Entwine:1 G
+A:SP$ Charm | Cost$ 3 G | Choices$ DBDestroyLand,DBChange | CharmNum$ 1
 SVar:DBDestroyLand:DB$ Destroy | ValidTgts$ Land | TgtPrompt$ Select target land | SpellDescription$ Destroy target land;
 SVar:DBChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land | ChangeNum$ 1 | SpellDescription$ Search your library for a land card, put that card onto the battlefield, then shuffle your library.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/reap_and_sow.jpg
diff --git a/forge-gui/res/cardsfolder/r/roar_of_the_kha.txt b/forge-gui/res/cardsfolder/r/roar_of_the_kha.txt
index 5e9d81885c9..97b1f0258ca 100644
--- a/forge-gui/res/cardsfolder/r/roar_of_the_kha.txt
+++ b/forge-gui/res/cardsfolder/r/roar_of_the_kha.txt
@@ -1,8 +1,8 @@
 Name:Roar of the Kha
 ManaCost:1 W
 Types:Instant
-K:Entwine 1 W
-A:SP$ Charm | Cost$ 1 W | Choices$ DBPump,DBUntap | CharmNum$ 1 | SpellDescription$ Choose one -  Creatures you control get +1/+1 until end of turn; or untap all creatures you control.
+K:Entwine:1 W
+A:SP$ Charm | Cost$ 1 W | Choices$ DBPump,DBUntap | CharmNum$ 1
 SVar:DBPump:DB$ PumpAll | NumAtt$ 1 | NumDef$ 1 | ValidCards$ Creature.YouCtrl | SpellDescription$ Creatures you control get +1/+1 until end of turn;
 SVar:DBUntap:DB$ UntapAll | ValidCards$ Creature.YouCtrl | SpellDescription$ Untap all creatures you control.
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/r/rude_awakening.txt b/forge-gui/res/cardsfolder/r/rude_awakening.txt
index c98470c6446..4a1688deecf 100644
--- a/forge-gui/res/cardsfolder/r/rude_awakening.txt
+++ b/forge-gui/res/cardsfolder/r/rude_awakening.txt
@@ -1,8 +1,8 @@
 Name:Rude Awakening
 ManaCost:4 G
 Types:Sorcery
-K:Entwine 2 G
-A:SP$ Charm | Cost$ 4 G | Choices$ DBUntap,DBAnimate | CharmNum$ 1 | SpellDescription$ Choose one -  Untap all lands you control; or until end of turn, lands you control become 2/2 creatures that are still lands.
+K:Entwine:2 G
+A:SP$ Charm | Cost$ 4 G | Choices$ DBUntap,DBAnimate | CharmNum$ 1
 SVar:DBUntap:DB$ UntapAll | ValidCards$ Land.YouCtrl | SpellDescription$ Untap all lands you control;
 SVar:DBAnimate:DB$ AnimateAll | ValidCards$ Land.YouCtrl | Power$ 2 | Toughness$ 2 | Types$ Creature | SpellDescription$ Until end of turn, lands you control become 2/2 creatures that are still lands.
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/s/savage_beating.txt b/forge-gui/res/cardsfolder/s/savage_beating.txt
index cccffbae278..58cd32152cb 100644
--- a/forge-gui/res/cardsfolder/s/savage_beating.txt
+++ b/forge-gui/res/cardsfolder/s/savage_beating.txt
@@ -2,8 +2,8 @@ Name:Savage Beating
 ManaCost:3 R R
 Types:Instant
 Text:Cast CARDNAME only during your turn and only during combat.
-K:Entwine 1 R
-A:SP$ Charm | Cost$ 3 R R | Choices$ DBPump,DBUntapAll | CharmNum$ 1 | PlayerTurn$ True | ActivationPhases$ BeginCombat->EndCombat | SpellDescription$ Choose one - Creatures you control gain double strike until end of turn; or untap all creatures you control. After this phase, there is an additional combat phase.
+K:Entwine:1 R
+A:SP$ Charm | Cost$ 3 R R | Choices$ DBPump,DBUntapAll | CharmNum$ 1 | PlayerTurn$ True | ActivationPhases$ BeginCombat->EndCombat
 SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Double Strike | SpellDescription$ Creatures you control gain double strike until end of turn;
 SVar:DBUntapAll:DB$ UntapAll | ValidCards$ Creature.YouCtrl | SubAbility$ DBAddCombat | SpellDescription$ Untap all creatures you control. After this phase, there is an additional combat phase.
 SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ BeginCombat | AfterPhase$ EndCombat
diff --git a/forge-gui/res/cardsfolder/s/second_sight.txt b/forge-gui/res/cardsfolder/s/second_sight.txt
index 1ece5d488c0..779285cba10 100644
--- a/forge-gui/res/cardsfolder/s/second_sight.txt
+++ b/forge-gui/res/cardsfolder/s/second_sight.txt
@@ -1,9 +1,9 @@
 Name:Second Sight
 ManaCost:2 U
 Types:Instant
-K:Entwine U
-A:SP$ Charm | Cost$ 2 U | Choices$ DBRearrange,DBRearrange2 | CharmNum$ 1 | SpellDescription$ Choose one -  Look at the top five cards of target opponent's library, then put them back in any order; or look at the top five cards of your library, then put them back in any order.
-SVar:DBRearrange:DB$ RearrangeTopOfLibrary | ValidTgts$ Opponent | TgtPrompt$ Choose target opponent. | NumCards$ 5 | SpellDescription$ Look at the top five cards of target opponent's library, then put them back in any order;
+K:Entwine:U
+A:SP$ Charm | Cost$ 2 U | Choices$ DBRearrange,DBRearrange2 | CharmNum$ 1
+SVar:DBRearrange:DB$ RearrangeTopOfLibrary | ValidTgts$ Opponent | TgtPrompt$ Choose target opponent. | NumCards$ 5 | SpellDescription$ Look at the top five cards of target opponent's library, then put them back in any order.
 SVar:DBRearrange2:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ 5 | SpellDescription$ look at the top five cards of your library, then put them back in any order.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/second_sight.jpg
diff --git a/forge-gui/res/cardsfolder/s/shriveling_rot.txt b/forge-gui/res/cardsfolder/s/shriveling_rot.txt
index 8a66aedb6e8..7cfdd6f94dc 100644
--- a/forge-gui/res/cardsfolder/s/shriveling_rot.txt
+++ b/forge-gui/res/cardsfolder/s/shriveling_rot.txt
@@ -1,9 +1,9 @@
 Name:Shriveling Rot
 ManaCost:2 B B
 Types:Instant
-K:Entwine 2 B
-A:SP$ Charm | Cost$ 2 B B | Choices$ DBEffect,DBEffect2 | CharmNum$ 1 | SpellDescription$ Choose one - Until end of turn, whenever a creature is dealt damage, destroy it; or until end of turn, whenever a creature dies, that creature's controller loses life equal to its toughness.
-SVar:DBEffect:DB$ Effect | Name$ Shriveling Rot Effect | Triggers$ Trig1 | SVars$ SVar1 | SpellDescription$ Until end of turn, whenever a creature is dealt damage, destroy it;
+K:Entwine:2 B
+A:SP$ Charm | Cost$ 2 B B | Choices$ DBEffect,DBEffect2 | CharmNum$ 1
+SVar:DBEffect:DB$ Effect | Name$ Shriveling Rot Effect | Triggers$ Trig1 | SVars$ SVar1 | SpellDescription$ Until end of turn, whenever a creature is dealt damage, destroy it.
 SVar:DBEffect2:DB$ Effect | Name$ Shriveling Rot Effect 2 | Triggers$ Trig2 | SVars$ SVar2,X | SpellDescription$ Until end of turn, whenever a creature is put into a graveyard from the battlefield, that creature's controller loses life equal to its toughness.
 SVar:Trig1:Mode$ DamageDone | ValidTarget$ Creature | Execute$ SVar1 | TriggerDescription$ Whenever a creature is dealt damage, destroy it.
 SVar:SVar1:AB$ Destroy | Cost$ 0 | Defined$ TriggeredTarget
diff --git a/forge-gui/res/cardsfolder/s/solar_tide.txt b/forge-gui/res/cardsfolder/s/solar_tide.txt
index 76905d476b9..7f170ec0285 100644
--- a/forge-gui/res/cardsfolder/s/solar_tide.txt
+++ b/forge-gui/res/cardsfolder/s/solar_tide.txt
@@ -1,9 +1,9 @@
 Name:Solar Tide
 ManaCost:4 W W
 Types:Sorcery
-K:Entwine Sac<2/Land>
-A:SP$ Charm | Cost$ 4 W W | Choices$ DBDestroyAll,DBDestroyAll2 | CharmNum$ 1 | SpellDescription$ Choose one - Destroy all creatures with power 2 or less; or destroy all creatures with power 3 or greater.
-SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.powerLE2 | SpellDescription$ Destroy all creatures with power 2 or less;
+K:Entwine:Sac<2/Land>
+A:SP$ Charm | Cost$ 4 W W | Choices$ DBDestroyAll,DBDestroyAll2 | CharmNum$ 1
+SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.powerLE2 | SpellDescription$ Destroy all creatures with power 2 or less.
 SVar:DBDestroyAll2:DB$ DestroyAll | ValidCards$ Creature.powerGE3 | SpellDescription$ Destroy all creatures with power 3 or greater.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/solar_tide.jpg
 Oracle:Choose one -\n• Destroy all creatures with power 2 or less.\n• Destroy all creatures with power 3 or greater.\nEntwine-Sacrifice two lands. (Choose both if you pay the entwine cost.)
diff --git a/forge-gui/res/cardsfolder/s/spectral_shift.txt b/forge-gui/res/cardsfolder/s/spectral_shift.txt
index 3cc00188968..7be1d78e96d 100644
--- a/forge-gui/res/cardsfolder/s/spectral_shift.txt
+++ b/forge-gui/res/cardsfolder/s/spectral_shift.txt
@@ -1,8 +1,8 @@
 Name:Spectral Shift
 ManaCost:1 U
 Types:Instant
-K:Entwine 2
-A:SP$ Charm | Cost$ 1 U | Choices$ DBBasicLand,DBColor | SpellDescription$ Choose one - Change the text of target spell or permanent by replacing all instances of one basic land type with another. (This effect last indefinitely.); or change the text of target spell or permanent by replacing all instances of one color word with another. (This effect lasts indefinitely.)
+K:Entwine:2
+A:SP$ Charm | Cost$ 1 U | Choices$ DBBasicLand,DBColor
 SVar:DBBasicLand:DB$ ChangeText | ValidTgts$ Card | TgtZone$ Stack,Battlefield | TgtPrompt$ Choose target spell or permanent | ChangeTypeWord$ ChooseBasicLandType ChooseBasicLandType | Permanent$ True | SpellDescription$ Change the text of target spell or permanent by replacing all instances of one basic land type with another. (This effect lasts indefinitely.)
 SVar:DBColor:DB$ ChangeText | ValidTgts$ Card | TgtZone$ Stack,Battlefield | TgtPrompt$ Choose target spell or permanent | ChangeColorWord$ Choose Choose | Permanent$ True | SpellDescription$ Change the text of target spell or permanent by replacing all instances of one color word with another. (This effect lasts indefinitely.)
 SVar:RemRandomDeck:True
diff --git a/forge-gui/res/cardsfolder/s/stir_the_pride.txt b/forge-gui/res/cardsfolder/s/stir_the_pride.txt
index e9d4280e1bb..8e1b8e84e26 100644
--- a/forge-gui/res/cardsfolder/s/stir_the_pride.txt
+++ b/forge-gui/res/cardsfolder/s/stir_the_pride.txt
@@ -1,13 +1,13 @@
 Name:Stir the Pride
 ManaCost:4 W
 Types:Instant
-K:Entwine 1 W
-A:SP$ Charm | Cost$ 4 W | Choices$ DBPumpAll,DBAnimateAll | CharmNum$ 1 | SpellDescription$ Choose one - Creatures you control get +2/+2 until end of turn; or until end of turn, creatures you control gain "Whenever this creature deals damage, you gain that much life."
-SVar:DBPumpAll:DB$ PumpAll | NumAtt$ 2 | NumDef$ 2 | ValidCards$ Creature.YouCtrl | SpellDescription$ Creatures you control get +2/+2 until end of turn;
-SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.YouCtrl | Triggers$ TrigPrideDamage | sVars$ GainLife,X | References$ GainLife,X | SpellDescription$ Until end of turn, creatures you control gain "Whenever this creature deals damage, you gain that much life."
+K:Entwine:1 W
+A:SP$ Charm | Cost$ 4 W | Choices$ DBPumpAll,DBAnimateAll | CharmNum$ 1
+SVar:DBPumpAll:DB$ PumpAll | NumAtt$ 2 | NumDef$ 2 | ValidCards$ Creature.YouCtrl | SpellDescription$ Creatures you control get +2/+2 until end of turn.
+SVar:DBAnimateAll:DB$ AnimateAll | ValidCards$ Creature.YouCtrl | Triggers$ TrigPrideDamage | sVars$ GainLife,GainLifeX | References$ GainLife,GainLifeX | SpellDescription$ Until end of turn, creatures you control gain "Whenever this creature deals damage, you gain that much life."
 SVar:TrigPrideDamage:Mode$ DamageDone | ValidSource$ Card.Self | Execute$ GainLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage, you gain that much life.
-SVar:GainLife:AB$ GainLife | Cost$ 0 | LifeAmount$ X | References$ X
-SVar:X:TriggerCount$DamageAmount
+SVar:GainLife:AB$ GainLife | Cost$ 0 | LifeAmount$ GainLifeX | References$ GainLifeX
+SVar:GainLifeX:TriggerCount$DamageAmount
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stir_the_pride.jpg
 Oracle:Choose one -\n• Creatures you control get +2/+2 until end of turn.\n• Until end of turn, creatures you control gain "Whenever this creature deals damage, you gain that much life."\nEntwine {1}{W} (Choose both if you pay the entwine cost.)
diff --git a/forge-gui/res/cardsfolder/t/temporal_cascade.txt b/forge-gui/res/cardsfolder/t/temporal_cascade.txt
index e42c0ebb719..9c28619582c 100644
--- a/forge-gui/res/cardsfolder/t/temporal_cascade.txt
+++ b/forge-gui/res/cardsfolder/t/temporal_cascade.txt
@@ -1,9 +1,9 @@
 Name:Temporal Cascade
 ManaCost:5 U U
 Types:Sorcery
-K:Entwine 2
-A:SP$ Charm | Cost$ 5 U U | Choices$ DBChangeZone,DBDraw | CharmNum$ 1 | SpellDescription$ Choose one - Each player shuffles his or her hand and graveyard into his or her library; or each player draws seven cards.
-SVar:DBChangeZone:DB$ ChangeZoneAll | ChangeType$ Card | Origin$ Hand,Graveyard | Destination$ Library | Shuffle$ True | Random$ True | UseAllOriginZones$ True | SpellDescription$ Each player shuffles his or her hand and graveyard into his or her library;
+K:Entwine:2
+A:SP$ Charm | Cost$ 5 U U | Choices$ DBChangeZone,DBDraw | CharmNum$ 1
+SVar:DBChangeZone:DB$ ChangeZoneAll | ChangeType$ Card | Origin$ Hand,Graveyard | Destination$ Library | Shuffle$ True | Random$ True | UseAllOriginZones$ True | SpellDescription$ Each player shuffles his or her hand and graveyard into his or her library.
 SVar:DBDraw:DB$ Draw | NumCards$ 7 | Defined$ Player | SpellDescription$ Each player draws seven cards.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temporal_cascade.jpg
diff --git a/forge-gui/res/cardsfolder/t/tooth_and_nail.txt b/forge-gui/res/cardsfolder/t/tooth_and_nail.txt
index 84fee0121c5..1bc374cf635 100644
--- a/forge-gui/res/cardsfolder/t/tooth_and_nail.txt
+++ b/forge-gui/res/cardsfolder/t/tooth_and_nail.txt
@@ -1,9 +1,9 @@
 Name:Tooth and Nail
 ManaCost:5 G G
 Types:Sorcery
-K:Entwine 2
-A:SP$ Charm | Cost$ 5 G G | Choices$ DBSearch,DBChangeZone | CharmNum$ 1 | SpellDescription$ Choose one - Search your library for up to two creature cards, reveal them, put them into your hand, then shuffle your library; or put up to two creature cards from your hand onto the battlefield.
-SVar:DBSearch:DB$ ChangeZone | Cost$ 5 G G | Origin$ Library | Destination$ Hand | ChangeType$ Creature | ChangeNum$ 2 | Reveal$ True | Shuffle$ True | SpellDescription$ Search your library for up to two creature cards, reveal them, put them into your hand, then shuffle your library;
+K:Entwine:2
+A:SP$ Charm | Cost$ 5 G G | Choices$ DBSearch,DBChangeZone | CharmNum$ 1
+SVar:DBSearch:DB$ ChangeZone | Cost$ 5 G G | Origin$ Library | Destination$ Hand | ChangeType$ Creature | ChangeNum$ 2 | Reveal$ True | Shuffle$ True | SpellDescription$ Search your library for up to two creature cards, reveal them, put them into your hand, then shuffle your library.
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 2 | SpellDescription$ Put up to two creature cards from your hand onto the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tooth_and_nail.jpg
 Oracle:Choose one -\n• Search your library for up to two creature cards, reveal them, put them into your hand, then shuffle your library.\n• Put up to two creature cards from your hand onto the battlefield.\nEntwine {2} (Choose both if you pay the entwine cost.)
diff --git a/forge-gui/res/cardsfolder/w/wail_of_the_nim.txt b/forge-gui/res/cardsfolder/w/wail_of_the_nim.txt
index db6f8283162..3d45513a4d6 100644
--- a/forge-gui/res/cardsfolder/w/wail_of_the_nim.txt
+++ b/forge-gui/res/cardsfolder/w/wail_of_the_nim.txt
@@ -1,9 +1,9 @@
 Name:Wail of the Nim
 ManaCost:2 B
 Types:Instant
-K:Entwine B
-A:SP$ Charm | Cost$ 2 B | Choices$ DBRegenerate,DBDamageAll | CharmNum$ 1 | SpellDescription$ Choose one - Regenerate each creature you control; or CARDNAME deals 1 damage to each creature and each player.
-SVar:DBRegenerate:DB$ RegenerateAll | ValidCards$ Creature.YouCtrl | SpellDescription$ Regenerate each creature you control;
+K:Entwine:B
+A:SP$ Charm | Cost$ 2 B | Choices$ DBRegenerate,DBDamageAll | CharmNum$ 1
+SVar:DBRegenerate:DB$ RegenerateAll | ValidCards$ Creature.YouCtrl | SpellDescription$ Regenerate each creature you control.
 SVar:DBDamageAll:DB$ DamageAll | ValidCards$ Creature | ValidPlayers$ Player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to each creature and each player.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wail_of_the_nim.jpg