diff --git a/.gitattributes b/.gitattributes
index d637a1264b2..23d96f5ce2b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11183,6 +11183,7 @@ forge-gui/res/cardsfolder/r/rot_farm_skeleton.txt -text
 forge-gui/res/cardsfolder/r/rot_wolf.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/r/rotcrown_ghoul.txt -text
 forge-gui/res/cardsfolder/r/roterothopter.txt svneol=native#text/plain
+forge-gui/res/cardsfolder/r/rotfeaster_maggot.txt -text
 forge-gui/res/cardsfolder/r/rotlung_reanimator.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/r/rotted_hulk.txt -text
 forge-gui/res/cardsfolder/r/rotted_hystrix.txt svneol=native#text/plain
@@ -11283,7 +11284,6 @@ forge-gui/res/cardsfolder/r/ruthless_cullblade.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/r/ruthless_invasion.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/r/rysorian_badger.txt -text
 forge-gui/res/cardsfolder/r/ryusei_the_falling_star.txt svneol=native#text/plain
-forge-gui/res/cardsfolder/s/rotfeaster_maggot.txt -text
 forge-gui/res/cardsfolder/s/saber_ants.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/s/saberclaw_golem.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/s/sabertooth_alley_cat.txt svneol=native#text/plain
diff --git a/forge-gui/res/cardsfolder/a/act_on_impulse.txt b/forge-gui/res/cardsfolder/a/act_on_impulse.txt
index c784ef0208d..add3ddecfc8 100644
--- a/forge-gui/res/cardsfolder/a/act_on_impulse.txt
+++ b/forge-gui/res/cardsfolder/a/act_on_impulse.txt
@@ -1,10 +1,10 @@
-Name:Act on Impulse
-ManaCost:2 R
-Types:Sorcery
-A:SP$ Mill | Cost$ 2 R | Defined$ You | NumCards$ 3 | Destination$ Exile | RememberMilled$ True | SubAbility$ DBMayBePlay | SpellDescription$ Exile the top three cards of your library. Until end of turn, you may play cards exiled this way.
-SVar:DBMayBePlay:DB$ Pump | Defined$ Remembered | PumpZone$ Exile | KW$ HIDDEN May be played | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:RemAIDeck:True
-SVar:RemRandomDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/act_on_impulse.jpg
-Oracle:Exile the top three cards of your library. Until end of turn, you may play cards exiled this way. (If you cast a spell this way, you still pay its costs. You can play a land this way only if you have an available land play remaining.)
+Name:Act on Impulse
+ManaCost:2 R
+Types:Sorcery
+A:SP$ Mill | Cost$ 2 R | Defined$ You | NumCards$ 3 | Destination$ Exile | RememberMilled$ True | SubAbility$ DBMayBePlay | SpellDescription$ Exile the top three cards of your library. Until end of turn, you may play cards exiled this way.
+SVar:DBMayBePlay:DB$ Pump | Defined$ Remembered | PumpZone$ Exile | KW$ HIDDEN May be played | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/act_on_impulse.jpg
+Oracle:Exile the top three cards of your library. Until end of turn, you may play cards exiled this way. (If you cast a spell this way, you still pay its costs. You can play a land this way only if you have an available land play remaining.)
diff --git a/forge-gui/res/cardsfolder/a/aeronaut_tinkerer.txt b/forge-gui/res/cardsfolder/a/aeronaut_tinkerer.txt
index 7f1e5be8763..8f8901a4354 100644
--- a/forge-gui/res/cardsfolder/a/aeronaut_tinkerer.txt
+++ b/forge-gui/res/cardsfolder/a/aeronaut_tinkerer.txt
@@ -1,9 +1,9 @@
-Name:Aeronaut Tinkerer
-ManaCost:2 U
-Types:Creature Human Artificer
-PT:2/3
-S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME has flying has flying as long as you control an artifact.
-SVar:X:Count$Valid Artifact.YouCtrl
-SVar:BuffedBy:Artifact
-SVar:Picture:http://www.wizards.com/global/images/magic/general/aeronaut_tinkerer.jpg
-Oracle:Aeronaut Tinkerer has flying as long as you control an artifact. (It can't be blocked except by creatures with flying or reach.)
+Name:Aeronaut Tinkerer
+ManaCost:2 U
+Types:Creature Human Artificer
+PT:2/3
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME has flying has flying as long as you control an artifact.
+SVar:X:Count$Valid Artifact.YouCtrl
+SVar:BuffedBy:Artifact
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aeronaut_tinkerer.jpg
+Oracle:Aeronaut Tinkerer has flying as long as you control an artifact. (It can't be blocked except by creatures with flying or reach.)
diff --git a/forge-gui/res/cardsfolder/a/aetherspouts.txt b/forge-gui/res/cardsfolder/a/aetherspouts.txt
index a1196d63446..9c0f31aa195 100644
--- a/forge-gui/res/cardsfolder/a/aetherspouts.txt
+++ b/forge-gui/res/cardsfolder/a/aetherspouts.txt
@@ -1,10 +1,10 @@
-Name:AEtherspouts
-ManaCost:3 U U
-Types:Instant
-A:SP$ RepeatEach | Cost$ 3 U U | RepeatCards$ Creature.attacking | RepeatSubAbility$ DBChangeZone | SpellDescription$ For each attacking creature, its owner puts it on the top or bottom of his or her library.
-SVar:DBChangeZone:DB$ GenericChoice | Defined$ RememberedController | ShowCurrentCard$ Remembered | Choices$ DBTop,DBBottom
-SVar:DBTop:DB$ ChangeZone | Defined$ Remembered | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put that card on the top of library
-SVar:DBBottom:DB$ ChangeZone | Defined$ Remembered | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put that card on the bottom of library
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/aetherspouts.jpg
-Oracle:For each attacking creature, its owner puts it on the top or bottom of his or her library.
+Name:AEtherspouts
+ManaCost:3 U U
+Types:Instant
+A:SP$ RepeatEach | Cost$ 3 U U | RepeatCards$ Creature.attacking | RepeatSubAbility$ DBChangeZone | SpellDescription$ For each attacking creature, its owner puts it on the top or bottom of his or her library.
+SVar:DBChangeZone:DB$ GenericChoice | Defined$ RememberedController | ShowCurrentCard$ Remembered | Choices$ DBTop,DBBottom
+SVar:DBTop:DB$ ChangeZone | Defined$ Remembered | Origin$ Battlefield | Destination$ Library | LibraryPosition$ 0 | SpellDescription$ Put that card on the top of library
+SVar:DBBottom:DB$ ChangeZone | Defined$ Remembered | Origin$ Battlefield | Destination$ Library | LibraryPosition$ -1 | SpellDescription$ Put that card on the bottom of library
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aetherspouts.jpg
+Oracle:For each attacking creature, its owner puts it on the top or bottom of his or her library.
diff --git a/forge-gui/res/cardsfolder/a/aggressive_mining.txt b/forge-gui/res/cardsfolder/a/aggressive_mining.txt
index 3a97ba45a77..03b85295404 100644
--- a/forge-gui/res/cardsfolder/a/aggressive_mining.txt
+++ b/forge-gui/res/cardsfolder/a/aggressive_mining.txt
@@ -1,8 +1,8 @@
-Name:Aggressive Mining
-ManaCost:3 R
-Types:Enchantment
-S:Mode$ CantPlayLand | Player$ You  | Description$ You can't play lands.
-A:AB$ Draw | Cost$ Sac<1/Land> | NumCards$ 2 | ActivationLimit$ 1 | SpellDescription$ Draw two cards. Activate this ability only once each turn.
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/aggressive_mining.jpg
-Oracle:You can't play lands.\nSacrifice a land: Draw two cards. Activate this ability only once each turn.
+Name:Aggressive Mining
+ManaCost:3 R
+Types:Enchantment
+S:Mode$ CantPlayLand | Player$ You  | Description$ You can't play lands.
+A:AB$ Draw | Cost$ Sac<1/Land> | NumCards$ 2 | ActivationLimit$ 1 | SpellDescription$ Draw two cards. Activate this ability only once each turn.
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/aggressive_mining.jpg
+Oracle:You can't play lands.\nSacrifice a land: Draw two cards. Activate this ability only once each turn.
diff --git a/forge-gui/res/cardsfolder/a/ajani_steadfast.txt b/forge-gui/res/cardsfolder/a/ajani_steadfast.txt
index 402b20920a7..f9e25ecb58f 100644
--- a/forge-gui/res/cardsfolder/a/ajani_steadfast.txt
+++ b/forge-gui/res/cardsfolder/a/ajani_steadfast.txt
@@ -1,14 +1,14 @@
-Name:Ajani Steadfast
-ManaCost:3 W
-Types:Planeswalker Ajani
-Loyalty:4
-A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumAtt$ +1 | NumDef$ +1 | KW$ First Strike & Vigilance & Lifelink | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Until end of turn, up to one target creature gets +1/+1 and gains first strike, vigilance, and lifelink.
-A:AB$ PutCounterAll | Cost$ SubCounter<2/LOYALTY> | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | Planeswalker$ True | SubAbility$ DBPutCounterAll | SpellDescription$ Put a +1/+1 counter on each creature you control and a loyalty counter on each other planeswalker you control.
-SVar:DBPutCounterAll:DB$ PutCounterAll | ValidCards$ Planeswalker.YouCtrl | CounterType$ LOYALTY | CounterNum$ 1
-A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Ajani Steadfast emblem | Image$ ajani_steadfast_emblem | ReplacementEffects$ RCombatDamage,RNonCombatDamage | SVars$ DBCombatDmg,DBNonCombatDmg | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage."
-SVar:RCombatDamage:Event$ DamageDone | ValidTarget$ You,Planeswalker.YouCtrl | ReplaceWith$ DBCombatDmg | PreventionEffect$ True | IsCombat$ True | Description$ If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage.
-SVar:DBCombatDmg:DB$ DealDamage | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1
-SVar:RNonCombatDamage:Event$ DamageDone | ValidTarget$ You,Planeswalker.YouCtrl | ReplaceWith$ DBNonCombatDmg | PreventionEffect$ True | IsCombat$ False | Secondary$ True | Description$ If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage.
-SVar:DBNonCombatDmg:DB$ DealDamage | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ajani_steadfast.jpg
-Oracle:[+1] Until end of turn, up to one target creature gets +1/+1 and gains first strike, vigilance, and lifelink.\n[-2] Put a +1/+1 counter on each creature you control and a loyalty counter on each other planeswalker you control.\n[-7] You get an emblem with "If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage."
+Name:Ajani Steadfast
+ManaCost:3 W
+Types:Planeswalker Ajani
+Loyalty:4
+A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumAtt$ +1 | NumDef$ +1 | KW$ First Strike & Vigilance & Lifelink | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Until end of turn, up to one target creature gets +1/+1 and gains first strike, vigilance, and lifelink.
+A:AB$ PutCounterAll | Cost$ SubCounter<2/LOYALTY> | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | Planeswalker$ True | SubAbility$ DBPutCounterAll | SpellDescription$ Put a +1/+1 counter on each creature you control and a loyalty counter on each other planeswalker you control.
+SVar:DBPutCounterAll:DB$ PutCounterAll | ValidCards$ Planeswalker.YouCtrl | CounterType$ LOYALTY | CounterNum$ 1
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Ajani Steadfast emblem | Image$ ajani_steadfast_emblem | ReplacementEffects$ RCombatDamage,RNonCombatDamage | SVars$ DBCombatDmg,DBNonCombatDmg | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage."
+SVar:RCombatDamage:Event$ DamageDone | ValidTarget$ You,Planeswalker.YouCtrl | ReplaceWith$ DBCombatDmg | PreventionEffect$ True | IsCombat$ True | Description$ If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage.
+SVar:DBCombatDmg:DB$ DealDamage | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 1
+SVar:RNonCombatDamage:Event$ DamageDone | ValidTarget$ You,Planeswalker.YouCtrl | ReplaceWith$ DBNonCombatDmg | PreventionEffect$ True | IsCombat$ False | Secondary$ True | Description$ If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage.
+SVar:DBNonCombatDmg:DB$ DealDamage | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ 1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ajani_steadfast.jpg
+Oracle:[+1] Until end of turn, up to one target creature gets +1/+1 and gains first strike, vigilance, and lifelink.\n[-2] Put a +1/+1 counter on each creature you control and a loyalty counter on each other planeswalker you control.\n[-7] You get an emblem with "If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage."
diff --git a/forge-gui/res/cardsfolder/a/altac_bloodseeker.txt b/forge-gui/res/cardsfolder/a/altac_bloodseeker.txt
index 2c9be869397..3d9a094d321 100644
--- a/forge-gui/res/cardsfolder/a/altac_bloodseeker.txt
+++ b/forge-gui/res/cardsfolder/a/altac_bloodseeker.txt
@@ -1,8 +1,8 @@
-Name:Altac Bloodseeker
-ManaCost:1 R
-Types:Creature Human Berserker
-PT:2/1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature an opponent controls dies, CARDNAME gets +2/+0 and gains first strike and haste until end of turn..
-SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ +2 | KW$ First Strike & Haste
-SVar:Picture:http://www.wizards.com/global/images/magic/general/altac_bloodseeker.jpg
-Oracle:Whenever a creature an opponent controls dies, Altac Bloodseeker gets +2/+0 and gains first strike and haste until end of turn. (It deals combat damage before creatures without first strike, and it can attack and {T} as soon as it comes under your control.)
+Name:Altac Bloodseeker
+ManaCost:1 R
+Types:Creature Human Berserker
+PT:2/1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature an opponent controls dies, CARDNAME gets +2/+0 and gains first strike and haste until end of turn..
+SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ +2 | KW$ First Strike & Haste
+SVar:Picture:http://www.wizards.com/global/images/magic/general/altac_bloodseeker.jpg
+Oracle:Whenever a creature an opponent controls dies, Altac Bloodseeker gets +2/+0 and gains first strike and haste until end of turn. (It deals combat damage before creatures without first strike, and it can attack and {T} as soon as it comes under your control.)
diff --git a/forge-gui/res/cardsfolder/a/amphin_pathmage.txt b/forge-gui/res/cardsfolder/a/amphin_pathmage.txt
index 318aeb4f4b8..5cb9212aa42 100644
--- a/forge-gui/res/cardsfolder/a/amphin_pathmage.txt
+++ b/forge-gui/res/cardsfolder/a/amphin_pathmage.txt
@@ -1,7 +1,7 @@
-Name:Amphin Pathmage
-ManaCost:3 U
-Types:Creature Salamander Wizard
-PT:3/2
-A:AB$ Pump | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature can't be blocked this turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/amphin_pathmage.jpg
-Oracle:{2}{U}: Target creature can't be blocked this turn.
+Name:Amphin Pathmage
+ManaCost:3 U
+Types:Creature Salamander Wizard
+PT:3/2
+A:AB$ Pump | Cost$ 2 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN Unblockable | SpellDescription$ Target creature can't be blocked this turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/amphin_pathmage.jpg
+Oracle:{2}{U}: Target creature can't be blocked this turn.
diff --git a/forge-gui/res/cardsfolder/a/avacyn_guardian_angel.txt b/forge-gui/res/cardsfolder/a/avacyn_guardian_angel.txt
index 647cc6e6a61..34b3e711ed2 100644
--- a/forge-gui/res/cardsfolder/a/avacyn_guardian_angel.txt
+++ b/forge-gui/res/cardsfolder/a/avacyn_guardian_angel.txt
@@ -1,17 +1,17 @@
-Name:Avacyn, Guardian Angel
-ManaCost:2 W W W
-Types:Legendary Creature Angel
-PT:5/4
-K:Flying
-K:Vigilance
-A:AB$ ChooseColor | Cost$ 1 W | Defined$ You | SubAbility$ DBEffect | SpellDescription$ Prevent all damage that would be dealt to another target creature this turn by sources of the color of your choice.
-SVar:DBEffect:DB$ Effect | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature | Name$ Avacyn, Guardian Angel Effect 1 | StaticAbilities$ STPrevent | RememberObjects$ Targeted | Triggers$ OutOfSight | SVars$ ExileSelf
-SVar:OutOfSight:Mode$ ChangesZone | TriggerZones$ Command | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsRemembered | Execute$ ExileSelf | Static$ True
-SVar:ExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
-SVar:STPrevent:Mode$ PreventDamage | EffectZone$ Command | Source$ Card.ChosenColor | Target$ Card.IsRemembered | Description$ Prevent all damage that would be dealt to another target creature this turn by sources of the color of your choice.
-A:AB$ ChooseColor | Cost$ 5 W W | Defined$ You | SubAbility$ DBEffect2 | SpellDescription$ Prevent all damage that would be dealt to target player this turn by sources of the color of your choice.
-SVar:DBEffect2:DB$ Effect | ValidTgts$ Player | Name$ Avacyn, Guardian Angel Effect 2 | StaticAbilities$ STPrevent2 | AILogic$ Fog | RememberObjects$ Targeted
-SVar:STPrevent2:Mode$ PreventDamage | EffectZone$ Command | Source$ Card.ChosenColor | Target$ Player.IsRemembered | Description$ Prevent all damage that would be dealt to target player this turn by sources of the color of your choice.
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/avacyn_guardian_angel.jpg
-Oracle:Flying, vigilance\n{1}{W}: Prevent all damage that would be dealt to another target creature this turn by sources of the color of your choice.\n{5}{W}{W}: Prevent all damage that would be dealt to target player this turn by sources of the color of your choice.
+Name:Avacyn, Guardian Angel
+ManaCost:2 W W W
+Types:Legendary Creature Angel
+PT:5/4
+K:Flying
+K:Vigilance
+A:AB$ ChooseColor | Cost$ 1 W | Defined$ You | SubAbility$ DBEffect | SpellDescription$ Prevent all damage that would be dealt to another target creature this turn by sources of the color of your choice.
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature | Name$ Avacyn, Guardian Angel Effect 1 | StaticAbilities$ STPrevent | RememberObjects$ Targeted | Triggers$ OutOfSight | SVars$ ExileSelf
+SVar:OutOfSight:Mode$ ChangesZone | TriggerZones$ Command | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsRemembered | Execute$ ExileSelf | Static$ True
+SVar:ExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+SVar:STPrevent:Mode$ PreventDamage | EffectZone$ Command | Source$ Card.ChosenColor | Target$ Card.IsRemembered | Description$ Prevent all damage that would be dealt to another target creature this turn by sources of the color of your choice.
+A:AB$ ChooseColor | Cost$ 5 W W | Defined$ You | SubAbility$ DBEffect2 | SpellDescription$ Prevent all damage that would be dealt to target player this turn by sources of the color of your choice.
+SVar:DBEffect2:DB$ Effect | ValidTgts$ Player | Name$ Avacyn, Guardian Angel Effect 2 | StaticAbilities$ STPrevent2 | AILogic$ Fog | RememberObjects$ Targeted
+SVar:STPrevent2:Mode$ PreventDamage | EffectZone$ Command | Source$ Card.ChosenColor | Target$ Player.IsRemembered | Description$ Prevent all damage that would be dealt to target player this turn by sources of the color of your choice.
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/avacyn_guardian_angel.jpg
+Oracle:Flying, vigilance\n{1}{W}: Prevent all damage that would be dealt to another target creature this turn by sources of the color of your choice.\n{5}{W}{W}: Prevent all damage that would be dealt to target player this turn by sources of the color of your choice.
diff --git a/forge-gui/res/cardsfolder/a/avarice_amulet.txt b/forge-gui/res/cardsfolder/a/avarice_amulet.txt
index 13c2f165417..b19cff933d7 100644
--- a/forge-gui/res/cardsfolder/a/avarice_amulet.txt
+++ b/forge-gui/res/cardsfolder/a/avarice_amulet.txt
@@ -1,11 +1,11 @@
-Name:Avarice Amulet
-ManaCost:4
-Types:Artifact Equipment
-K:Equip 2
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddKeyword$ Vigilance | AddTrigger$ AvariceUpkeepTrig | AddSVar$ AvariceUpkeepSVar | Description$ Equipped creature gets +2/+0 and has vigilance and "At the beginning of your upkeep, draw a card."
-SVar:AvariceUpkeepTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ AvariceUpkeepSVar | TriggerDescription$ At the beginning of your upkeep, draw a card.
-SVar:AvariceUpkeepSVar:AB$ Draw | Cost$ 0 | NumCards$ 1 | Defined$ You
-T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigGainControl | TriggerDescription$ When equipped creature dies, target opponent gains control of CARDNAME.
-SVar:TrigGainControl:AB$ GainControl | Cost$ 0 | ValidTgts$ Opponent | Defined$ Self
-SVar:Picture:http://www.wizards.com/global/images/magic/general/avarice_amulet.jpg
-Oracle:Equipped creature gets +2/+0 and has vigilance and "At the beginning of your upkeep, draw a card."\nWhen equipped creature dies, target opponent gains control of Avarice Amulet.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
+Name:Avarice Amulet
+ManaCost:4
+Types:Artifact Equipment
+K:Equip 2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddKeyword$ Vigilance | AddTrigger$ AvariceUpkeepTrig | AddSVar$ AvariceUpkeepSVar | Description$ Equipped creature gets +2/+0 and has vigilance and "At the beginning of your upkeep, draw a card."
+SVar:AvariceUpkeepTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ AvariceUpkeepSVar | TriggerDescription$ At the beginning of your upkeep, draw a card.
+SVar:AvariceUpkeepSVar:AB$ Draw | Cost$ 0 | NumCards$ 1 | Defined$ You
+T:Mode$ ChangesZone | ValidCard$ Card.AttachedBy | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigGainControl | TriggerDescription$ When equipped creature dies, target opponent gains control of CARDNAME.
+SVar:TrigGainControl:AB$ GainControl | Cost$ 0 | ValidTgts$ Opponent | Defined$ Self
+SVar:Picture:http://www.wizards.com/global/images/magic/general/avarice_amulet.jpg
+Oracle:Equipped creature gets +2/+0 and has vigilance and "At the beginning of your upkeep, draw a card."\nWhen equipped creature dies, target opponent gains control of Avarice Amulet.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/b/belligerent_sliver.txt b/forge-gui/res/cardsfolder/b/belligerent_sliver.txt
index 96ebe4c8941..95a1520156a 100644
--- a/forge-gui/res/cardsfolder/b/belligerent_sliver.txt
+++ b/forge-gui/res/cardsfolder/b/belligerent_sliver.txt
@@ -1,8 +1,8 @@
-Name:Belligerent Sliver
-ManaCost:2 R
-Types:Creature Sliver
-PT:2/2
-S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddKeyword$ CantBeBlockedByAmount LT2 | Description$ Sliver creatures you control have "This creature can't be blocked except by two or more creatures."
-SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/belligerent_sliver.jpg
-Oracle:Sliver creatures you control have "This creature can't be blocked except by two or more creatures."
+Name:Belligerent Sliver
+ManaCost:2 R
+Types:Creature Sliver
+PT:2/2
+S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddKeyword$ CantBeBlockedByAmount LT2 | Description$ Sliver creatures you control have "This creature can't be blocked except by two or more creatures."
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/belligerent_sliver.jpg
+Oracle:Sliver creatures you control have "This creature can't be blocked except by two or more creatures."
diff --git a/forge-gui/res/cardsfolder/b/blastfire_bolt.txt b/forge-gui/res/cardsfolder/b/blastfire_bolt.txt
index ed384e5201f..7d932da928c 100644
--- a/forge-gui/res/cardsfolder/b/blastfire_bolt.txt
+++ b/forge-gui/res/cardsfolder/b/blastfire_bolt.txt
@@ -1,7 +1,7 @@
-Name:Blastfire Bolt
-ManaCost:6 R
-Types:Instant
-A:SP$ DealDamage | Cost$ 6 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 5 | SubAbility$ ChompEquip | SpellDescription$ CARDNAME deals 5 damage to target creature. Destroy all Equipment attached to that creature.
-SVar:ChompEquip:DB$ DestroyAll | ValidCards$ Targeted.Equipment+Attached
-SVar:Picture:http://www.wizards.com/global/images/magic/general/blastfire_bolt.jpg
-Oracle:Blastfire Bolt deals 5 damage to target creature. Destroy all Equipment attached to that creature.
+Name:Blastfire Bolt
+ManaCost:6 R
+Types:Instant
+A:SP$ DealDamage | Cost$ 6 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 5 | SubAbility$ ChompEquip | SpellDescription$ CARDNAME deals 5 damage to target creature. Destroy all Equipment attached to that creature.
+SVar:ChompEquip:DB$ DestroyAll | ValidCards$ Targeted.Equipment+Attached
+SVar:Picture:http://www.wizards.com/global/images/magic/general/blastfire_bolt.jpg
+Oracle:Blastfire Bolt deals 5 damage to target creature. Destroy all Equipment attached to that creature.
diff --git a/forge-gui/res/cardsfolder/b/blood_host.txt b/forge-gui/res/cardsfolder/b/blood_host.txt
index 90354257639..55629673336 100644
--- a/forge-gui/res/cardsfolder/b/blood_host.txt
+++ b/forge-gui/res/cardsfolder/b/blood_host.txt
@@ -1,8 +1,8 @@
-Name:Blood Host
-ManaCost:3 B B
-Types:Creature Vampire
-PT:3/3
-A:AB$ PutCounter | Cost$ 1 B Sac<1/Creature.Other/creature other than CARDNAME> | CounterType$ P1P1 | CounterNum$1 | SubAbility$ DBGainLife | SpellDescription$ Put a +1/+1 counter on CARDNAME and you gain 2 life.
-SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
-SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_host.jpg
-Oracle:{1}{B}, Sacrifice another creature: Put a +1/+1 counter on Blood Host and you gain 2 life.
+Name:Blood Host
+ManaCost:3 B B
+Types:Creature Vampire
+PT:3/3
+A:AB$ PutCounter | Cost$ 1 B Sac<1/Creature.Other/creature other than CARDNAME> | CounterType$ P1P1 | CounterNum$1 | SubAbility$ DBGainLife | SpellDescription$ Put a +1/+1 counter on CARDNAME and you gain 2 life.
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
+SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_host.jpg
+Oracle:{1}{B}, Sacrifice another creature: Put a +1/+1 counter on Blood Host and you gain 2 life.
diff --git a/forge-gui/res/cardsfolder/b/boonweaver_giant.txt b/forge-gui/res/cardsfolder/b/boonweaver_giant.txt
index f329d2df197..fe3723a3ae2 100644
--- a/forge-gui/res/cardsfolder/b/boonweaver_giant.txt
+++ b/forge-gui/res/cardsfolder/b/boonweaver_giant.txt
@@ -1,9 +1,9 @@
-Name:Boonweaver Giant
-ManaCost:6 W
-Types:Creature Giant Monk
-PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your graveyard, hand, and/or library for an Aura card and put it onto the battlefield attached to Boonweaver Giant. If you search your library this way, shuffle it.
-SVar:TrigSearch:DB$ ChangeZone | Hidden$ True | Origin$ Library | OriginChoice$ True | OriginAlternative$ Graveyard,Hand | AlternativeMessage$ Would you like to search your library with this ability? If you do, your library will be shuffled. | Destination$ Battlefield | ChangeType$ Aura | AttachedTo$ Self | ShuffleNonMandatory$ True
-DeckNeeds:Type$Aura
-SVar:Picture:http://www.wizards.com/global/images/magic/general/boonweaver_giant.jpg
-Oracle:When Boonweaver Giant enters the battlefield, you may search your graveyard, hand, and/or library for an Aura card and put it onto the battlefield attached to Boonweaver Giant. If you search your library this way, shuffle it.
+Name:Boonweaver Giant
+ManaCost:6 W
+Types:Creature Giant Monk
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSearch | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your graveyard, hand, and/or library for an Aura card and put it onto the battlefield attached to Boonweaver Giant. If you search your library this way, shuffle it.
+SVar:TrigSearch:DB$ ChangeZone | Hidden$ True | Origin$ Library | OriginChoice$ True | OriginAlternative$ Graveyard,Hand | AlternativeMessage$ Would you like to search your library with this ability? If you do, your library will be shuffled. | Destination$ Battlefield | ChangeType$ Aura | AttachedTo$ Self | ShuffleNonMandatory$ True
+DeckNeeds:Type$Aura
+SVar:Picture:http://www.wizards.com/global/images/magic/general/boonweaver_giant.jpg
+Oracle:When Boonweaver Giant enters the battlefield, you may search your graveyard, hand, and/or library for an Aura card and put it onto the battlefield attached to Boonweaver Giant. If you search your library this way, shuffle it.
diff --git a/forge-gui/res/cardsfolder/b/borderland_marauder.txt b/forge-gui/res/cardsfolder/b/borderland_marauder.txt
index f8fc0b7fa6f..41724410ef3 100644
--- a/forge-gui/res/cardsfolder/b/borderland_marauder.txt
+++ b/forge-gui/res/cardsfolder/b/borderland_marauder.txt
@@ -1,8 +1,8 @@
-Name:Borderland Marauder
-ManaCost:1 R
-Types:Creature Human Warrior
-PT:1/2
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +2/+0 until end of turn.
-SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2
-SVar:Picture:http://www.wizards.com/global/images/magic/general/borderland_marauder.jpg
-Oracle:Whenever Borderland Marauder attacks, it gets +2/+0 until end of turn.
+Name:Borderland Marauder
+ManaCost:1 R
+Types:Creature Human Warrior
+PT:1/2
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +2/+0 until end of turn.
+SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2
+SVar:Picture:http://www.wizards.com/global/images/magic/general/borderland_marauder.jpg
+Oracle:Whenever Borderland Marauder attacks, it gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/b/brawlers_plate.txt b/forge-gui/res/cardsfolder/b/brawlers_plate.txt
index acba5bd36ed..07eccb3586e 100644
--- a/forge-gui/res/cardsfolder/b/brawlers_plate.txt
+++ b/forge-gui/res/cardsfolder/b/brawlers_plate.txt
@@ -1,7 +1,7 @@
-Name:Brawler's Plate
-ManaCost:3
-Types:Artifact Equipment
-K:Equip 4
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Trample | Description$ Equipped creature gets +2/+2 and has trample.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/brawlers_plate.jpg
-Oracle:Equipped creature gets +2/+2 and has trample. (If it would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)\nEquip {4} ({4}: Attach to target creature you control. Equip only as a sorcery.)
+Name:Brawler's Plate
+ManaCost:3
+Types:Artifact Equipment
+K:Equip 4
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Trample | Description$ Equipped creature gets +2/+2 and has trample.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/brawlers_plate.jpg
+Oracle:Equipped creature gets +2/+2 and has trample. (If it would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)\nEquip {4} ({4}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/b/brood_keeper.txt b/forge-gui/res/cardsfolder/b/brood_keeper.txt
index 99d9f02f782..3852e68c249 100644
--- a/forge-gui/res/cardsfolder/b/brood_keeper.txt
+++ b/forge-gui/res/cardsfolder/b/brood_keeper.txt
@@ -1,10 +1,10 @@
-Name:Brood Keeper
-ManaCost:3 R
-Types:Creature Human Shaman
-PT:2/3
-T:Mode$ Attached | ValidSource$ Aura | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever an Aura becomes attached to CARDNAME, put a 2/2 red Dragon creature token with flying onto the battlefield. It has "{R}: This creature gets +1/+0 until end of turn."
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenOwner$ You | TokenColors$ Red | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Flying | TokenAbilities$ BroodPump
-SVar:BroodPump:AB$ Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
-SVar:EnchantMe:Multiple
-SVar:Picture:http://www.wizards.com/global/images/magic/general/brood_keeper.jpg
-Oracle:Whenever an Aura becomes attached to Brood Keeper, put a 2/2 red Dragon creature token with flying onto the battlefield. It has "{R}: This creature gets +1/+0 until end of turn."
+Name:Brood Keeper
+ManaCost:3 R
+Types:Creature Human Shaman
+PT:2/3
+T:Mode$ Attached | ValidSource$ Aura | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever an Aura becomes attached to CARDNAME, put a 2/2 red Dragon creature token with flying onto the battlefield. It has "{R}: This creature gets +1/+0 until end of turn."
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenOwner$ You | TokenColors$ Red | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Flying | TokenAbilities$ BroodPump
+SVar:BroodPump:AB$ Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
+SVar:EnchantMe:Multiple
+SVar:Picture:http://www.wizards.com/global/images/magic/general/brood_keeper.jpg
+Oracle:Whenever an Aura becomes attached to Brood Keeper, put a 2/2 red Dragon creature token with flying onto the battlefield. It has "{R}: This creature gets +1/+0 until end of turn."
diff --git a/forge-gui/res/cardsfolder/b/burning_anger.txt b/forge-gui/res/cardsfolder/b/burning_anger.txt
index 08d5c772128..7c400dc3e10 100644
--- a/forge-gui/res/cardsfolder/b/burning_anger.txt
+++ b/forge-gui/res/cardsfolder/b/burning_anger.txt
@@ -1,11 +1,11 @@
-Name:Burning Anger
-ManaCost:4 R
-Types:Enchantment Aura
-K:Enchant creature
-A:SP$ Attach | Cost$ 4 R | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ TapDmg | AddSVar$ BurningAngerDmg | Description$ Enchanted creature has "{T}: This creature deals damage equal to its power to target creature or player."
-SVar:TapDmg:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ BurningAngerDmg | References$ BurningAngerDmg | SpellDescription$ CARDNAME deals damage equal to its power to target creature or player.
-SVar:BurningAngerDmg:Count$CardPower
-SVar:NonStackingAttachEffect:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/burning_anger.jpg
-Oracle:Enchant creature\nEnchanted creature has "{T}: This creature deals damage equal to its power to target creature or player."
+Name:Burning Anger
+ManaCost:4 R
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ 4 R | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ TapDmg | AddSVar$ BurningAngerDmg | Description$ Enchanted creature has "{T}: This creature deals damage equal to its power to target creature or player."
+SVar:TapDmg:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ BurningAngerDmg | References$ BurningAngerDmg | SpellDescription$ CARDNAME deals damage equal to its power to target creature or player.
+SVar:BurningAngerDmg:Count$CardPower
+SVar:NonStackingAttachEffect:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/burning_anger.jpg
+Oracle:Enchant creature\nEnchanted creature has "{T}: This creature deals damage equal to its power to target creature or player."
diff --git a/forge-gui/res/cardsfolder/c/carnivorous_moss_beast.txt b/forge-gui/res/cardsfolder/c/carnivorous_moss_beast.txt
index c062967b2fb..ecb854b755a 100644
--- a/forge-gui/res/cardsfolder/c/carnivorous_moss_beast.txt
+++ b/forge-gui/res/cardsfolder/c/carnivorous_moss_beast.txt
@@ -1,7 +1,7 @@
-Name:Carnivorous Moss-Beast
-ManaCost:4 G G
-Types:Creature Plant Elemental Beast
-PT:4/5
-A:AB$ PutCounter | Cost$ 5 G G | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/carnivorous_moss_beast.jpg
-Oracle:{5}{G}{G}: Put a +1/+1 counter on Carnivorous Moss-Beast.
+Name:Carnivorous Moss-Beast
+ManaCost:4 G G
+Types:Creature Plant Elemental Beast
+PT:4/5
+A:AB$ PutCounter | Cost$ 5 G G | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/carnivorous_moss_beast.jpg
+Oracle:{5}{G}{G}: Put a +1/+1 counter on Carnivorous Moss-Beast.
diff --git a/forge-gui/res/cardsfolder/c/carrion_crow.txt b/forge-gui/res/cardsfolder/c/carrion_crow.txt
index eb2f4c78ab8..1700a0b8f6a 100644
--- a/forge-gui/res/cardsfolder/c/carrion_crow.txt
+++ b/forge-gui/res/cardsfolder/c/carrion_crow.txt
@@ -1,8 +1,8 @@
-Name:Carrion Crow
-ManaCost:2 B
-Types:Creature Zombie Bird
-PT:2/2
-K:Flying
-K:CARDNAME enters the battlefield tapped.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/carrion_crow.jpg
-Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nCarrion Crow enters the battlefield tapped.
+Name:Carrion Crow
+ManaCost:2 B
+Types:Creature Zombie Bird
+PT:2/2
+K:Flying
+K:CARDNAME enters the battlefield tapped.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/carrion_crow.jpg
+Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nCarrion Crow enters the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/c/chasm_skulker.txt b/forge-gui/res/cardsfolder/c/chasm_skulker.txt
index faba9832f08..379cc291789 100644
--- a/forge-gui/res/cardsfolder/c/chasm_skulker.txt
+++ b/forge-gui/res/cardsfolder/c/chasm_skulker.txt
@@ -1,11 +1,11 @@
-Name:Chasm Skulker
-ManaCost:2 U
-Types:Creature Squid Horror
-PT:1/1
-T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you draw a card, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put X 1/1 blue Squid creature tokens with islandwalk onto the battlefield, where X is the number of +1/+1 counters on CARDNAME.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ X | References$ X | TokenName$ Squid | TokenTypes$ Creature,Squid | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Islandwalk
-SVar:X:TriggeredCard$CardCounters.P1P1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/chasm_skulker.jpg
-Oracle:Whenever you draw a card, put a +1/+1 counter on Chasm Skulker.\nWhen Chasm Skulker dies, put X 1/1 blue Squid creature tokens with islandwalk onto the battlefield, where X is the number of +1/+1 counters on Chasm Skulker. (They can't be blocked as long as defending player controls an Island.)
+Name:Chasm Skulker
+ManaCost:2 U
+Types:Creature Squid Horror
+PT:1/1
+T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you draw a card, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put X 1/1 blue Squid creature tokens with islandwalk onto the battlefield, where X is the number of +1/+1 counters on CARDNAME.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ X | References$ X | TokenName$ Squid | TokenTypes$ Creature,Squid | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Islandwalk
+SVar:X:TriggeredCard$CardCounters.P1P1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/chasm_skulker.jpg
+Oracle:Whenever you draw a card, put a +1/+1 counter on Chasm Skulker.\nWhen Chasm Skulker dies, put X 1/1 blue Squid creature tokens with islandwalk onto the battlefield, where X is the number of +1/+1 counters on Chasm Skulker. (They can't be blocked as long as defending player controls an Island.)
diff --git a/forge-gui/res/cardsfolder/c/chief_engineer.txt b/forge-gui/res/cardsfolder/c/chief_engineer.txt
index 7cb62ae0238..a3aeaf4c44a 100644
--- a/forge-gui/res/cardsfolder/c/chief_engineer.txt
+++ b/forge-gui/res/cardsfolder/c/chief_engineer.txt
@@ -1,8 +1,8 @@
-Name:Chief Engineer
-ManaCost:1 U
-Types:Creature Vedalken Artificer
-PT:1/3
-S:Mode$ Continuous | Affected$ Card.Artifact+YouCtrl | AffectedZone$ Stack | AddKeyword$ Convoke | Description$ Artifact spells you cast have convoke.
-SVar:RemRandomDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/chief_engineer.jpg
-Oracle:Artifact spells you cast have convoke. (Your creatures can help cast those spells. Each creature you tap while casting an artifact spell pays for {1} or one mana of that creature's color.)
+Name:Chief Engineer
+ManaCost:1 U
+Types:Creature Vedalken Artificer
+PT:1/3
+S:Mode$ Continuous | Affected$ Card.Artifact+YouCtrl | AffectedZone$ Stack | AddKeyword$ Convoke | Description$ Artifact spells you cast have convoke.
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/chief_engineer.jpg
+Oracle:Artifact spells you cast have convoke. (Your creatures can help cast those spells. Each creature you tap while casting an artifact spell pays for {1} or one mana of that creature's color.)
diff --git a/forge-gui/res/cardsfolder/c/chronostutter.txt b/forge-gui/res/cardsfolder/c/chronostutter.txt
index da296c3c4d6..5cbe6c47922 100644
--- a/forge-gui/res/cardsfolder/c/chronostutter.txt
+++ b/forge-gui/res/cardsfolder/c/chronostutter.txt
@@ -1,7 +1,7 @@
-Name:Chronostutter
-ManaCost:5 U
-Types:Instant
-A:SP$ ChangeZone | Cost$ 5 U | Origin$ Battlefield | Destination$ Library | ValidTgts$ Creature | LibraryPosition$ 1 | SpellDescription$ Put target creature into its owner's library second from the top.
-# Library Position is zero indexed. So 1 is second from the top
-SVar:Picture:http://www.wizards.com/global/images/magic/general/chronostutter.jpg
-Oracle:Put target creature into its owner's library second from the top.
+Name:Chronostutter
+ManaCost:5 U
+Types:Instant
+A:SP$ ChangeZone | Cost$ 5 U | Origin$ Battlefield | Destination$ Library | ValidTgts$ Creature | LibraryPosition$ 1 | SpellDescription$ Put target creature into its owner's library second from the top.
+# Library Position is zero indexed. So 1 is second from the top
+SVar:Picture:http://www.wizards.com/global/images/magic/general/chronostutter.jpg
+Oracle:Put target creature into its owner's library second from the top.
diff --git a/forge-gui/res/cardsfolder/c/constricting_sliver.txt b/forge-gui/res/cardsfolder/c/constricting_sliver.txt
index 4d19e6b8c0c..60216551550 100644
--- a/forge-gui/res/cardsfolder/c/constricting_sliver.txt
+++ b/forge-gui/res/cardsfolder/c/constricting_sliver.txt
@@ -1,14 +1,14 @@
-Name:Constricting Sliver
-ManaCost:5 W
-Types:Creature Sliver
-PT:3/3
-S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddTrigger$ ConstrictingTrig | AddSVar$ ConstrictingSliverExile & ConstrictingEffect & ConstrictingComeBack & ConstrictingTrigReturn & ConstrictingExileSelf | Description$ Sliver creatures you control have "When this creature enters the battlefield, you may exile target creature an opponent controls until this creature leaves the battlefield."
-SVar:ConstrictingTrig:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ ConstrictingSliverExile | TriggerDescription$ When CARDNAME enters the battlefield, you may exile target creature an opponent controls until CARDNAME leaves the battlefield.
-SVar:ConstrictingSliverExile:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | ConditionPresent$ Card.Self | SubAbility$ ConstrictingEffect
-SVar:ConstrictingEffect:DB$ Effect | Triggers$ ConstrictingComeBack | RememberObjects$ Remembered | ImprintCards$ Self | SVars$ ConstrictingTrigReturn,ConstrictingExileSelf | ConditionPresent$ Card.Self | Duration$ Permanent
-SVar:ConstrictingComeBack:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsImprinted | Execute$ ConstrictingTrigReturn | TriggerZones$ Command | TriggerController$ TriggeredCardController | Static$ True | TriggerDescription$ That permanent is exiled until this creature leaves the battlefield.
-SVar:ConstrictingTrigReturn:AB$ ChangeZoneAll | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | ChangeType$ Card.IsRemembered | SubAbility$ ConstrictingExileSelf
-SVar:ConstrictingExileSelf:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self
-SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/constricting_sliver.jpg
-Oracle:Sliver creatures you control have "When this creature enters the battlefield, you may exile target creature an opponent controls until this creature leaves the battlefield."
+Name:Constricting Sliver
+ManaCost:5 W
+Types:Creature Sliver
+PT:3/3
+S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddTrigger$ ConstrictingTrig | AddSVar$ ConstrictingSliverExile & ConstrictingEffect & ConstrictingComeBack & ConstrictingTrigReturn & ConstrictingExileSelf | Description$ Sliver creatures you control have "When this creature enters the battlefield, you may exile target creature an opponent controls until this creature leaves the battlefield."
+SVar:ConstrictingTrig:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ ConstrictingSliverExile | TriggerDescription$ When CARDNAME enters the battlefield, you may exile target creature an opponent controls until CARDNAME leaves the battlefield.
+SVar:ConstrictingSliverExile:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | ConditionPresent$ Card.Self | SubAbility$ ConstrictingEffect
+SVar:ConstrictingEffect:DB$ Effect | Triggers$ ConstrictingComeBack | RememberObjects$ Remembered | ImprintCards$ Self | SVars$ ConstrictingTrigReturn,ConstrictingExileSelf | ConditionPresent$ Card.Self | Duration$ Permanent
+SVar:ConstrictingComeBack:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.IsImprinted | Execute$ ConstrictingTrigReturn | TriggerZones$ Command | TriggerController$ TriggeredCardController | Static$ True | TriggerDescription$ That permanent is exiled until this creature leaves the battlefield.
+SVar:ConstrictingTrigReturn:AB$ ChangeZoneAll | Cost$ 0 | Origin$ Exile | Destination$ Battlefield | ChangeType$ Card.IsRemembered | SubAbility$ ConstrictingExileSelf
+SVar:ConstrictingExileSelf:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/constricting_sliver.jpg
+Oracle:Sliver creatures you control have "When this creature enters the battlefield, you may exile target creature an opponent controls until this creature leaves the battlefield."
diff --git a/forge-gui/res/cardsfolder/c/coral_barrier.txt b/forge-gui/res/cardsfolder/c/coral_barrier.txt
index 2db80c89565..eea201cf7ca 100644
--- a/forge-gui/res/cardsfolder/c/coral_barrier.txt
+++ b/forge-gui/res/cardsfolder/c/coral_barrier.txt
@@ -1,9 +1,9 @@
-Name:Coral Barrier
-ManaCost:2 U
-Types:Creature Wall
-PT:1/3
-K:Defender
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 1/1 blue Squid creature token with Islandwalk onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Squid | TokenTypes$ Creature,Squid | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Islandwalk
-SVar:Picture:http://www.wizards.com/global/images/magic/general/coral_barrier.jpg
-Oracle:Defender (This creature can't attack.)\nWhen Coral Barrier enters the battlefield, put a 1/1 blue Squid creature token with islandwalk onto the battlefield. (It can't be blocked as long as defending player controls an Island.)
+Name:Coral Barrier
+ManaCost:2 U
+Types:Creature Wall
+PT:1/3
+K:Defender
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 1/1 blue Squid creature token with Islandwalk onto the battlefield.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Squid | TokenTypes$ Creature,Squid | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Islandwalk
+SVar:Picture:http://www.wizards.com/global/images/magic/general/coral_barrier.jpg
+Oracle:Defender (This creature can't attack.)\nWhen Coral Barrier enters the battlefield, put a 1/1 blue Squid creature token with islandwalk onto the battlefield. (It can't be blocked as long as defending player controls an Island.)
diff --git a/forge-gui/res/cardsfolder/c/covenant_of_blood.txt b/forge-gui/res/cardsfolder/c/covenant_of_blood.txt
index d17e852d3bb..1b0f49b600e 100644
--- a/forge-gui/res/cardsfolder/c/covenant_of_blood.txt
+++ b/forge-gui/res/cardsfolder/c/covenant_of_blood.txt
@@ -1,8 +1,8 @@
-Name:Covenant of Blood
-ManaCost:6 B
-Types:Sorcery
-K:Convoke
-A:SP$ DealDamage | Cost$ 6 B | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 4 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 4 damage to target creature or player and you gain 4 life.
-SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 4
-SVar:Picture:http://www.wizards.com/global/images/magic/general/covenant_of_blood.jpg
-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.)\nCovenant of Blood deals 4 damage to target creature or player and you gain 4 life.
+Name:Covenant of Blood
+ManaCost:6 B
+Types:Sorcery
+K:Convoke
+A:SP$ DealDamage | Cost$ 6 B | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 4 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 4 damage to target creature or player and you gain 4 life.
+SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 4
+SVar:Picture:http://www.wizards.com/global/images/magic/general/covenant_of_blood.jpg
+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.)\nCovenant of Blood deals 4 damage to target creature or player and you gain 4 life.
diff --git a/forge-gui/res/cardsfolder/c/crowds_favor.txt b/forge-gui/res/cardsfolder/c/crowds_favor.txt
index 304f1ca3501..d366b396774 100644
--- a/forge-gui/res/cardsfolder/c/crowds_favor.txt
+++ b/forge-gui/res/cardsfolder/c/crowds_favor.txt
@@ -1,7 +1,7 @@
-Name:Crowd's Favor
-ManaCost:R
-Types:Instant
-K:Convoke
-A:SP$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | KW$ First Strike | SpellDescription$ Target creature gets +1/+0 and gains first strike until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/crowds_favor.jpg
-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.)\nTarget creature gets +1/+0 and gains first strike until end of turn. (It deals combat damage before creatures without first strike.)
+Name:Crowd's Favor
+ManaCost:R
+Types:Instant
+K:Convoke
+A:SP$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | KW$ First Strike | SpellDescription$ Target creature gets +1/+0 and gains first strike until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/crowds_favor.jpg
+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.)\nTarget creature gets +1/+0 and gains first strike until end of turn. (It deals combat damage before creatures without first strike.)
diff --git a/forge-gui/res/cardsfolder/c/cruel_sadist.txt b/forge-gui/res/cardsfolder/c/cruel_sadist.txt
index 132e2d8e8d9..fc92ab36394 100644
--- a/forge-gui/res/cardsfolder/c/cruel_sadist.txt
+++ b/forge-gui/res/cardsfolder/c/cruel_sadist.txt
@@ -1,10 +1,10 @@
-Name:Cruel Sadist
-ManaCost:B
-Types:Creature Human Assassin
-PT:1/1
-A:AB$ PutCounter | Cost$ B T PayLife<1> | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
-A:AB$ DealDamage | Cost$ 2 B T SubCounter<X/P1P1> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ ChosenX | References$ X | SpellDescription$ CARDNAME deals X damage to target creature.
-SVar:X:XChoice
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/cruel_sadist.jpg
-Oracle:{B}, {T}, Pay 1 life: Put a +1/+1 counter on Cruel Sadist.\n{2}{B}, {T}, Remove X +1/+1 counters from Cruel Sadist: Cruel Sadist deals X damage to target creature.
+Name:Cruel Sadist
+ManaCost:B
+Types:Creature Human Assassin
+PT:1/1
+A:AB$ PutCounter | Cost$ B T PayLife<1> | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
+A:AB$ DealDamage | Cost$ 2 B T SubCounter<X/P1P1> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ ChosenX | References$ X | SpellDescription$ CARDNAME deals X damage to target creature.
+SVar:X:XChoice
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/cruel_sadist.jpg
+Oracle:{B}, {T}, Pay 1 life: Put a +1/+1 counter on Cruel Sadist.\n{2}{B}, {T}, Remove X +1/+1 counters from Cruel Sadist: Cruel Sadist deals X damage to target creature.
diff --git a/forge-gui/res/cardsfolder/d/dauntless_river_marshal.txt b/forge-gui/res/cardsfolder/d/dauntless_river_marshal.txt
index aa12bf8f67a..c2678d2d2d6 100644
--- a/forge-gui/res/cardsfolder/d/dauntless_river_marshal.txt
+++ b/forge-gui/res/cardsfolder/d/dauntless_river_marshal.txt
@@ -1,11 +1,11 @@
-Name:Dauntless River Marshal
-ManaCost:1 W
-Types:Creature Human Soldier
-PT:2/1
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control an Island.
-SVar:X:Count$Valid Island.YouCtrl
-SVar:BuffedBy:Island
-A:AB$ Tap | Cost$ 3 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature.
-DeckNeeds:Color$Blue
-SVar:Picture:http://www.wizards.com/global/images/magic/general/dauntless_river_marshal.jpg
-Oracle:Dauntless River Marshal gets +1/+1 as long as you control an Island.\n{3}{U}: Tap target creature.
+Name:Dauntless River Marshal
+ManaCost:1 W
+Types:Creature Human Soldier
+PT:2/1
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control an Island.
+SVar:X:Count$Valid Island.YouCtrl
+SVar:BuffedBy:Island
+A:AB$ Tap | Cost$ 3 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature.
+DeckNeeds:Color$Blue
+SVar:Picture:http://www.wizards.com/global/images/magic/general/dauntless_river_marshal.jpg
+Oracle:Dauntless River Marshal gets +1/+1 as long as you control an Island.\n{3}{U}: Tap target creature.
diff --git a/forge-gui/res/cardsfolder/d/dead_ringers.txt b/forge-gui/res/cardsfolder/d/dead_ringers.txt
index e06defdb46d..586c1f8da10 100644
--- a/forge-gui/res/cardsfolder/d/dead_ringers.txt
+++ b/forge-gui/res/cardsfolder/d/dead_ringers.txt
@@ -1,8 +1,8 @@
-Name:Dead Ringers
-ManaCost:4 B
-Types:Sorcery
-A:SP$ Destroy | Cost$ 4 B | TargetMin$ 2 | TargetMax$ 2 | NoRegen$ True | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creatures | RememberOriginalTargets$ True | SubAbility$ DBCleanup | ConditionShareAllColors$ DirectRemembered | SpellDescription$ Destroy two target nonblack creatures unless either one is a color the other isn't. They can't be regenerated.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/dead_ringers.jpg
-Oracle:Destroy two target nonblack creatures unless either one is a color the other isn't. They can't be regenerated.
+Name:Dead Ringers
+ManaCost:4 B
+Types:Sorcery
+A:SP$ Destroy | Cost$ 4 B | TargetMin$ 2 | TargetMax$ 2 | NoRegen$ True | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creatures | RememberOriginalTargets$ True | SubAbility$ DBCleanup | ConditionShareAllColors$ DirectRemembered | SpellDescription$ Destroy two target nonblack creatures unless either one is a color the other isn't. They can't be regenerated.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/dead_ringers.jpg
+Oracle:Destroy two target nonblack creatures unless either one is a color the other isn't. They can't be regenerated.
diff --git a/forge-gui/res/cardsfolder/e/endless_obedience.txt b/forge-gui/res/cardsfolder/e/endless_obedience.txt
index 7a66c32f4b9..a58b618b7ea 100644
--- a/forge-gui/res/cardsfolder/e/endless_obedience.txt
+++ b/forge-gui/res/cardsfolder/e/endless_obedience.txt
@@ -1,7 +1,7 @@
-Name:Endless Obedience
-ManaCost:4 B B
-Types:Sorcery
-K:Convoke
-A:SP$ ChangeZone | Cost$ 4 B B | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Choose target creature card in a graveyard | ValidTgts$ Creature | SpellDescription$ Put target creature card from a graveyard onto the battlefield under your control.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/endless_obedience.jpg
-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.)\nPut target creature card from a graveyard onto the battlefield under your control.
+Name:Endless Obedience
+ManaCost:4 B B
+Types:Sorcery
+K:Convoke
+A:SP$ ChangeZone | Cost$ 4 B B | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Choose target creature card in a graveyard | ValidTgts$ Creature | SpellDescription$ Put target creature card from a graveyard onto the battlefield under your control.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/endless_obedience.jpg
+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.)\nPut target creature card from a graveyard onto the battlefield under your control.
diff --git a/forge-gui/res/cardsfolder/e/ensoul_artifact.txt b/forge-gui/res/cardsfolder/e/ensoul_artifact.txt
index 008965001fe..30bedb9508e 100644
--- a/forge-gui/res/cardsfolder/e/ensoul_artifact.txt
+++ b/forge-gui/res/cardsfolder/e/ensoul_artifact.txt
@@ -1,9 +1,9 @@
-Name:Ensoul Artifact
-ManaCost:1 U
-Types:Enchantment Aura
-K:Enchant artifact
-A:SP$ Attach | Cost$ 1 U | ValidTgts$ Artifact | AITgts$ Card.nonCreature | AILogic$ Animate
-S:Mode$ Continuous | Affected$ Card.AttachedBy | SetPower$ 5 | SetToughness$ 5 | AddType$ Creature | Description$ Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types.
-SVar:RemRandomDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ensoul_artifact.jpg
-Oracle:Enchant artifact\nEnchanted artifact is a creature with base power and toughness 5/5 in addition to its other types.
+Name:Ensoul Artifact
+ManaCost:1 U
+Types:Enchantment Aura
+K:Enchant artifact
+A:SP$ Attach | Cost$ 1 U | ValidTgts$ Artifact | AITgts$ Card.nonCreature | AILogic$ Animate
+S:Mode$ Continuous | Affected$ Card.AttachedBy | SetPower$ 5 | SetToughness$ 5 | AddType$ Creature | Description$ Enchanted artifact is a creature with base power and toughness 5/5 in addition to its other types.
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ensoul_artifact.jpg
+Oracle:Enchant artifact\nEnchanted artifact is a creature with base power and toughness 5/5 in addition to its other types.
diff --git a/forge-gui/res/cardsfolder/e/ephemeral_shields.txt b/forge-gui/res/cardsfolder/e/ephemeral_shields.txt
index 9ef859193fe..41d5721fbf1 100644
--- a/forge-gui/res/cardsfolder/e/ephemeral_shields.txt
+++ b/forge-gui/res/cardsfolder/e/ephemeral_shields.txt
@@ -1,7 +1,7 @@
-Name:Ephemeral Shields
-ManaCost:1 W
-Types:Instant
-K:Convoke
-A:SP$ Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Indestructible | SpellDescription$ Target creature gains indestructible until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ephemeral_shields.jpg
-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.)\nTarget creature gains indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.)
+Name:Ephemeral Shields
+ManaCost:1 W
+Types:Instant
+K:Convoke
+A:SP$ Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Indestructible | SpellDescription$ Target creature gains indestructible until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ephemeral_shields.jpg
+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.)\nTarget creature gains indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.)
diff --git a/forge-gui/res/cardsfolder/e/eternal_thirst.txt b/forge-gui/res/cardsfolder/e/eternal_thirst.txt
index 5fef3f65dca..5f07b1e443f 100644
--- a/forge-gui/res/cardsfolder/e/eternal_thirst.txt
+++ b/forge-gui/res/cardsfolder/e/eternal_thirst.txt
@@ -1,11 +1,11 @@
-Name:Eternal Thirst
-ManaCost:1 B
-Types:Enchantment Aura
-K:Enchant creature
-A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Lifelink | AddTrigger$ EternalChangeZone | AddSVar$ EternalCounters | Description$ Enchanted creature has lifelink and "Whenever a creature an opponent controls dies, put a +1/+1 counter on this creature."
-SVar:EternalChangeZone:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ EternalCounters | TriggerDescription$ Whenever a creature an opponent controls dies, put a +1/+1 counter on CARDNAME.
-SVar:EternalCounters:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:NonStackingAttachEffect:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/eternal_thirst.jpg
-Oracle:Enchant creature\nEnchanted creature has lifelink and "Whenever a creature an opponent controls dies, put a +1/+1 counter on this creature." (Damage dealt by a creature with lifelink also causes its controller to gain that much life.)
+Name:Eternal Thirst
+ManaCost:1 B
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddKeyword$ Lifelink | AddTrigger$ EternalChangeZone | AddSVar$ EternalCounters | Description$ Enchanted creature has lifelink and "Whenever a creature an opponent controls dies, put a +1/+1 counter on this creature."
+SVar:EternalChangeZone:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.OppCtrl | TriggerZones$ Battlefield | Execute$ EternalCounters | TriggerDescription$ Whenever a creature an opponent controls dies, put a +1/+1 counter on CARDNAME.
+SVar:EternalCounters:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:NonStackingAttachEffect:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/eternal_thirst.jpg
+Oracle:Enchant creature\nEnchanted creature has lifelink and "Whenever a creature an opponent controls dies, put a +1/+1 counter on this creature." (Damage dealt by a creature with lifelink also causes its controller to gain that much life.)
diff --git a/forge-gui/res/cardsfolder/f/feast_on_the_fallen.txt b/forge-gui/res/cardsfolder/f/feast_on_the_fallen.txt
index 826a8a2f85c..1dee3823f38 100644
--- a/forge-gui/res/cardsfolder/f/feast_on_the_fallen.txt
+++ b/forge-gui/res/cardsfolder/f/feast_on_the_fallen.txt
@@ -1,8 +1,8 @@
-Name:Feast on the Fallen
-ManaCost:2 B
-Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | CheckSVar$ X | References$ X | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of each upkeep, if an opponent lost life last turn, put a +1/+1 counter on each creature you control.
-SVar:TrigPutCounter:AB$ PutCounterAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
-SVar:X:PlayerCountOpponents$LifeLostLastTurn
-SVar:Picture:http://www.wizards.com/global/images/magic/general/feast_on_the_fallen.jpg
-Oracle:At the beginning of each upkeep, if an opponent lost life last turn, put a +1/+1 counter on target creature you control.
+Name:Feast on the Fallen
+ManaCost:2 B
+Types:Enchantment
+T:Mode$ Phase | Phase$ Upkeep | CheckSVar$ X | References$ X | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of each upkeep, if an opponent lost life last turn, put a +1/+1 counter on each creature you control.
+SVar:TrigPutCounter:AB$ PutCounterAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
+SVar:X:PlayerCountOpponents$LifeLostLastTurn
+SVar:Picture:http://www.wizards.com/global/images/magic/general/feast_on_the_fallen.jpg
+Oracle:At the beginning of each upkeep, if an opponent lost life last turn, put a +1/+1 counter on target creature you control.
diff --git a/forge-gui/res/cardsfolder/f/feral_incarnation.txt b/forge-gui/res/cardsfolder/f/feral_incarnation.txt
index cf05b956d95..3efcf1a7f03 100644
--- a/forge-gui/res/cardsfolder/f/feral_incarnation.txt
+++ b/forge-gui/res/cardsfolder/f/feral_incarnation.txt
@@ -1,7 +1,7 @@
-Name:Feral Incarnation
-ManaCost:8 G
-Types:Sorcery
-K:Convoke
-A:SP$ Token | Cost$ 8 G | TokenAmount$ 3 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put three 3/3 green Beast creature tokens onto the battlefield.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/feral_incarnation.jpg
-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.)\nPut three 3/3 green Beast creature tokens onto the battlefield.
+Name:Feral Incarnation
+ManaCost:8 G
+Types:Sorcery
+K:Convoke
+A:SP$ Token | Cost$ 8 G | TokenAmount$ 3 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put three 3/3 green Beast creature tokens onto the battlefield.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/feral_incarnation.jpg
+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.)\nPut three 3/3 green Beast creature tokens onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/f/festergloom.txt b/forge-gui/res/cardsfolder/f/festergloom.txt
index 6b819a07373..0875971e45a 100644
--- a/forge-gui/res/cardsfolder/f/festergloom.txt
+++ b/forge-gui/res/cardsfolder/f/festergloom.txt
@@ -1,6 +1,6 @@
-Name:Festergloom
-ManaCost:2 B
-Types:Sorcery
-A:SP$ PumpAll | Cost$ 2 B | ValidCards$ Creature.nonBlack | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Nonblack creatures get -1/-1 until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/festergloom.jpg
-Oracle:Nonblack creatures get -1/-1 until end of turn.
+Name:Festergloom
+ManaCost:2 B
+Types:Sorcery
+A:SP$ PumpAll | Cost$ 2 B | ValidCards$ Creature.nonBlack | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Nonblack creatures get -1/-1 until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/festergloom.jpg
+Oracle:Nonblack creatures get -1/-1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/f/first_response.txt b/forge-gui/res/cardsfolder/f/first_response.txt
index 11223f5c0e2..a3d135bf49b 100644
--- a/forge-gui/res/cardsfolder/f/first_response.txt
+++ b/forge-gui/res/cardsfolder/f/first_response.txt
@@ -1,8 +1,8 @@
-Name:First Response
-ManaCost:3 W
-Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | CheckSVar$ X | References$ X | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of each upkeep, if you lost life last turn, put a 1/1 white Soldier creature token onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1
-SVar:X:Count$Controller$LifeLostLastTurn
-SVar:Picture:http://www.wizards.com/global/images/magic/general/first_response.jpg
-Oracle:At the beginning of each upkeep, if you lost life last turn, put a 1/1 white Soldier creature token onto the battlefield.
+Name:First Response
+ManaCost:3 W
+Types:Enchantment
+T:Mode$ Phase | Phase$ Upkeep | CheckSVar$ X | References$ X | SVarCompare$ GE1 | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of each upkeep, if you lost life last turn, put a 1/1 white Soldier creature token onto the battlefield.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1
+SVar:X:Count$Controller$LifeLostLastTurn
+SVar:Picture:http://www.wizards.com/global/images/magic/general/first_response.jpg
+Oracle:At the beginning of each upkeep, if you lost life last turn, put a 1/1 white Soldier creature token onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/f/flesh_to_dust.txt b/forge-gui/res/cardsfolder/f/flesh_to_dust.txt
index ce578baaa95..1ce92c33bf8 100644
--- a/forge-gui/res/cardsfolder/f/flesh_to_dust.txt
+++ b/forge-gui/res/cardsfolder/f/flesh_to_dust.txt
@@ -1,6 +1,6 @@
-Name:Flesh to Dust
-ManaCost:3 B B
-Types:Instant
-A:SP$ Destroy | Cost$ 3 B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NoRegen$ True | SpellDescription$ Destroy target creature. It can't be regenerated.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/flesh_to_dust.jpg
-Oracle:Destroy target creature. It can't be regenerated.
+Name:Flesh to Dust
+ManaCost:3 B B
+Types:Instant
+A:SP$ Destroy | Cost$ 3 B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NoRegen$ True | SpellDescription$ Destroy target creature. It can't be regenerated.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/flesh_to_dust.jpg
+Oracle:Destroy target creature. It can't be regenerated.
diff --git a/forge-gui/res/cardsfolder/f/frost_lynx.txt b/forge-gui/res/cardsfolder/f/frost_lynx.txt
index bfe8aaf79df..704848983ec 100644
--- a/forge-gui/res/cardsfolder/f/frost_lynx.txt
+++ b/forge-gui/res/cardsfolder/f/frost_lynx.txt
@@ -1,10 +1,10 @@
-Name:Frost Lynx
-ManaCost:2 U
-Types:Creature Elemental Cat
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
-SVar:TrigTap:AB$ Tap | Cost$ 0 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
-SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/frost_lynx.jpg
-Oracle:When Frost Lynx enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
+Name:Frost Lynx
+ManaCost:2 U
+Types:Creature Elemental Cat
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
+SVar:TrigTap:AB$ Tap | Cost$ 0 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/frost_lynx.jpg
+Oracle:When Frost Lynx enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
diff --git a/forge-gui/res/cardsfolder/g/garruk_apex_predator.txt b/forge-gui/res/cardsfolder/g/garruk_apex_predator.txt
index bc42a545c80..51d3e0f655d 100644
--- a/forge-gui/res/cardsfolder/g/garruk_apex_predator.txt
+++ b/forge-gui/res/cardsfolder/g/garruk_apex_predator.txt
@@ -1,15 +1,15 @@
-Name:Garruk, Apex Predator
-ManaCost:5 B G
-Types:Planeswalker Garruk
-Loyalty:5
-A:AB$ Destroy | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Planeswalker.Other | TgtPrompt$ Select another target planeswalker | Planeswalker$ True | SpellDescription$ Destroy another target planeswalker.
-A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Black | TokenPower$ 3 | TokenToughness$ 3 | TokenKeywords$ Deathtouch | SpellDescription$ Put a 3/3 black Beast creature token with deathtouch onto the battlefield.
-A:AB$ Destroy | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberLKI$ True | SubAbility$ DBGainLife | SpellDescription$ Destroy target creature. You gain life equal to its toughness.
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$CardToughness
-A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | ValidTgts$ Opponent | EffectOwner$ Targeted | Planeswalker$ True | Ultimate$ True | Name$ Garruk, Apex Predator emblem | Image$ garruk_apex_predator_emblem | Triggers$ TrigAttackYou | SVars$ DBPump | Duration$ Permanent | AILogic$ Always | SpellDescription$ Target opponent gets an emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn."
-SVar:TrigAttackYou:Mode$ Attacks | ValidCard$ Creature | Attacked$ You | TriggerZones$ Command | Execute$ DBPump | TriggerDescription$ Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn.
-SVar:DBPump:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ 5 | NumDef$ 5 | KW$ Trample
-SVar:Picture:http://www.wizards.com/global/images/magic/general/garruk_apex_predator.jpg
-Oracle:[+1] Destroy another target planeswalker.\n[+1] Put a 3/3 black Beast creature token with deathtouch onto the battlefield.\n[-3] Destroy target creature. You gain life equal to its toughness.\n[-8] Target opponent gets an emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn."
+Name:Garruk, Apex Predator
+ManaCost:5 B G
+Types:Planeswalker Garruk
+Loyalty:5
+A:AB$ Destroy | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Planeswalker.Other | TgtPrompt$ Select another target planeswalker | Planeswalker$ True | SpellDescription$ Destroy another target planeswalker.
+A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Black | TokenPower$ 3 | TokenToughness$ 3 | TokenKeywords$ Deathtouch | SpellDescription$ Put a 3/3 black Beast creature token with deathtouch onto the battlefield.
+A:AB$ Destroy | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberLKI$ True | SubAbility$ DBGainLife | SpellDescription$ Destroy target creature. You gain life equal to its toughness.
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:RememberedLKI$CardToughness
+A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | ValidTgts$ Opponent | EffectOwner$ Targeted | Planeswalker$ True | Ultimate$ True | Name$ Garruk, Apex Predator emblem | Image$ garruk_apex_predator_emblem | Triggers$ TrigAttackYou | SVars$ DBPump | Duration$ Permanent | AILogic$ Always | SpellDescription$ Target opponent gets an emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn."
+SVar:TrigAttackYou:Mode$ Attacks | ValidCard$ Creature | Attacked$ You | TriggerZones$ Command | Execute$ DBPump | TriggerDescription$ Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn.
+SVar:DBPump:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ 5 | NumDef$ 5 | KW$ Trample
+SVar:Picture:http://www.wizards.com/global/images/magic/general/garruk_apex_predator.jpg
+Oracle:[+1] Destroy another target planeswalker.\n[+1] Put a 3/3 black Beast creature token with deathtouch onto the battlefield.\n[-3] Destroy target creature. You gain life equal to its toughness.\n[-8] Target opponent gets an emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn."
diff --git a/forge-gui/res/cardsfolder/g/geist_of_the_moors.txt b/forge-gui/res/cardsfolder/g/geist_of_the_moors.txt
index 2ffe58d8248..907d1330cde 100644
--- a/forge-gui/res/cardsfolder/g/geist_of_the_moors.txt
+++ b/forge-gui/res/cardsfolder/g/geist_of_the_moors.txt
@@ -1,7 +1,7 @@
-Name:Geist of the Moors
-ManaCost:1 W W
-Types:Creature Spirit
-PT:3/1
-K:Flying
-SVar:Picture:http://www.wizards.com/global/images/magic/general/geist_of_the_moors.jpg
-Oracle:Flying
+Name:Geist of the Moors
+ManaCost:1 W W
+Types:Creature Spirit
+PT:3/1
+K:Flying
+SVar:Picture:http://www.wizards.com/global/images/magic/general/geist_of_the_moors.jpg
+Oracle:Flying
diff --git a/forge-gui/res/cardsfolder/g/generator_servant.txt b/forge-gui/res/cardsfolder/g/generator_servant.txt
index 0c9a333e436..5c8b546ad29 100644
--- a/forge-gui/res/cardsfolder/g/generator_servant.txt
+++ b/forge-gui/res/cardsfolder/g/generator_servant.txt
@@ -1,8 +1,8 @@
-Name:Generator Servant
-ManaCost:1 R
-Types:Creature Elemental
-PT:2/1
-A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ 2 | AddsKeywords$ Haste | AddsKeywordsType$ Creature | AddsKeywordsUntil$ UntilEOT | SpellDescription$ Add {2} to your mana pool. If that mana is spent on a creature spell, it gains haste until end of turn.
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/generator_servant.jpg
-Oracle:{T}, Sacrifice Generator Servant: Add {2} to your mana pool. If that mana is spent on a creature spell, it gains haste until end of turn. (That creature can attack and {T} as soon as it comes under your control.)
+Name:Generator Servant
+ManaCost:1 R
+Types:Creature Elemental
+PT:2/1
+A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ 2 | AddsKeywords$ Haste | AddsKeywordsType$ Creature | AddsKeywordsUntil$ UntilEOT | SpellDescription$ Add {2} to your mana pool. If that mana is spent on a creature spell, it gains haste until end of turn.
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/generator_servant.jpg
+Oracle:{T}, Sacrifice Generator Servant: Add {2} to your mana pool. If that mana is spent on a creature spell, it gains haste until end of turn. (That creature can attack and {T} as soon as it comes under your control.)
diff --git a/forge-gui/res/cardsfolder/g/genesis_hydra.txt b/forge-gui/res/cardsfolder/g/genesis_hydra.txt
index 73cad78cc90..c90d59d4022 100644
--- a/forge-gui/res/cardsfolder/g/genesis_hydra.txt
+++ b/forge-gui/res/cardsfolder/g/genesis_hydra.txt
@@ -1,11 +1,11 @@
-Name:Genesis Hydra
-ManaCost:X G G
-Types:Creature Plant Hydra
-PT:0/0
-K:etbCounter:P1P1:X
-SVar:X:Count$xPaid
-T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When you cast CARDNAME, reveal the top X cards of your library. You may put a nonland permanent card with converted mana cost X or less from among them onto the battlefield. Then shuffle the rest into your library.
-SVar:TrigDig:AB$ Dig | Cost$ 0 | DigNum$ X | Reveal$ True | ChangeNum$ 1 | ChangeValid$ Permanent.cmcLEX | DestinationZone$ Battlefield | LibraryPosition2$ 0 | References$ X | SubAbility$ DBShuffle | Optional$ True
-SVar:DBShuffle:DB$ Shuffle | Defined$ You
-SVar:Picture:http://www.wizards.com/global/images/magic/general/genesis_hydra.jpg
-Oracle:When you cast Genesis Hydra, reveal the top X cards of your library. You may put a nonland permanent card with converted mana cost X or less from among them onto the battlefield. Then shuffle the rest into your library.\nGenesis Hydra enters the battlefield with X +1/+1 counters on it.
+Name:Genesis Hydra
+ManaCost:X G G
+Types:Creature Plant Hydra
+PT:0/0
+K:etbCounter:P1P1:X
+SVar:X:Count$xPaid
+T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When you cast CARDNAME, reveal the top X cards of your library. You may put a nonland permanent card with converted mana cost X or less from among them onto the battlefield. Then shuffle the rest into your library.
+SVar:TrigDig:AB$ Dig | Cost$ 0 | DigNum$ X | Reveal$ True | ChangeNum$ 1 | ChangeValid$ Permanent.cmcLEX | DestinationZone$ Battlefield | LibraryPosition2$ 0 | References$ X | SubAbility$ DBShuffle | Optional$ True
+SVar:DBShuffle:DB$ Shuffle | Defined$ You
+SVar:Picture:http://www.wizards.com/global/images/magic/general/genesis_hydra.jpg
+Oracle:When you cast Genesis Hydra, reveal the top X cards of your library. You may put a nonland permanent card with converted mana cost X or less from among them onto the battlefield. Then shuffle the rest into your library.\nGenesis Hydra enters the battlefield with X +1/+1 counters on it.
diff --git a/forge-gui/res/cardsfolder/g/glacial_crasher.txt b/forge-gui/res/cardsfolder/g/glacial_crasher.txt
index ad16fc53e97..e0fe5498326 100644
--- a/forge-gui/res/cardsfolder/g/glacial_crasher.txt
+++ b/forge-gui/res/cardsfolder/g/glacial_crasher.txt
@@ -1,11 +1,11 @@
-Name:Glacial Crasher
-ManaCost:4 U U
-Types:Creature Elemental
-PT:5/5
-K:Trample
-S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't attack unless there is a Mountain on the battlefield.
-SVar:X:Count$Valid Mountain
-DeckNeeds:Color$Red
-SVar:BuffedBy:Mountain
-SVar:Picture:http://www.wizards.com/global/images/magic/general/glacial_crasher.jpg
-Oracle:Trample (If this creature would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)\nGlacial Crasher can't attack unless there is a Mountain on the battlefield.
+Name:Glacial Crasher
+ManaCost:4 U U
+Types:Creature Elemental
+PT:5/5
+K:Trample
+S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't attack unless there is a Mountain on the battlefield.
+SVar:X:Count$Valid Mountain
+DeckNeeds:Color$Red
+SVar:BuffedBy:Mountain
+SVar:Picture:http://www.wizards.com/global/images/magic/general/glacial_crasher.jpg
+Oracle:Trample (If this creature would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)\nGlacial Crasher can't attack unless there is a Mountain on the battlefield.
diff --git a/forge-gui/res/cardsfolder/g/goblin_kaboomist.txt b/forge-gui/res/cardsfolder/g/goblin_kaboomist.txt
index 2f5bf7ad2be..cbf9bc58502 100644
--- a/forge-gui/res/cardsfolder/g/goblin_kaboomist.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_kaboomist.txt
@@ -1,11 +1,11 @@
-Name:Goblin Kaboomist
-ManaCost:1 R
-Types:Creature Goblin Warrior
-PT:1/2
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, put a colorless artifact token named Land Mine onto the battlefield with "{R}, Sacrifice this artifact: This artifact deals 2 damage to target attacking creature without flying." Then flip a coin. If you lose the flip, CARDNAME deals 2 damage to itself.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Land Mine | TokenTypes$ Artifact | TokenOwner$ You | TokenColors$ Colorless | TokenAbilities$ KaboomistMine | SubAbility$ DBFlip
-SVar:KaboomistMine:AB$ DealDamage | Cost$ R Sac<1/CARDNAME> | ValidTgts$ Creature.attacking+withoutFlying | TgtPrompt$ Select target attacking creature without flying | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking creature without flying.
-SVar:DBFlip:DB$ FlipACoin | Caller$ You | LoseSubAbility$ DmgSelf
-SVar:DmgSelf:DB$ DealDamage | Defined$ Self | NumDmg$ 2
-SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_kaboomist.jpg
-Oracle:At the beginning of your upkeep, put a colorless artifact token named Land Mine onto the battlefield with "{R}, Sacrifice this artifact: This artifact deals 2 damage to target attacking creature without flying." Then flip a coin. If you lose the flip, Goblin Kaboomist deals 2 damage to itself.
+Name:Goblin Kaboomist
+ManaCost:1 R
+Types:Creature Goblin Warrior
+PT:1/2
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, put a colorless artifact token named Land Mine onto the battlefield with "{R}, Sacrifice this artifact: This artifact deals 2 damage to target attacking creature without flying." Then flip a coin. If you lose the flip, CARDNAME deals 2 damage to itself.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Land Mine | TokenTypes$ Artifact | TokenOwner$ You | TokenColors$ Colorless | TokenAbilities$ KaboomistMine | SubAbility$ DBFlip
+SVar:KaboomistMine:AB$ DealDamage | Cost$ R Sac<1/CARDNAME> | ValidTgts$ Creature.attacking+withoutFlying | TgtPrompt$ Select target attacking creature without flying | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target attacking creature without flying.
+SVar:DBFlip:DB$ FlipACoin | Caller$ You | LoseSubAbility$ DmgSelf
+SVar:DmgSelf:DB$ DealDamage | Defined$ Self | NumDmg$ 2
+SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_kaboomist.jpg
+Oracle:At the beginning of your upkeep, put a colorless artifact token named Land Mine onto the battlefield with "{R}, Sacrifice this artifact: This artifact deals 2 damage to target attacking creature without flying." Then flip a coin. If you lose the flip, Goblin Kaboomist deals 2 damage to itself.
diff --git a/forge-gui/res/cardsfolder/g/goblin_rabblemaster.txt b/forge-gui/res/cardsfolder/g/goblin_rabblemaster.txt
index 96de9505741..06c08ba551e 100644
--- a/forge-gui/res/cardsfolder/g/goblin_rabblemaster.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_rabblemaster.txt
@@ -1,14 +1,14 @@
-Name:Goblin Rabblemaster
-ManaCost:2 R
-Types:Creature Goblin Warrior
-PT:2/2
-S:Mode$ Continuous | Affected$ Creature.Goblin+Other+YouCtrl | AddHiddenKeyword$ CARDNAME attacks each turn if able. | Description$ Other Goblin creatures you control attack each turn if able.
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, put a 1/1 red Goblin creature token with haste onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenOwner$ You | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Haste
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+0 until end of turn for each other attacking Goblin.
-SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ X | References$ X
-SVar:X:Count$Valid Goblin.attacking+Other
-SVar:PlayMain1:TRUE
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_rabblemaster.jpg
-Oracle:Other Goblin creatures you control attack each turn if able.\nAt the beginning of combat on your turn, put a 1/1 red Goblin creature token with haste onto the battlefield.\nWhenever Goblin Rabblemaster attacks, it gets +1/+0 until end of turn for each other attacking Goblin.
+Name:Goblin Rabblemaster
+ManaCost:2 R
+Types:Creature Goblin Warrior
+PT:2/2
+S:Mode$ Continuous | Affected$ Creature.Goblin+Other+YouCtrl | AddHiddenKeyword$ CARDNAME attacks each turn if able. | Description$ Other Goblin creatures you control attack each turn if able.
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, put a 1/1 red Goblin creature token with haste onto the battlefield.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenOwner$ You | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Haste
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, it gets +1/+0 until end of turn for each other attacking Goblin.
+SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ X | References$ X
+SVar:X:Count$Valid Goblin.attacking+Other
+SVar:PlayMain1:TRUE
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_rabblemaster.jpg
+Oracle:Other Goblin creatures you control attack each turn if able.\nAt the beginning of combat on your turn, put a 1/1 red Goblin creature token with haste onto the battlefield.\nWhenever Goblin Rabblemaster attacks, it gets +1/+0 until end of turn for each other attacking Goblin.
diff --git a/forge-gui/res/cardsfolder/h/hammerhand.txt b/forge-gui/res/cardsfolder/h/hammerhand.txt
index 850689627bc..0efab0c65de 100644
--- a/forge-gui/res/cardsfolder/h/hammerhand.txt
+++ b/forge-gui/res/cardsfolder/h/hammerhand.txt
@@ -1,11 +1,11 @@
-Name:Hammerhand
-ManaCost:R
-Types:Enchantment Aura
-K:Enchant creature
-A:SP$ Attach | Cost$ R | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature can't block this turn.
-SVar:TrigPump:AB$ Pump | Cost$ 0 | ValidTgts$ Creature | IsCurse$ True | KW$ HIDDEN CARDNAME can't block. | TgtPrompt$ Select target creature.
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Haste | Description$ Enchanted creature gets +1/+1 and has haste.
-SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hammerhand.jpg
-Oracle:Enchant creature\nWhen Hammerhand enters the battlefield, target creature can't block this turn.\nEnchanted creature gets +1/+1 and has haste. (It can attack and {T} no matter when it came under your control.)
+Name:Hammerhand
+ManaCost:R
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ R | ValidTgts$ Creature | AILogic$ Pump
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature can't block this turn.
+SVar:TrigPump:AB$ Pump | Cost$ 0 | ValidTgts$ Creature | IsCurse$ True | KW$ HIDDEN CARDNAME can't block. | TgtPrompt$ Select target creature.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Haste | Description$ Enchanted creature gets +1/+1 and has haste.
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hammerhand.jpg
+Oracle:Enchant creature\nWhen Hammerhand enters the battlefield, target creature can't block this turn.\nEnchanted creature gets +1/+1 and has haste. (It can attack and {T} no matter when it came under your control.)
diff --git a/forge-gui/res/cardsfolder/h/heliods_pilgrim.txt b/forge-gui/res/cardsfolder/h/heliods_pilgrim.txt
index 250a7c5d858..8148a8e23a8 100644
--- a/forge-gui/res/cardsfolder/h/heliods_pilgrim.txt
+++ b/forge-gui/res/cardsfolder/h/heliods_pilgrim.txt
@@ -1,8 +1,8 @@
-Name:Heliod's Pilgrim
-ManaCost:2 W
-Types:Creature Human Cleric
-PT:1/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for an Aura card, reveal it, put it into your hand, then shuffle your library.
-SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Aura | ChangeNum$ 1 | ShuffleNonMandatory$ True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/heliods_pilgrim.jpg
-Oracle:When Heliod's Pilgrim enters the battlefield, you may search your library for an Aura card, reveal it, put it into your hand, then shuffle your library.
+Name:Heliod's Pilgrim
+ManaCost:2 W
+Types:Creature Human Cleric
+PT:1/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for an Aura card, reveal it, put it into your hand, then shuffle your library.
+SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Aura | ChangeNum$ 1 | ShuffleNonMandatory$ True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/heliods_pilgrim.jpg
+Oracle:When Heliod's Pilgrim enters the battlefield, you may search your library for an Aura card, reveal it, put it into your hand, then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/h/hornet_nest.txt b/forge-gui/res/cardsfolder/h/hornet_nest.txt
index 686465abe9e..029072c3229 100644
--- a/forge-gui/res/cardsfolder/h/hornet_nest.txt
+++ b/forge-gui/res/cardsfolder/h/hornet_nest.txt
@@ -1,10 +1,10 @@
-Name:Hornet Nest
-ManaCost:2 G
-Types:Creature Insect
-PT:0/2
-T:Mode$ DamageDone | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, put that many 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying<>Deathtouch | References$ X
-SVar:X:TriggerCount$DamageAmount
-SVar:HasCombatEffect:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hornet_nest.jpg
-Oracle:Defender (This creature can't attack.)\nWhenever Hornet Nest is dealt damage, put that many 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield. (Any amount of damage a creature with deathtouch deals to a creature is enough to destroy it.)
+Name:Hornet Nest
+ManaCost:2 G
+Types:Creature Insect
+PT:0/2
+T:Mode$ DamageDone | Execute$ TrigToken | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, put that many 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ X | TokenName$ Insect | TokenTypes$ Creature,Insect | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying<>Deathtouch | References$ X
+SVar:X:TriggerCount$DamageAmount
+SVar:HasCombatEffect:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hornet_nest.jpg
+Oracle:Defender (This creature can't attack.)\nWhenever Hornet Nest is dealt damage, put that many 1/1 green Insect creature tokens with flying and deathtouch onto the battlefield. (Any amount of damage a creature with deathtouch deals to a creature is enough to destroy it.)
diff --git a/forge-gui/res/cardsfolder/h/hot_soup.txt b/forge-gui/res/cardsfolder/h/hot_soup.txt
index 10ebeda730c..683f3ac19b4 100644
--- a/forge-gui/res/cardsfolder/h/hot_soup.txt
+++ b/forge-gui/res/cardsfolder/h/hot_soup.txt
@@ -1,11 +1,11 @@
-Name:Hot Soup
-ManaCost:1
-Types:Artifact Equipment
-K:Equip 3
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddSVar$ HotSoupDestroy | AddHiddenKeyword$ Unblockable | Description$ Equipped creature can't be blocked.
-SVar:HotSoupDestroy:SVar:DestroyWhenDamaged:True
-T:Mode$ DamageDone | ValidTarget$ Creature.EquippedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When equipped creature is dealt damage, destroy it.
-SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | Defined$ TriggeredTarget
-SVar:NonStackingAttachEffect:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hot_soup.jpg
-Oracle:Equipped creature can't be blocked.\nWhenever equipped creature is dealt damage, destroy it.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
+Name:Hot Soup
+ManaCost:1
+Types:Artifact Equipment
+K:Equip 3
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddSVar$ HotSoupDestroy | AddHiddenKeyword$ Unblockable | Description$ Equipped creature can't be blocked.
+SVar:HotSoupDestroy:SVar:DestroyWhenDamaged:True
+T:Mode$ DamageDone | ValidTarget$ Creature.EquippedBy | Execute$ TrigDestroy | TriggerZones$ Battlefield | TriggerDescription$ When equipped creature is dealt damage, destroy it.
+SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | Defined$ TriggeredTarget
+SVar:NonStackingAttachEffect:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hot_soup.jpg
+Oracle:Equipped creature can't be blocked.\nWhenever equipped creature is dealt damage, destroy it.\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/h/hunters_ambush.txt b/forge-gui/res/cardsfolder/h/hunters_ambush.txt
index 17749ff8451..14abefdbdb1 100644
--- a/forge-gui/res/cardsfolder/h/hunters_ambush.txt
+++ b/forge-gui/res/cardsfolder/h/hunters_ambush.txt
@@ -1,8 +1,8 @@
-Name:Hunter's Ambush
-ManaCost:2 G
-Types:Instant
-A:SP$ Effect | Cost$ 2 G | Name$ Hunter's Ambush Effect | StaticAbilities$ KWPump | SpellDescription$ Prevent all combat damage that would be dealt by nongreen creatures this turn.
-SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.nonGreen | AddHiddenKeyword$ Prevent all combat damage that would be dealt by CARDNAME. | Description$  Prevent all combat damage that would be dealt by nongreen creatures this turn.
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hunters_ambush.jpg
-Oracle:Prevent all combat damage that would be dealt by nongreen creatures this turn.
+Name:Hunter's Ambush
+ManaCost:2 G
+Types:Instant
+A:SP$ Effect | Cost$ 2 G | Name$ Hunter's Ambush Effect | StaticAbilities$ KWPump | SpellDescription$ Prevent all combat damage that would be dealt by nongreen creatures this turn.
+SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.nonGreen | AddHiddenKeyword$ Prevent all combat damage that would be dealt by CARDNAME. | Description$  Prevent all combat damage that would be dealt by nongreen creatures this turn.
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hunters_ambush.jpg
+Oracle:Prevent all combat damage that would be dealt by nongreen creatures this turn.
diff --git a/forge-gui/res/cardsfolder/h/hushwing_gryff.txt b/forge-gui/res/cardsfolder/h/hushwing_gryff.txt
index e7a9b98dd6a..0fe9c7ea5d3 100644
--- a/forge-gui/res/cardsfolder/h/hushwing_gryff.txt
+++ b/forge-gui/res/cardsfolder/h/hushwing_gryff.txt
@@ -1,10 +1,10 @@
-Name:Hushwing Gryff
-ManaCost:2 W
-Types:Creature Hippogriff
-PT:2/1
-K:Flash
-K:Flying
-S:Mode$ Continuous | GlobalRule$ Creatures entering the battlefield don't cause abilities to trigger. | Description$ Creatures entering the battlefield don't cause abilities to trigger.
-SVar:RemRandomDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hushwing_gryff.jpg
-Oracle:Flash (You may cast this spell any time you could cast an instant.)\nFlying\nCreatures entering the battlefield don't cause abilities to trigger.
+Name:Hushwing Gryff
+ManaCost:2 W
+Types:Creature Hippogriff
+PT:2/1
+K:Flash
+K:Flying
+S:Mode$ Continuous | GlobalRule$ Creatures entering the battlefield don't cause abilities to trigger. | Description$ Creatures entering the battlefield don't cause abilities to trigger.
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hushwing_gryff.jpg
+Oracle:Flash (You may cast this spell any time you could cast an instant.)\nFlying\nCreatures entering the battlefield don't cause abilities to trigger.
diff --git a/forge-gui/res/cardsfolder/i/in_garruks_wake.txt b/forge-gui/res/cardsfolder/i/in_garruks_wake.txt
index 55bc19d88be..0a56346b188 100644
--- a/forge-gui/res/cardsfolder/i/in_garruks_wake.txt
+++ b/forge-gui/res/cardsfolder/i/in_garruks_wake.txt
@@ -1,6 +1,6 @@
-Name:In Garruk's Wake
-ManaCost:7 B B
-Types:Sorcery
-A:SP$ DestroyAll | Cost$ 7 B B | ValidCards$ Creature.YouDontCtrl,Planeswalker.YouDontCtrl | SpellDescription$ Destroy all creatures you don't control and all planeswalkers you don't control.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/in_garruks_wake.jpg
-Oracle:Destroy all creatures you don't control and all planeswalkers you don't control.
+Name:In Garruk's Wake
+ManaCost:7 B B
+Types:Sorcery
+A:SP$ DestroyAll | Cost$ 7 B B | ValidCards$ Creature.YouDontCtrl,Planeswalker.YouDontCtrl | SpellDescription$ Destroy all creatures you don't control and all planeswalkers you don't control.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/in_garruks_wake.jpg
+Oracle:Destroy all creatures you don't control and all planeswalkers you don't control.
diff --git a/forge-gui/res/cardsfolder/i/indulgent_tormentor.txt b/forge-gui/res/cardsfolder/i/indulgent_tormentor.txt
index 8ac426278df..3675152078c 100644
--- a/forge-gui/res/cardsfolder/i/indulgent_tormentor.txt
+++ b/forge-gui/res/cardsfolder/i/indulgent_tormentor.txt
@@ -1,11 +1,11 @@
-Name:Indulgent Tormentor
-ManaCost:3 B B
-Types:Creature Demon
-PT:5/3
-K:Flying
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoice | TriggerDescription$ At the beginning of your upkeep, draw a card unless target opponent sacrifices a creature or pays 3 life.
-SVar:TrigChoice:AB$ GenericChoice | Cost$ 0 | ValidTgts$ Opponent | Choices$ DBPayLife,DBSacCreature | AILogic$ PayUnlessCost
-SVar:DBSacCreature:DB$ Draw | Defined$ You | UnlessCost$ Sac<1/Creature> | UnlessPayer$ Targeted | UnlessAI$ Never | SpellDescription$ That player draws a card unless You sacrifices a creature
-SVar:DBPayLife:DB$ Draw | Defined$ You | UnlessCost$ PayLife<3> | UnlessPayer$ Targeted | UnlessAI$ LowPriority | SpellDescription$ That player draws a card unless You pays 3 life.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/indulgent_tormentor.jpg
-Oracle:Flying\nAt the beginning of your upkeep, draw a card unless target opponent sacrifices a creature or pays 3 life.
+Name:Indulgent Tormentor
+ManaCost:3 B B
+Types:Creature Demon
+PT:5/3
+K:Flying
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoice | TriggerDescription$ At the beginning of your upkeep, draw a card unless target opponent sacrifices a creature or pays 3 life.
+SVar:TrigChoice:AB$ GenericChoice | Cost$ 0 | ValidTgts$ Opponent | Choices$ DBPayLife,DBSacCreature | AILogic$ PayUnlessCost
+SVar:DBSacCreature:DB$ Draw | Defined$ You | UnlessCost$ Sac<1/Creature> | UnlessPayer$ Targeted | UnlessAI$ Never | SpellDescription$ That player draws a card unless You sacrifices a creature
+SVar:DBPayLife:DB$ Draw | Defined$ You | UnlessCost$ PayLife<3> | UnlessPayer$ Targeted | UnlessAI$ LowPriority | SpellDescription$ That player draws a card unless You pays 3 life.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/indulgent_tormentor.jpg
+Oracle:Flying\nAt the beginning of your upkeep, draw a card unless target opponent sacrifices a creature or pays 3 life.
diff --git a/forge-gui/res/cardsfolder/i/inferno_fist.txt b/forge-gui/res/cardsfolder/i/inferno_fist.txt
index dffabb13897..dd493a7beb6 100644
--- a/forge-gui/res/cardsfolder/i/inferno_fist.txt
+++ b/forge-gui/res/cardsfolder/i/inferno_fist.txt
@@ -1,9 +1,9 @@
-Name:Inferno Fist
-ManaCost:1 R
-Types:Enchantment Aura
-K:Enchant creature you control
-A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | Description$ Enchanted creature gets +2/+0.
-A:AB$ DealDamage | Cost$ R Sac<1/CARDNAME> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/inferno_fist.jpg
-Oracle:Enchant creature you control\nEnchanted creature gets +2/+0.\n{R}, Sacrifice Inferno Fist: Inferno Fist deals 2 damage to target creature or player.
+Name:Inferno Fist
+ManaCost:1 R
+Types:Enchantment Aura
+K:Enchant creature you control
+A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | Description$ Enchanted creature gets +2/+0.
+A:AB$ DealDamage | Cost$ R Sac<1/CARDNAME> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/inferno_fist.jpg
+Oracle:Enchant creature you control\nEnchanted creature gets +2/+0.\n{R}, Sacrifice Inferno Fist: Inferno Fist deals 2 damage to target creature or player.
diff --git a/forge-gui/res/cardsfolder/i/invasive_species.txt b/forge-gui/res/cardsfolder/i/invasive_species.txt
index c96efaf7593..cfe601965c6 100644
--- a/forge-gui/res/cardsfolder/i/invasive_species.txt
+++ b/forge-gui/res/cardsfolder/i/invasive_species.txt
@@ -1,9 +1,9 @@
-Name:Invasive Species
-ManaCost:2 G
-Types:Creature Insect
-PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return another permanent you control to its owner's hand.
-SVar:TrigChange:AB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Permanent.Other + YouCtrl
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/invasive_species.jpg
-Oracle:When Invasive Species enters the battlefield, return another permanent you control to its owner's hand.
+Name:Invasive Species
+ManaCost:2 G
+Types:Creature Insect
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return another permanent you control to its owner's hand.
+SVar:TrigChange:AB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Permanent.Other + YouCtrl
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/invasive_species.jpg
+Oracle:When Invasive Species enters the battlefield, return another permanent you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/j/jace_the_living_guildpact.txt b/forge-gui/res/cardsfolder/j/jace_the_living_guildpact.txt
index 1c9f00512c5..b87fd7bd9ed 100644
--- a/forge-gui/res/cardsfolder/j/jace_the_living_guildpact.txt
+++ b/forge-gui/res/cardsfolder/j/jace_the_living_guildpact.txt
@@ -1,11 +1,11 @@
-Name:Jace, the Living Guildpact
-ManaCost:2 U U
-Types:Planeswalker Jace
-Loyalty:5
-A:AB$ Dig | Cost$ AddCounter<1/LOYALTY> | Defined$ You | DigNum$ 2 | DestinationZone$ Graveyard | LibraryPosition2$ 0 | Planeswalker$ True | SpellDescription$ Look at the top two cards of your library. Put one of them into your graveyard.
-A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.Other+nonLand | TgtPrompt$ Select another target nonland permanent | Planeswalker$ True | SpellDescription$ Return another target nonland permanent to its owner's hand.
-A:AB$ ChangeZoneAll | Cost$ SubCounter<8/LOYALTY> | ChangeType$ Card | Origin$ Hand,Graveyard | Destination$ Library | Shuffle$ True  | SubAbility$ DBDraw | UseAllOriginZones$ True | Planeswalker$ True | Ultimate$ True | SpellDescription$ Each player shuffles his or her hand and graveyard into his or her library. You draw seven cards.
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 7
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/jace_the_living_guildpact.jpg
-Oracle:[+1] Look at the top two cards of your library. Put one of them into your graveyard.\n[-3] Return another target nonland permanent to its owner's hand.\n[-8] Each player shuffles his or her hand and graveyard into his or her library. You draw seven cards.
+Name:Jace, the Living Guildpact
+ManaCost:2 U U
+Types:Planeswalker Jace
+Loyalty:5
+A:AB$ Dig | Cost$ AddCounter<1/LOYALTY> | Defined$ You | DigNum$ 2 | DestinationZone$ Graveyard | LibraryPosition2$ 0 | Planeswalker$ True | SpellDescription$ Look at the top two cards of your library. Put one of them into your graveyard.
+A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Permanent.Other+nonLand | TgtPrompt$ Select another target nonland permanent | Planeswalker$ True | SpellDescription$ Return another target nonland permanent to its owner's hand.
+A:AB$ ChangeZoneAll | Cost$ SubCounter<8/LOYALTY> | ChangeType$ Card | Origin$ Hand,Graveyard | Destination$ Library | Shuffle$ True  | SubAbility$ DBDraw | UseAllOriginZones$ True | Planeswalker$ True | Ultimate$ True | SpellDescription$ Each player shuffles his or her hand and graveyard into his or her library. You draw seven cards.
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 7
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/jace_the_living_guildpact.jpg
+Oracle:[+1] Look at the top two cards of your library. Put one of them into your graveyard.\n[-3] Return another target nonland permanent to its owner's hand.\n[-8] Each player shuffles his or her hand and graveyard into his or her library. You draw seven cards.
diff --git a/forge-gui/res/cardsfolder/j/jalira_master_polymorphist.txt b/forge-gui/res/cardsfolder/j/jalira_master_polymorphist.txt
index 5e6b3106d8c..c16ce589d96 100644
--- a/forge-gui/res/cardsfolder/j/jalira_master_polymorphist.txt
+++ b/forge-gui/res/cardsfolder/j/jalira_master_polymorphist.txt
@@ -1,8 +1,8 @@
-Name:Jalira, Master Polymorphist
-ManaCost:3 U
-Types:Legendary Creature Human Wizard
-PT:2/2
-A:AB$ DigUntil | Cost$ 2 U T Sac<1/Creature.Other/another creature>| Valid$ Creature.nonLegendary | ValidDescription$ nonlegendary creature | FoundDestination$ Battlefield | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RevealRandomOrder$ True | SpellDescription$ Reveal cards from the top of your library until you reveal a nonlegendary creature card. Put that card onto the battlefield and the rest on the bottom of your library in a random order.
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/jalira_master_polymorphist.jpg
-Oracle:{2}{U}, {T}, Sacrifice another creature: Reveal cards from the top of your library until you reveal a nonlegendary creature card. Put that card onto the battlefield and the rest on the bottom of your library in a random order.
+Name:Jalira, Master Polymorphist
+ManaCost:3 U
+Types:Legendary Creature Human Wizard
+PT:2/2
+A:AB$ DigUntil | Cost$ 2 U T Sac<1/Creature.Other/another creature>| Valid$ Creature.nonLegendary | ValidDescription$ nonlegendary creature | FoundDestination$ Battlefield | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RevealRandomOrder$ True | SpellDescription$ Reveal cards from the top of your library until you reveal a nonlegendary creature card. Put that card onto the battlefield and the rest on the bottom of your library in a random order.
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/jalira_master_polymorphist.jpg
+Oracle:{2}{U}, {T}, Sacrifice another creature: Reveal cards from the top of your library until you reveal a nonlegendary creature card. Put that card onto the battlefield and the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/cardsfolder/j/jorubai_murk_lurker.txt b/forge-gui/res/cardsfolder/j/jorubai_murk_lurker.txt
index 7412c9bcc84..9f983eac6d6 100644
--- a/forge-gui/res/cardsfolder/j/jorubai_murk_lurker.txt
+++ b/forge-gui/res/cardsfolder/j/jorubai_murk_lurker.txt
@@ -1,11 +1,11 @@
-Name:Jorubai Murk Lurker
-ManaCost:2 U
-Types:Creature Leech
-PT:1/3
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control a Swamp.
-SVar:X:Count$Valid Swamp.YouCtrl
-A:AB$ Pump | Cost$ 1 B | ValidTgts$ Creature | KW$ Lifelink | SpellDescription$ Target creature gains lifelink until end of turn.
-SVar:BuffedBy:Swamp
-DeckNeeds:Color$Black
-SVar:Picture:http://www.wizards.com/global/images/magic/general/jorubai_murk_lurker.jpg
-Oracle:Jorubai Murk Lurker gets +1/+1 as long as you control a Swamp.\n{1}{B}: Target creature gains lifelink until end of turn. (Damage dealt by the creature also causes its controller to gain that much life.)
+Name:Jorubai Murk Lurker
+ManaCost:2 U
+Types:Creature Leech
+PT:1/3
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control a Swamp.
+SVar:X:Count$Valid Swamp.YouCtrl
+A:AB$ Pump | Cost$ 1 B | ValidTgts$ Creature | KW$ Lifelink | SpellDescription$ Target creature gains lifelink until end of turn.
+SVar:BuffedBy:Swamp
+DeckNeeds:Color$Black
+SVar:Picture:http://www.wizards.com/global/images/magic/general/jorubai_murk_lurker.jpg
+Oracle:Jorubai Murk Lurker gets +1/+1 as long as you control a Swamp.\n{1}{B}: Target creature gains lifelink until end of turn. (Damage dealt by the creature also causes its controller to gain that much life.)
diff --git a/forge-gui/res/cardsfolder/k/kalonian_twingrove.txt b/forge-gui/res/cardsfolder/k/kalonian_twingrove.txt
index 8c6d21b9159..f24d1ba3cdb 100644
--- a/forge-gui/res/cardsfolder/k/kalonian_twingrove.txt
+++ b/forge-gui/res/cardsfolder/k/kalonian_twingrove.txt
@@ -1,12 +1,12 @@
-Name:Kalonian Twingrove
-ManaCost:5 G
-Types:Creature Treefolk Warrior
-PT:*/*
-S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAMEs power and toughness are each equal to the number of Forests you control.
-SVar:X:Count$Valid Forest.YouCtrl
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a green Treefolk Warrior creature token onto the battlefield with "This creature's power and toughness are each equal to the number of Forests you control."
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Treefolk Warrior | TokenTypes$ Creature,Treefolk,Warrior | TokenOwner$ You | TokenColors$ Green | TokenPower$ X | TokenToughness$ X | TokenStaticAbilities$ TokenPT | TokenSVars$ X | References$ X
-SVar:TokenPT:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of creatures you control.
-SVar:BuffedBy:Forest
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kalonian_twingrove.jpg
-Oracle:Kalonian Twingrove's power and toughness are each equal to the number of Forests you control.\nWhen Kalonian Twingrove enters the battlefield, put a green Treefolk Warrior creature token onto the battlefield with "This creature's power and toughness are each equal to the number of Forests you control."
+Name:Kalonian Twingrove
+ManaCost:5 G
+Types:Creature Treefolk Warrior
+PT:*/*
+S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAMEs power and toughness are each equal to the number of Forests you control.
+SVar:X:Count$Valid Forest.YouCtrl
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a green Treefolk Warrior creature token onto the battlefield with "This creature's power and toughness are each equal to the number of Forests you control."
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Treefolk Warrior | TokenTypes$ Creature,Treefolk,Warrior | TokenOwner$ You | TokenColors$ Green | TokenPower$ X | TokenToughness$ X | TokenStaticAbilities$ TokenPT | TokenSVars$ X | References$ X
+SVar:TokenPT:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of creatures you control.
+SVar:BuffedBy:Forest
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kalonian_twingrove.jpg
+Oracle:Kalonian Twingrove's power and toughness are each equal to the number of Forests you control.\nWhen Kalonian Twingrove enters the battlefield, put a green Treefolk Warrior creature token onto the battlefield with "This creature's power and toughness are each equal to the number of Forests you control."
diff --git a/forge-gui/res/cardsfolder/k/kapsho_kitefins.txt b/forge-gui/res/cardsfolder/k/kapsho_kitefins.txt
index 62aee7ec19a..99d389ff53b 100644
--- a/forge-gui/res/cardsfolder/k/kapsho_kitefins.txt
+++ b/forge-gui/res/cardsfolder/k/kapsho_kitefins.txt
@@ -1,11 +1,11 @@
-Name:Kapsho Kitefins
-ManaCost:4 U U
-Types:Creature Fish
-PT:3/3
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME or another creature enters the battlefield under your control, tap target creature an opponent controls.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigTap | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature enters the battlefield under your control, tap target creature an opponent controls.
-SVar:TrigTap:AB$ Tap | Cost$ 0 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls.
-SVar:BuffedBy:Creature
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kapsho_kitefins.jpg
-Oracle:Flying\nWhenever Kapsho Kitefins or another creature enters the battlefield under your control, tap target creature an opponent controls.
+Name:Kapsho Kitefins
+ManaCost:4 U U
+Types:Creature Fish
+PT:3/3
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME or another creature enters the battlefield under your control, tap target creature an opponent controls.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigTap | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature enters the battlefield under your control, tap target creature an opponent controls.
+SVar:TrigTap:AB$ Tap | Cost$ 0 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls.
+SVar:BuffedBy:Creature
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kapsho_kitefins.jpg
+Oracle:Flying\nWhenever Kapsho Kitefins or another creature enters the battlefield under your control, tap target creature an opponent controls.
diff --git a/forge-gui/res/cardsfolder/k/kird_chieftain.txt b/forge-gui/res/cardsfolder/k/kird_chieftain.txt
index 21555343dd6..6a3915db92d 100644
--- a/forge-gui/res/cardsfolder/k/kird_chieftain.txt
+++ b/forge-gui/res/cardsfolder/k/kird_chieftain.txt
@@ -1,11 +1,11 @@
-Name:Kird Chieftain
-ManaCost:3 R
-Types:Creature Ape
-PT:3/3
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control a Forest.
-SVar:X:Count$Valid Forest.YouCtrl
-A:AB$ Pump | Cost$ 4 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | KW$ Trample | SpellDescription$ Target creature gets +2/+2 and gains trample until end of turn.
-SVar:BuffedBy:Forest
-DeckNeeds:Color$Green
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kird_chieftain.jpg
-Oracle:Kird Chieftain gets +1/+1 as long as you control a Forest.\n{4}{G}: Target creature gets +2/+2 and gains trample until end of turn. (If it would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
+Name:Kird Chieftain
+ManaCost:3 R
+Types:Creature Ape
+PT:3/3
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control a Forest.
+SVar:X:Count$Valid Forest.YouCtrl
+A:AB$ Pump | Cost$ 4 G | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | KW$ Trample | SpellDescription$ Target creature gets +2/+2 and gains trample until end of turn.
+SVar:BuffedBy:Forest
+DeckNeeds:Color$Green
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kird_chieftain.jpg
+Oracle:Kird Chieftain gets +1/+1 as long as you control a Forest.\n{4}{G}: Target creature gets +2/+2 and gains trample until end of turn. (If it would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
diff --git a/forge-gui/res/cardsfolder/k/krenkos_enforcer.txt b/forge-gui/res/cardsfolder/k/krenkos_enforcer.txt
index b41936bcd8f..d8dc83ab8a4 100644
--- a/forge-gui/res/cardsfolder/k/krenkos_enforcer.txt
+++ b/forge-gui/res/cardsfolder/k/krenkos_enforcer.txt
@@ -1,7 +1,7 @@
-Name:Krenko's Enforcer
-ManaCost:1 R R
-Types:Creature Goblin Warrior
-PT:2/2
-K:Intimidate
-SVar:Picture:http://www.wizards.com/global/images/magic/general/krenkos_enforcer.jpg
-Oracle:Intimidate (This creature can't be blocked except by artifact creatures and/or creatures that share a color with it.)
+Name:Krenko's Enforcer
+ManaCost:1 R R
+Types:Creature Goblin Warrior
+PT:2/2
+K:Intimidate
+SVar:Picture:http://www.wizards.com/global/images/magic/general/krenkos_enforcer.jpg
+Oracle:Intimidate (This creature can't be blocked except by artifact creatures and/or creatures that share a color with it.)
diff --git a/forge-gui/res/cardsfolder/k/kurkesh_onakke_ancient.txt b/forge-gui/res/cardsfolder/k/kurkesh_onakke_ancient.txt
index 8981e1a837d..1d1d7ad43e5 100644
--- a/forge-gui/res/cardsfolder/k/kurkesh_onakke_ancient.txt
+++ b/forge-gui/res/cardsfolder/k/kurkesh_onakke_ancient.txt
@@ -1,8 +1,8 @@
-Name:Kurkesh, Onakke Ancient
-ManaCost:2 R R
-Types:Legendary Creature Ogre Spirit
-PT:4/3
-T:Mode$ AbilityCast | ValidCard$ Artifact | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCopyAbility | TriggerDescription$ Whenever you activate an ability of an artifact, if it isn't a mana ability, you may pay {R}. If you do, copy that ability. You may choose new targets for the copy.
-SVar:TrigCopyAbility:AB$ CopySpellAbility | Cost$ R | Defined$ TriggeredSpellAbility
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kurkesh_onakke_ancient.jpg
-Oracle:Whenever you activate an ability of an artifact, if it isn't a mana ability, you may pay {R}. If you do, copy that ability. You may choose new targets for the copy.
+Name:Kurkesh, Onakke Ancient
+ManaCost:2 R R
+Types:Legendary Creature Ogre Spirit
+PT:4/3
+T:Mode$ AbilityCast | ValidCard$ Artifact | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCopyAbility | TriggerDescription$ Whenever you activate an ability of an artifact, if it isn't a mana ability, you may pay {R}. If you do, copy that ability. You may choose new targets for the copy.
+SVar:TrigCopyAbility:AB$ CopySpellAbility | Cost$ R | Defined$ TriggeredSpellAbility
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kurkesh_onakke_ancient.jpg
+Oracle:Whenever you activate an ability of an artifact, if it isn't a mana ability, you may pay {R}. If you do, copy that ability. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/l/leeching_sliver.txt b/forge-gui/res/cardsfolder/l/leeching_sliver.txt
index 61cd2e4864d..580e02a998d 100644
--- a/forge-gui/res/cardsfolder/l/leeching_sliver.txt
+++ b/forge-gui/res/cardsfolder/l/leeching_sliver.txt
@@ -1,11 +1,11 @@
-Name:Leeching Sliver
-ManaCost:1 B
-Types:Creature Sliver
-PT:1/1
-T:Mode$ Attacks | ValidCard$ Sliver.YouCtrl | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Sliver you control attacks, defending player loses 1 life.
-SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredDefendingPlayer | LifeAmount$ 1
-S:Mode$ Continuous | Affected$ Sliver.YouCtrl | AddSVar$ AE
-SVar:AE:SVar:HasAttackEffect:TRUE
-SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/leeching_sliver.jpg
-Oracle:Whenever a Sliver you control attacks, defending player loses 1 life.
+Name:Leeching Sliver
+ManaCost:1 B
+Types:Creature Sliver
+PT:1/1
+T:Mode$ Attacks | ValidCard$ Sliver.YouCtrl | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Sliver you control attacks, defending player loses 1 life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredDefendingPlayer | LifeAmount$ 1
+S:Mode$ Continuous | Affected$ Sliver.YouCtrl | AddSVar$ AE
+SVar:AE:SVar:HasAttackEffect:TRUE
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/leeching_sliver.jpg
+Oracle:Whenever a Sliver you control attacks, defending player loses 1 life.
diff --git a/forge-gui/res/cardsfolder/l/lifes_legacy.txt b/forge-gui/res/cardsfolder/l/lifes_legacy.txt
index 2d40f9d63c7..c0725467e76 100644
--- a/forge-gui/res/cardsfolder/l/lifes_legacy.txt
+++ b/forge-gui/res/cardsfolder/l/lifes_legacy.txt
@@ -1,8 +1,8 @@
-Name:Life's Legacy
-ManaCost:1 G
-Types:Sorcery
-A:SP$ Draw | Cost$ 1 G Sac<1/Creature> | NumCards$ XPower | References$ XPower | SpellDescription$ Draw cards equal to the sacrificed creature's power.
-SVar:XPower:Sacrificed$CardPower
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/lifes_legacy.jpg
-Oracle:As an additional cost to cast Life's Legacy, sacrifice a creature.\nDraw cards equal to the sacrificed creature's power.
+Name:Life's Legacy
+ManaCost:1 G
+Types:Sorcery
+A:SP$ Draw | Cost$ 1 G Sac<1/Creature> | NumCards$ XPower | References$ XPower | SpellDescription$ Draw cards equal to the sacrificed creature's power.
+SVar:XPower:Sacrificed$CardPower
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/lifes_legacy.jpg
+Oracle:As an additional cost to cast Life's Legacy, sacrifice a creature.\nDraw cards equal to the sacrificed creature's power.
diff --git a/forge-gui/res/cardsfolder/l/living_totem.txt b/forge-gui/res/cardsfolder/l/living_totem.txt
index 872ace5f81b..5c25fb654a4 100644
--- a/forge-gui/res/cardsfolder/l/living_totem.txt
+++ b/forge-gui/res/cardsfolder/l/living_totem.txt
@@ -1,9 +1,9 @@
-Name:Living Totem
-ManaCost:3 G
-Types:Creature Plant Elemental
-PT:2/3
-K:Convoke
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, you may put a +1/+1 counter on another target creature.
-SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature | CounterType$ P1P1 | CounterNum$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/living_totem.jpg
-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.)\nWhen Living Totem enters the battlefield, you may put a +1/+1 counter on another target creature.
+Name:Living Totem
+ManaCost:3 G
+Types:Creature Plant Elemental
+PT:2/3
+K:Convoke
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, you may put a +1/+1 counter on another target creature.
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | ValidTgts$ Creature.Other | TgtPrompt$ Select another target creature | CounterType$ P1P1 | CounterNum$ 1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/living_totem.jpg
+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.)\nWhen Living Totem enters the battlefield, you may put a +1/+1 counter on another target creature.
diff --git a/forge-gui/res/cardsfolder/m/marked_by_honor.txt b/forge-gui/res/cardsfolder/m/marked_by_honor.txt
index 8dd866222d4..77c19ba80f4 100644
--- a/forge-gui/res/cardsfolder/m/marked_by_honor.txt
+++ b/forge-gui/res/cardsfolder/m/marked_by_honor.txt
@@ -1,8 +1,8 @@
-Name:Marked by Honor
-ManaCost:3 W
-Types:Enchantment Aura
-K:Enchant creature
-A:SP$ Attach | Cost$ 3 W | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Vigilance | Description$ Enchanted creature gets +2/+2 and has vigilance.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/marked_by_honor.jpg
-Oracle:Enchant creature\nEnchanted creature gets +2/+2 and has vigilance. (Attacking doesn't cause it to tap.)
+Name:Marked by Honor
+ManaCost:3 W
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ 3 W | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Vigilance | Description$ Enchanted creature gets +2/+2 and has vigilance.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/marked_by_honor.jpg
+Oracle:Enchant creature\nEnchanted creature gets +2/+2 and has vigilance. (Attacking doesn't cause it to tap.)
diff --git a/forge-gui/res/cardsfolder/m/master_of_predicaments.txt b/forge-gui/res/cardsfolder/m/master_of_predicaments.txt
index 725496630b1..0b360ae81e4 100644
--- a/forge-gui/res/cardsfolder/m/master_of_predicaments.txt
+++ b/forge-gui/res/cardsfolder/m/master_of_predicaments.txt
@@ -1,12 +1,12 @@
-Name:Master of Predicaments
-ManaCost:3 U U
-Types:Creature Sphinx
-PT:4/4
-K:Flying
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigGuess | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, choose a card in your hand. That player guesses whether the card's converted mana cost is greater than 4. If the player guessed wrong, you may cast the card without paying its mana cost.
-SVar:TrigGuess:AB$ ChooseCard | Cost$ 0 | ChoiceZone$ Hand | Defined$ You | Choices$ Card.YouOwn | AILogic$ RandomNonLand | SubAbility$ DBGuess
-SVar:DBGuess:DB$ GenericChoice | Defined$ TriggeredTarget | Choices$ GuessGreaterThanFour,GuessNotGreaterThanFour | AILogic$ Random | ShowChoice$ True
-SVar:GuessGreaterThanFour:DB$ Play  | Controller$ You | Defined$ ChosenCard | Optional$ True | WithoutManaCost$ True | ConditionDefined$ ChosenCard | ConditionPresent$ Card.cmcLE4+nonLand | ConditionCompare$ GE1 | SpellDescription$  That card's converted mana cost is greater than 4
-SVar:GuessNotGreaterThanFour:DB$ Play  | Controller$ You | Defined$ ChosenCard | Optional$ True | WithoutManaCost$ True | ConditionDefined$ ChosenCard | ConditionPresent$ Card.cmcGT4+nonLand | ConditionCompare$ GE1 | SpellDescription$  That card's converted mana cost is not greater than 4
-SVar:Picture:http://www.wizards.com/global/images/magic/general/master_of_predicaments.jpg
-Oracle:Flying\nWhenever Master of Predicaments deals combat damage to a player, choose a card in your hand. That player guesses whether the card's converted mana cost is greater than 4. If the player guessed wrong, you may cast the card without paying its mana cost.
+Name:Master of Predicaments
+ManaCost:3 U U
+Types:Creature Sphinx
+PT:4/4
+K:Flying
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigGuess | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, choose a card in your hand. That player guesses whether the card's converted mana cost is greater than 4. If the player guessed wrong, you may cast the card without paying its mana cost.
+SVar:TrigGuess:AB$ ChooseCard | Cost$ 0 | ChoiceZone$ Hand | Defined$ You | Choices$ Card.YouOwn | AILogic$ RandomNonLand | SubAbility$ DBGuess
+SVar:DBGuess:DB$ GenericChoice | Defined$ TriggeredTarget | Choices$ GuessGreaterThanFour,GuessNotGreaterThanFour | AILogic$ Random | ShowChoice$ True
+SVar:GuessGreaterThanFour:DB$ Play  | Controller$ You | Defined$ ChosenCard | Optional$ True | WithoutManaCost$ True | ConditionDefined$ ChosenCard | ConditionPresent$ Card.cmcLE4+nonLand | ConditionCompare$ GE1 | SpellDescription$  That card's converted mana cost is greater than 4
+SVar:GuessNotGreaterThanFour:DB$ Play  | Controller$ You | Defined$ ChosenCard | Optional$ True | WithoutManaCost$ True | ConditionDefined$ ChosenCard | ConditionPresent$ Card.cmcGT4+nonLand | ConditionCompare$ GE1 | SpellDescription$  That card's converted mana cost is not greater than 4
+SVar:Picture:http://www.wizards.com/global/images/magic/general/master_of_predicaments.jpg
+Oracle:Flying\nWhenever Master of Predicaments deals combat damage to a player, choose a card in your hand. That player guesses whether the card's converted mana cost is greater than 4. If the player guessed wrong, you may cast the card without paying its mana cost.
diff --git a/forge-gui/res/cardsfolder/m/meditation_puzzle.txt b/forge-gui/res/cardsfolder/m/meditation_puzzle.txt
index 2e95af8b58d..bded41be404 100644
--- a/forge-gui/res/cardsfolder/m/meditation_puzzle.txt
+++ b/forge-gui/res/cardsfolder/m/meditation_puzzle.txt
@@ -1,7 +1,7 @@
-Name:Meditation Puzzle
-ManaCost:3 W W
-Types:Sorcery
-K:Convoke
-A:SP$ GainLife | Cost$ 3 W W | LifeAmount$ 8 | SpellDescription$ You gain 8 life.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/meditation_puzzle.jpg
-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.)\nYou gain 8 life.
+Name:Meditation Puzzle
+ManaCost:3 W W
+Types:Sorcery
+K:Convoke
+A:SP$ GainLife | Cost$ 3 W W | LifeAmount$ 8 | SpellDescription$ You gain 8 life.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/meditation_puzzle.jpg
+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.)\nYou gain 8 life.
diff --git a/forge-gui/res/cardsfolder/m/mercurial_pretender.txt b/forge-gui/res/cardsfolder/m/mercurial_pretender.txt
index 0496aabafce..54cf72eaaca 100644
--- a/forge-gui/res/cardsfolder/m/mercurial_pretender.txt
+++ b/forge-gui/res/cardsfolder/m/mercurial_pretender.txt
@@ -1,10 +1,10 @@
-Name:Mercurial Pretender
-ManaCost:4 U
-Types:Creature Shapeshifter
-PT:0/0
-K:ETBReplacement:Copy:ChooseCreature:Optional
-SVar:ChooseCreature:DB$ ChooseCard | Cost$ 0 | Defined$ You | Amount$ 1 | Choices$ Creature.YouCtrl+Other | SubAbility$ DBCopy | AILogic$ AtLeast1 | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature you control except it gains "{2}{U}{U}: Return this creature to its owner's hand."
-SVar:DBCopy:DB$ Clone | Defined$ ChosenCard | AddAbilities$ MercurialBounce
-SVar:MercurialBounce:AB$ ChangeZone | Cost$ 2 U U | Defined$ Self | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mercurial_pretender.jpg
-Oracle:You may have Mercurial Pretender enter the battlefield as a copy of any creature you control except it gains "{2}{U}{U}: Return this creature to its owner's hand."
+Name:Mercurial Pretender
+ManaCost:4 U
+Types:Creature Shapeshifter
+PT:0/0
+K:ETBReplacement:Copy:ChooseCreature:Optional
+SVar:ChooseCreature:DB$ ChooseCard | Cost$ 0 | Defined$ You | Amount$ 1 | Choices$ Creature.YouCtrl+Other | SubAbility$ DBCopy | AILogic$ AtLeast1 | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature you control except it gains "{2}{U}{U}: Return this creature to its owner's hand."
+SVar:DBCopy:DB$ Clone | Defined$ ChosenCard | AddAbilities$ MercurialBounce
+SVar:MercurialBounce:AB$ ChangeZone | Cost$ 2 U U | Defined$ Self | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mercurial_pretender.jpg
+Oracle:You may have Mercurial Pretender enter the battlefield as a copy of any creature you control except it gains "{2}{U}{U}: Return this creature to its owner's hand."
diff --git a/forge-gui/res/cardsfolder/m/meteorite.txt b/forge-gui/res/cardsfolder/m/meteorite.txt
index b48c3d64089..4ca70fed5d3 100644
--- a/forge-gui/res/cardsfolder/m/meteorite.txt
+++ b/forge-gui/res/cardsfolder/m/meteorite.txt
@@ -1,9 +1,9 @@
-Name:Meteorite
-ManaCost:5
-Types:Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 2 damage to target creature or player.
-SVar:TrigDealDamage:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2
-A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
-SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/meteorite.jpg
-Oracle:When Meteorite enters the battlefield, it deals 2 damage to target creature or player.\n{T}: Add one mana of any color to your mana pool.
+Name:Meteorite
+ManaCost:5
+Types:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 2 damage to target creature or player.
+SVar:TrigDealDamage:DB$ DealDamage | Cost$ 0 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/meteorite.jpg
+Oracle:When Meteorite enters the battlefield, it deals 2 damage to target creature or player.\n{T}: Add one mana of any color to your mana pool.
diff --git a/forge-gui/res/cardsfolder/m/might_makes_right.txt b/forge-gui/res/cardsfolder/m/might_makes_right.txt
index 0c184aabe99..390ed181014 100644
--- a/forge-gui/res/cardsfolder/m/might_makes_right.txt
+++ b/forge-gui/res/cardsfolder/m/might_makes_right.txt
@@ -1,11 +1,11 @@
-Name:Might Makes Right
-ManaCost:5 R
-Types:Enchantment
-T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigGainControl | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ EQY | References$ X,Y | TriggerDescription$ At the beginning of combat on your turn, if you control each creature on the battlefield with the greatest power, gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.
-SVar:TrigGainControl:AB$ GainControl | Cost$ 0 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | LoseControl$ EOT | Untap$ True | AddKWs$ Haste
-SVar:X:Count$Valid Creature.greatestPower
-SVar:Y:Count$Valid Creature.greatestPower+YouCtrl
-SVar:PlayMain1:TRUE
-SVar:RemRandomDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/might_makes_right.jpg
-Oracle:At the beginning of combat on your turn, if you control each creature on the battlefield with the greatest power, gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn. (It can attack and {T} this turn.)
+Name:Might Makes Right
+ManaCost:5 R
+Types:Enchantment
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigGainControl | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ EQY | References$ X,Y | TriggerDescription$ At the beginning of combat on your turn, if you control each creature on the battlefield with the greatest power, gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn.
+SVar:TrigGainControl:AB$ GainControl | Cost$ 0 | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | LoseControl$ EOT | Untap$ True | AddKWs$ Haste
+SVar:X:Count$Valid Creature.greatestPower
+SVar:Y:Count$Valid Creature.greatestPower+YouCtrl
+SVar:PlayMain1:TRUE
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/might_makes_right.jpg
+Oracle:At the beginning of combat on your turn, if you control each creature on the battlefield with the greatest power, gain control of target creature an opponent controls until end of turn. Untap that creature. It gains haste until end of turn. (It can attack and {T} this turn.)
diff --git a/forge-gui/res/cardsfolder/m/military_intelligence.txt b/forge-gui/res/cardsfolder/m/military_intelligence.txt
index dbbc79fd625..e6eeea16b70 100644
--- a/forge-gui/res/cardsfolder/m/military_intelligence.txt
+++ b/forge-gui/res/cardsfolder/m/military_intelligence.txt
@@ -1,8 +1,8 @@
-Name:Military Intelligence
-ManaCost:1 U
-Types:Enchantment
-T:Mode$ AttackersDeclared | Execute$ TrigDraw | CheckSVar$ OverwhelmInstinct | SVarCompare$ GE2 | NoResolvingCheck$ True | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with two or more creatures, draw a card.
-SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ 1
-SVar:OverwhelmInstinct:Count$Valid Creature.attacking
-SVar:Picture:http://www.wizards.com/global/images/magic/general/military_intelligence.jpg
-Oracle:Whenever you attack with two or more creatures, draw a card.
+Name:Military Intelligence
+ManaCost:1 U
+Types:Enchantment
+T:Mode$ AttackersDeclared | Execute$ TrigDraw | CheckSVar$ OverwhelmInstinct | SVarCompare$ GE2 | NoResolvingCheck$ True | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with two or more creatures, draw a card.
+SVar:TrigDraw:AB$ Draw | Cost$ 0 | NumCards$ 1
+SVar:OverwhelmInstinct:Count$Valid Creature.attacking
+SVar:Picture:http://www.wizards.com/global/images/magic/general/military_intelligence.jpg
+Oracle:Whenever you attack with two or more creatures, draw a card.
diff --git a/forge-gui/res/cardsfolder/m/miners_bane.txt b/forge-gui/res/cardsfolder/m/miners_bane.txt
index afa9a8fafec..4b15c7e86ab 100644
--- a/forge-gui/res/cardsfolder/m/miners_bane.txt
+++ b/forge-gui/res/cardsfolder/m/miners_bane.txt
@@ -1,7 +1,7 @@
-Name:Miner's Bane
-ManaCost:4 R R
-Types:Creature Elemental
-PT:6/3
-A:AB$ Pump | Cost$ 2 R | Defined$ Self | NumAtt$ 1 | KW$ Trample | SpellDescription$ CARDNAME gets +1/+0 and gains trample until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/miners_bane.jpg
-Oracle:{2}{R}: Miner's Bane gets +1/+0 and gains trample until end of turn. (If it would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
+Name:Miner's Bane
+ManaCost:4 R R
+Types:Creature Elemental
+PT:6/3
+A:AB$ Pump | Cost$ 2 R | Defined$ Self | NumAtt$ 1 | KW$ Trample | SpellDescription$ CARDNAME gets +1/+0 and gains trample until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/miners_bane.jpg
+Oracle:{2}{R}: Miner's Bane gets +1/+0 and gains trample until end of turn. (If it would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
diff --git a/forge-gui/res/cardsfolder/n/necromancers_assistant.txt b/forge-gui/res/cardsfolder/n/necromancers_assistant.txt
index c251623ec0c..3736a1c3d09 100644
--- a/forge-gui/res/cardsfolder/n/necromancers_assistant.txt
+++ b/forge-gui/res/cardsfolder/n/necromancers_assistant.txt
@@ -1,8 +1,8 @@
-Name:Necromancer's Assistant
-ManaCost:2 B
-Types:Creature Zombie
-PT:3/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, put the top three cards of your library into your graveyard.
-SVar:TrigMill:DB$ Mill | Cost$ 0 | NumCards$ 3 | Defined$ You
-SVar:Picture:http://www.wizards.com/global/images/magic/general/necromancers_assistant.jpg
-Oracle:When Necromancer's Assistant enters the battlefield, put the top three cards of your library into your graveyard.
+Name:Necromancer's Assistant
+ManaCost:2 B
+Types:Creature Zombie
+PT:3/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When CARDNAME enters the battlefield, put the top three cards of your library into your graveyard.
+SVar:TrigMill:DB$ Mill | Cost$ 0 | NumCards$ 3 | Defined$ You
+SVar:Picture:http://www.wizards.com/global/images/magic/general/necromancers_assistant.jpg
+Oracle:When Necromancer's Assistant enters the battlefield, put the top three cards of your library into your graveyard.
diff --git a/forge-gui/res/cardsfolder/n/necromancers_stockpile.txt b/forge-gui/res/cardsfolder/n/necromancers_stockpile.txt
index a910a395589..6f41a233c7a 100644
--- a/forge-gui/res/cardsfolder/n/necromancers_stockpile.txt
+++ b/forge-gui/res/cardsfolder/n/necromancers_stockpile.txt
@@ -1,10 +1,10 @@
-Name:Necromancer's Stockpile
-ManaCost:1 B
-Types:Enchantment
-A:AB$ Draw | Cost$ 1 B Discard<1/Creature> | NumCards$ 1 | SubAbility$ DBToken | SpellDescription$ Draw a card. If the discarded card was a Zombie card, put a 2/2 black Zombie creature token onto the battlefield tapped.
-SVar:DBToken:DB$ Token | TokenName$ Zombie | TokenColors$ Black | TokenTypes$ Creature,Zombie | TokenPower$ 2 | TokenToughness$ 2 | TokenOwner$ You | TokenAmount$ 1 | TokenTapped$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X
-SVar:X:Discarded$Valid Card.Zombie
-SVar:RemRandomDeck:True
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/necromancers_stockpile.jpg
-Oracle:{1}{B}, Discard a creature card: Draw a card. If the discarded card was a Zombie card, put a 2/2 black Zombie creature token onto the battlefield tapped.
+Name:Necromancer's Stockpile
+ManaCost:1 B
+Types:Enchantment
+A:AB$ Draw | Cost$ 1 B Discard<1/Creature> | NumCards$ 1 | SubAbility$ DBToken | SpellDescription$ Draw a card. If the discarded card was a Zombie card, put a 2/2 black Zombie creature token onto the battlefield tapped.
+SVar:DBToken:DB$ Token | TokenName$ Zombie | TokenColors$ Black | TokenTypes$ Creature,Zombie | TokenPower$ 2 | TokenToughness$ 2 | TokenOwner$ You | TokenAmount$ 1 | TokenTapped$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X
+SVar:X:Discarded$Valid Card.Zombie
+SVar:RemRandomDeck:True
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/necromancers_stockpile.jpg
+Oracle:{1}{B}, Discard a creature card: Draw a card. If the discarded card was a Zombie card, put a 2/2 black Zombie creature token onto the battlefield tapped.
diff --git a/forge-gui/res/cardsfolder/n/netcaster_spider.txt b/forge-gui/res/cardsfolder/n/netcaster_spider.txt
index 9b6f63415d7..6a8e0cc726b 100644
--- a/forge-gui/res/cardsfolder/n/netcaster_spider.txt
+++ b/forge-gui/res/cardsfolder/n/netcaster_spider.txt
@@ -1,9 +1,9 @@
-Name:Netcaster Spider
-ManaCost:2 G
-Types:Creature Spider
-PT:2/3
-K:Reach
-T:Mode$ AttackerBlocked | ValidCard$ Creature.withFlying | ValidBlocker$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, CARDNAME gets +2/+0 until end of turn.
-SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2
-SVar:Picture:http://www.wizards.com/global/images/magic/general/netcaster_spider.jpg
-Oracle:Reach (This creature can block creatures with flying.)\nWhenever Netcaster Spider blocks a creature with flying, Netcaster Spider gets +2/+0 until end of turn.
+Name:Netcaster Spider
+ManaCost:2 G
+Types:Creature Spider
+PT:2/3
+K:Reach
+T:Mode$ AttackerBlocked | ValidCard$ Creature.withFlying | ValidBlocker$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks a creature with flying, CARDNAME gets +2/+0 until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2
+SVar:Picture:http://www.wizards.com/global/images/magic/general/netcaster_spider.jpg
+Oracle:Reach (This creature can block creatures with flying.)\nWhenever Netcaster Spider blocks a creature with flying, Netcaster Spider gets +2/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/n/nightfire_giant.txt b/forge-gui/res/cardsfolder/n/nightfire_giant.txt
index c27abd536bb..7175fa847e4 100644
--- a/forge-gui/res/cardsfolder/n/nightfire_giant.txt
+++ b/forge-gui/res/cardsfolder/n/nightfire_giant.txt
@@ -1,11 +1,11 @@
-Name:Nightfire Giant
-ManaCost:4 B
-Types:Creature Zombie Giant
-PT:4/3
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control a Mountain.
-SVar:X:Count$Valid Mountain.YouCtrl
-A:AB$ DealDamage | Cost$ 4 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
-SVar:BuffedBy:Mountain
-DeckNeeds:Color$Red
-SVar:Picture:http://www.wizards.com/global/images/magic/general/nightfire_giant.jpg
-Oracle:Nightfire Giant gets +1/+1 as long as you control a Mountain.\n{4}{R}: Nightfire Giant deals 2 damage to target creature or player.
+Name:Nightfire Giant
+ManaCost:4 B
+Types:Creature Zombie Giant
+PT:4/3
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control a Mountain.
+SVar:X:Count$Valid Mountain.YouCtrl
+A:AB$ DealDamage | Cost$ 4 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
+SVar:BuffedBy:Mountain
+DeckNeeds:Color$Red
+SVar:Picture:http://www.wizards.com/global/images/magic/general/nightfire_giant.jpg
+Oracle:Nightfire Giant gets +1/+1 as long as you control a Mountain.\n{4}{R}: Nightfire Giant deals 2 damage to target creature or player.
diff --git a/forge-gui/res/cardsfolder/n/nimbus_of_the_isles.txt b/forge-gui/res/cardsfolder/n/nimbus_of_the_isles.txt
index 3aa950bacf0..ea22187ba6d 100644
--- a/forge-gui/res/cardsfolder/n/nimbus_of_the_isles.txt
+++ b/forge-gui/res/cardsfolder/n/nimbus_of_the_isles.txt
@@ -1,7 +1,7 @@
-Name:Nimbus of the Isles
-ManaCost:4 U
-Types:Creature Elemental
-PT:3/3
-K:Flying
-SVar:Picture:http://www.wizards.com/global/images/magic/general/nimbus_of_the_isles.jpg
-Oracle:Flying
+Name:Nimbus of the Isles
+ManaCost:4 U
+Types:Creature Elemental
+PT:3/3
+K:Flying
+SVar:Picture:http://www.wizards.com/global/images/magic/general/nimbus_of_the_isles.jpg
+Oracle:Flying
diff --git a/forge-gui/res/cardsfolder/n/nissa_worldwaker.txt b/forge-gui/res/cardsfolder/n/nissa_worldwaker.txt
index ace8778dadf..5cb105b3bec 100644
--- a/forge-gui/res/cardsfolder/n/nissa_worldwaker.txt
+++ b/forge-gui/res/cardsfolder/n/nissa_worldwaker.txt
@@ -1,12 +1,12 @@
-Name:Nissa, Worldwaker
-ManaCost:3 G G
-Types:Planeswalker Nissa
-Loyalty:3
-A:AB$ Animate | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Permanent$ True | Keywords$ Trample | SpellDescription$ Target land you control becomes a 4/4 Elemental creature with trample. It's still a land.
-A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Forest | TgtPrompt$ Choose target forest | TargetMin$ 0 | TargetMax$ 4 | Planeswalker$ True | SpellDescription$ Untap up to four target Forests.
-A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ XFetch | Planeswalker$ True | Ultimate$ True | StackDescription$ SpellDescription | References$ XFetch | RememberChanged$ True | SubAbility$ DBAnimate | SpellDescription$ Search your library for any number of basic land cards, put them onto the battlefield, then shuffle your library. Those lands become 4/4 Elemental creatures with trample. They're still lands.
-SVar:DBAnimate:DB$ Animate | Defined$ Remembered  | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Permanent$ True | Keywords$ Trample | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:XFetch:Count$ValidLibrary Land.Basic+YouCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/nissa_worldwaker.jpg
-Oracle:[+1] Target land you control becomes a 4/4 Elemental creature with trample. It's still a land.\n[+1] Untap up to four target Forests.\n[-7] Search your library for any number of basic land cards, put them onto the battlefield, then shuffle your library. Those lands become 4/4 Elemental creatures with trample. They're still lands.
+Name:Nissa, Worldwaker
+ManaCost:3 G G
+Types:Planeswalker Nissa
+Loyalty:3
+A:AB$ Animate | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Permanent$ True | Keywords$ Trample | SpellDescription$ Target land you control becomes a 4/4 Elemental creature with trample. It's still a land.
+A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Forest | TgtPrompt$ Choose target forest | TargetMin$ 0 | TargetMax$ 4 | Planeswalker$ True | SpellDescription$ Untap up to four target Forests.
+A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ XFetch | Planeswalker$ True | Ultimate$ True | StackDescription$ SpellDescription | References$ XFetch | RememberChanged$ True | SubAbility$ DBAnimate | SpellDescription$ Search your library for any number of basic land cards, put them onto the battlefield, then shuffle your library. Those lands become 4/4 Elemental creatures with trample. They're still lands.
+SVar:DBAnimate:DB$ Animate | Defined$ Remembered  | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Permanent$ True | Keywords$ Trample | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:XFetch:Count$ValidLibrary Land.Basic+YouCtrl
+SVar:Picture:http://www.wizards.com/global/images/magic/general/nissa_worldwaker.jpg
+Oracle:[+1] Target land you control becomes a 4/4 Elemental creature with trample. It's still a land.\n[+1] Untap up to four target Forests.\n[-7] Search your library for any number of basic land cards, put them onto the battlefield, then shuffle your library. Those lands become 4/4 Elemental creatures with trample. They're still lands.
diff --git a/forge-gui/res/cardsfolder/n/nissas_expedition.txt b/forge-gui/res/cardsfolder/n/nissas_expedition.txt
index ed9ae1c57cd..65409d66aa0 100644
--- a/forge-gui/res/cardsfolder/n/nissas_expedition.txt
+++ b/forge-gui/res/cardsfolder/n/nissas_expedition.txt
@@ -1,7 +1,7 @@
-Name:Nissa's Expedition
-ManaCost:4 G
-Types:Sorcery
-K:Convoke
-A:SP$ ChangeZone | Cost$ 4 G | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | Tapped$ True | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle your library.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/nissas_expedition.jpg
-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.)\nSearch your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle your library.
+Name:Nissa's Expedition
+ManaCost:4 G
+Types:Sorcery
+K:Convoke
+A:SP$ ChangeZone | Cost$ 4 G | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 2 | Tapped$ True | SpellDescription$ Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle your library.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/nissas_expedition.jpg
+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.)\nSearch your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/o/ob_nixilis_unshackled.txt b/forge-gui/res/cardsfolder/o/ob_nixilis_unshackled.txt
index fc55cdb7a3a..b5017a16e81 100644
--- a/forge-gui/res/cardsfolder/o/ob_nixilis_unshackled.txt
+++ b/forge-gui/res/cardsfolder/o/ob_nixilis_unshackled.txt
@@ -1,13 +1,13 @@
-Name:Ob Nixilis, Unshackled
-ManaCost:4 B B
-Types:Legendary Creature Demon
-PT:6/6
-K:Flying
-K:Trample
-T:Mode$ SearchedLibrary | ValidPlayer$ Player.Opponent | SearchOwnLibrary$ True | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent searches his or her library, that player sacrifices a creature and loses 10 life.
-SVar:TrigSac:DB$ Sacrifice | Defined$ TriggeredPlayer | SacValid$ Creature | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | Defined$ TriggeredPlayer | LifeAmount$ 10
-T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Creature.Other | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ DeathGift | TriggerDescription$ Whenever another creature dies, put a +1/+1 counter on CARDNAME.
-SVar:DeathGift:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ob_nixilis_unshackled.jpg
-Oracle:Flying, trample\nWhenever an opponent searches his or her library, that player sacrifices a creature and loses 10 life.\nWhenever another creature dies, put a +1/+1 counter on Ob Nixilis, Unshackled.
+Name:Ob Nixilis, Unshackled
+ManaCost:4 B B
+Types:Legendary Creature Demon
+PT:6/6
+K:Flying
+K:Trample
+T:Mode$ SearchedLibrary | ValidPlayer$ Player.Opponent | SearchOwnLibrary$ True | Execute$ TrigSac | TriggerZones$ Battlefield | TriggerDescription$ Whenever an opponent searches his or her library, that player sacrifices a creature and loses 10 life.
+SVar:TrigSac:DB$ Sacrifice | Defined$ TriggeredPlayer | SacValid$ Creature | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | Defined$ TriggeredPlayer | LifeAmount$ 10
+T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Creature.Other | Destination$ Graveyard | TriggerZones$ Battlefield | Execute$ DeathGift | TriggerDescription$ Whenever another creature dies, put a +1/+1 counter on CARDNAME.
+SVar:DeathGift:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ob_nixilis_unshackled.jpg
+Oracle:Flying, trample\nWhenever an opponent searches his or her library, that player sacrifices a creature and loses 10 life.\nWhenever another creature dies, put a +1/+1 counter on Ob Nixilis, Unshackled.
diff --git a/forge-gui/res/cardsfolder/o/obelisk_of_urd.txt b/forge-gui/res/cardsfolder/o/obelisk_of_urd.txt
index 0f8275ae865..c77ef5b12cc 100644
--- a/forge-gui/res/cardsfolder/o/obelisk_of_urd.txt
+++ b/forge-gui/res/cardsfolder/o/obelisk_of_urd.txt
@@ -1,11 +1,11 @@
-Name:Obelisk of Urd
-ManaCost:6
-Types:Artifact
-K:Convoke
-K:ETBReplacement:Other:ChooseCT
-SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type. | AILogic$ MostProminentInComputerDeck
-S:Mode$ Continuous | Affected$ Creature.ChosenType+YouCtrl | AddPower$ 2 | AddToughness$ 2 | Description$ Creatures you control of the chosen type get +2/+2.
-SVar:RemRandomDeck:True
-SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_urd.jpg
-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.)\nAs Obelisk of Urd enters the battlefield, choose a creature type.\nCreatures you control of the chosen type get +2/+2.
+Name:Obelisk of Urd
+ManaCost:6
+Types:Artifact
+K:Convoke
+K:ETBReplacement:Other:ChooseCT
+SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type. | AILogic$ MostProminentInComputerDeck
+S:Mode$ Continuous | Affected$ Creature.ChosenType+YouCtrl | AddPower$ 2 | AddToughness$ 2 | Description$ Creatures you control of the chosen type get +2/+2.
+SVar:RemRandomDeck:True
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_urd.jpg
+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.)\nAs Obelisk of Urd enters the battlefield, choose a creature type.\nCreatures you control of the chosen type get +2/+2.
diff --git a/forge-gui/res/cardsfolder/p/paragon_of_eternal_wilds.txt b/forge-gui/res/cardsfolder/p/paragon_of_eternal_wilds.txt
index e7eff22de52..9ce471b6128 100644
--- a/forge-gui/res/cardsfolder/p/paragon_of_eternal_wilds.txt
+++ b/forge-gui/res/cardsfolder/p/paragon_of_eternal_wilds.txt
@@ -1,8 +1,8 @@
-Name:Paragon of Eternal Wilds
-ManaCost:3 G
-Types:Creature Human Warrior
-PT:2/2
-S:Mode$ Continuous | Affected$ Creature.Green+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other green creatures you control get +1/+1.
-A:AB$ Pump | Cost$ G T | ValidTgts$ Creature.Green+Other+YouCtrl | TgtPrompt$ Select target green creature | KW$ Trample | SpellDescription$ Another target green creature you control gains trample until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/paragon_of_eternal_wilds.jpg
-Oracle:Other green creatures you control get +1/+1.\n{G}, {T}: Another target green creature you control gains trample until end of turn. (If it would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
+Name:Paragon of Eternal Wilds
+ManaCost:3 G
+Types:Creature Human Warrior
+PT:2/2
+S:Mode$ Continuous | Affected$ Creature.Green+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other green creatures you control get +1/+1.
+A:AB$ Pump | Cost$ G T | ValidTgts$ Creature.Green+Other+YouCtrl | TgtPrompt$ Select target green creature | KW$ Trample | SpellDescription$ Another target green creature you control gains trample until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/paragon_of_eternal_wilds.jpg
+Oracle:Other green creatures you control get +1/+1.\n{G}, {T}: Another target green creature you control gains trample until end of turn. (If it would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
diff --git a/forge-gui/res/cardsfolder/p/paragon_of_fierce_defiance.txt b/forge-gui/res/cardsfolder/p/paragon_of_fierce_defiance.txt
index 6aaed7df942..8e5f8824267 100644
--- a/forge-gui/res/cardsfolder/p/paragon_of_fierce_defiance.txt
+++ b/forge-gui/res/cardsfolder/p/paragon_of_fierce_defiance.txt
@@ -1,8 +1,8 @@
-Name:Paragon of Fierce Defiance
-ManaCost:3 R
-Types:Creature Human Warrior
-PT:2/2
-S:Mode$ Continuous | Affected$ Creature.Red+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other red creatures you control get +1/+1.
-A:AB$ Pump | Cost$ R T | ValidTgts$ Creature.Red+Other+YouCtrl | TgtPrompt$ Select target red creature | KW$ Haste | SpellDescription$ Another target red creature you control gains haste until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/paragon_of_fierce_defiance.jpg
-Oracle:Other red creatures you control get +1/+1.\n{R}, {T}: Another target red creature you control gains haste until end of turn. (It can attack and {T} this turn.)
+Name:Paragon of Fierce Defiance
+ManaCost:3 R
+Types:Creature Human Warrior
+PT:2/2
+S:Mode$ Continuous | Affected$ Creature.Red+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other red creatures you control get +1/+1.
+A:AB$ Pump | Cost$ R T | ValidTgts$ Creature.Red+Other+YouCtrl | TgtPrompt$ Select target red creature | KW$ Haste | SpellDescription$ Another target red creature you control gains haste until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/paragon_of_fierce_defiance.jpg
+Oracle:Other red creatures you control get +1/+1.\n{R}, {T}: Another target red creature you control gains haste until end of turn. (It can attack and {T} this turn.)
diff --git a/forge-gui/res/cardsfolder/p/paragon_of_gathering_mists.txt b/forge-gui/res/cardsfolder/p/paragon_of_gathering_mists.txt
index 5528f1a87d5..ad933ffad0e 100644
--- a/forge-gui/res/cardsfolder/p/paragon_of_gathering_mists.txt
+++ b/forge-gui/res/cardsfolder/p/paragon_of_gathering_mists.txt
@@ -1,8 +1,8 @@
-Name:Paragon of Gathering Mists
-ManaCost:3 U
-Types:Creature Human Wizard
-PT:2/2
-S:Mode$ Continuous | Affected$ Creature.Blue+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other blue creatures you control get +1/+1.
-A:AB$ Pump | Cost$ U T | ValidTgts$ Creature.Blue+Other+YouCtrl | TgtPrompt$ Select target blue creature | KW$ Flying | SpellDescription$ Another target blue creature you control gains flying until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/paragon_of_gathering_mists.jpg
-Oracle:Other blue creatures you control get +1/+1.\n{U}, {T}: Another target blue creature you control gains flying until end of turn.
+Name:Paragon of Gathering Mists
+ManaCost:3 U
+Types:Creature Human Wizard
+PT:2/2
+S:Mode$ Continuous | Affected$ Creature.Blue+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other blue creatures you control get +1/+1.
+A:AB$ Pump | Cost$ U T | ValidTgts$ Creature.Blue+Other+YouCtrl | TgtPrompt$ Select target blue creature | KW$ Flying | SpellDescription$ Another target blue creature you control gains flying until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/paragon_of_gathering_mists.jpg
+Oracle:Other blue creatures you control get +1/+1.\n{U}, {T}: Another target blue creature you control gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/p/paragon_of_new_dawns.txt b/forge-gui/res/cardsfolder/p/paragon_of_new_dawns.txt
index 659df738b87..8e045ed6756 100644
--- a/forge-gui/res/cardsfolder/p/paragon_of_new_dawns.txt
+++ b/forge-gui/res/cardsfolder/p/paragon_of_new_dawns.txt
@@ -1,8 +1,8 @@
-Name:Paragon of New Dawns
-ManaCost:3 W
-Types:Creature Human Soldier
-PT:2/2
-S:Mode$ Continuous | Affected$ Creature.White+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other white creatures you control get +1/+1.
-A:AB$ Pump | Cost$ W T | ValidTgts$ Creature.White+Other+YouCtrl | TgtPrompt$ Select target white creature | KW$ Vigilance | SpellDescription$ Another target white creature you control gains vigilance until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/paragon_of_new_dawns.jpg
-Oracle:Other white creatures you control get +1/+1.\n{W}, {T}: Another target white creature you control gains vigilance until end of turn. (Attacking doesn't cause it to tap.)
+Name:Paragon of New Dawns
+ManaCost:3 W
+Types:Creature Human Soldier
+PT:2/2
+S:Mode$ Continuous | Affected$ Creature.White+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other white creatures you control get +1/+1.
+A:AB$ Pump | Cost$ W T | ValidTgts$ Creature.White+Other+YouCtrl | TgtPrompt$ Select target white creature | KW$ Vigilance | SpellDescription$ Another target white creature you control gains vigilance until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/paragon_of_new_dawns.jpg
+Oracle:Other white creatures you control get +1/+1.\n{W}, {T}: Another target white creature you control gains vigilance until end of turn. (Attacking doesn't cause it to tap.)
diff --git a/forge-gui/res/cardsfolder/p/paragon_of_open_graves.txt b/forge-gui/res/cardsfolder/p/paragon_of_open_graves.txt
index ab856bdfdb4..9c6e099dba4 100644
--- a/forge-gui/res/cardsfolder/p/paragon_of_open_graves.txt
+++ b/forge-gui/res/cardsfolder/p/paragon_of_open_graves.txt
@@ -1,8 +1,8 @@
-Name:Paragon of Open Graves
-ManaCost:3 B
-Types:Creature Skeleton Warrior
-PT:2/2
-S:Mode$ Continuous | Affected$ Creature.Black+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other black creatures you control get +1/+1.
-A:AB$ Pump | Cost$ B T | ValidTgts$ Creature.Black+Other+YouCtrl | TgtPrompt$ Select target black creature | KW$ Deathtouch | SpellDescription$ Another target black creature you control gains deathtouch until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/paragon_of_open_graves.jpg
-Oracle:Other black creatures you control get +1/+1.\n{2}{B}, {T}: Another target black creature you control gains deathtouch until end of turn. (Any amount of damage it deals to a creature is enough to destroy it.)
+Name:Paragon of Open Graves
+ManaCost:3 B
+Types:Creature Skeleton Warrior
+PT:2/2
+S:Mode$ Continuous | Affected$ Creature.Black+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Other black creatures you control get +1/+1.
+A:AB$ Pump | Cost$ B T | ValidTgts$ Creature.Black+Other+YouCtrl | TgtPrompt$ Select target black creature | KW$ Deathtouch | SpellDescription$ Another target black creature you control gains deathtouch until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/paragon_of_open_graves.jpg
+Oracle:Other black creatures you control get +1/+1.\n{2}{B}, {T}: Another target black creature you control gains deathtouch until end of turn. (Any amount of damage it deals to a creature is enough to destroy it.)
diff --git a/forge-gui/res/cardsfolder/p/perilous_vault.txt b/forge-gui/res/cardsfolder/p/perilous_vault.txt
index a35a2372590..f4bc2c6b4ce 100644
--- a/forge-gui/res/cardsfolder/p/perilous_vault.txt
+++ b/forge-gui/res/cardsfolder/p/perilous_vault.txt
@@ -1,7 +1,7 @@
-Name:Perilous Vault
-ManaCost:4
-Types:Artifact
-A:AB$ ChangeZoneAll | Cost$ 5 T Exile<1/CARDNAME> | UseAllOriginZones$ True | Origin$ Battlefield | Destination$ Exile | ChangeType$ Permanent.nonLand | IsCurse$ True | SpellDescription$ Exile all nonland permanents.
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/perilous_vault.jpg
-Oracle:{5}, {T}, Exile Perilous Vault: Exile all nonland permanents.
+Name:Perilous Vault
+ManaCost:4
+Types:Artifact
+A:AB$ ChangeZoneAll | Cost$ 5 T Exile<1/CARDNAME> | UseAllOriginZones$ True | Origin$ Battlefield | Destination$ Exile | ChangeType$ Permanent.nonLand | IsCurse$ True | SpellDescription$ Exile all nonland permanents.
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/perilous_vault.jpg
+Oracle:{5}, {T}, Exile Perilous Vault: Exile all nonland permanents.
diff --git a/forge-gui/res/cardsfolder/p/phytotitan.txt b/forge-gui/res/cardsfolder/p/phytotitan.txt
index ef52cc6d23e..bcb1755240c 100644
--- a/forge-gui/res/cardsfolder/p/phytotitan.txt
+++ b/forge-gui/res/cardsfolder/p/phytotitan.txt
@@ -1,9 +1,9 @@
-Name:Phytotitan
-ManaCost:4 G G
-Types:Creature Plant Elemental
-PT:7/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerController$ TriggeredCardController | DelayedTrigger$ DelTrig | TriggerDescription$ When CARDNAME dies, return it to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
-SVar:DelTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigChange | TriggerDescription$ Return CARDNAME to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
-SVar:TrigChange:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | Defined$ TriggeredCard | Tapped$ True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/phytotitan.jpg
-Oracle:When Phytotitan dies, return it to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
+Name:Phytotitan
+ManaCost:4 G G
+Types:Creature Plant Elemental
+PT:7/2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerController$ TriggeredCardController | DelayedTrigger$ DelTrig | TriggerDescription$ When CARDNAME dies, return it to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
+SVar:DelTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigChange | TriggerDescription$ Return CARDNAME to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
+SVar:TrigChange:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | Defined$ TriggeredCard | Tapped$ True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/phytotitan.jpg
+Oracle:When Phytotitan dies, return it to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
diff --git a/forge-gui/res/cardsfolder/p/pillar_of_light.txt b/forge-gui/res/cardsfolder/p/pillar_of_light.txt
index 3fa25cd620f..c908b857b63 100644
--- a/forge-gui/res/cardsfolder/p/pillar_of_light.txt
+++ b/forge-gui/res/cardsfolder/p/pillar_of_light.txt
@@ -1,6 +1,6 @@
-Name:Pillar of Light
-ManaCost:2 W
-Types:Instant
-A:SP$ ChangeZone | Cost$ 2 W | ValidTgts$ Creature.toughnessGE4 | TgtPrompt$ Choose target creature with toughness 4 or greater | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature with toughness 4 or greater.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/pillar_of_light.jpg
-Oracle:Exile target creature with toughness 4 or greater.
+Name:Pillar of Light
+ManaCost:2 W
+Types:Instant
+A:SP$ ChangeZone | Cost$ 2 W | ValidTgts$ Creature.toughnessGE4 | TgtPrompt$ Choose target creature with toughness 4 or greater | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature with toughness 4 or greater.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/pillar_of_light.jpg
+Oracle:Exile target creature with toughness 4 or greater.
diff --git a/forge-gui/res/cardsfolder/p/polymorphists_jest.txt b/forge-gui/res/cardsfolder/p/polymorphists_jest.txt
index 1616265d27f..4e3692363a7 100644
--- a/forge-gui/res/cardsfolder/p/polymorphists_jest.txt
+++ b/forge-gui/res/cardsfolder/p/polymorphists_jest.txt
@@ -1,7 +1,7 @@
-Name:Polymorphist's Jest
-ManaCost:1 U U
-Types:Instant
-A:SP$ AnimateAll | Cost$ 1 U U | ValidTgts$ Player | TgtPrompt$ Select target Player | ValidCards$ Creature | Power$ 1 | Toughness$ 1 | RemoveAllAbilities$ True | Colors$ Blue | OverwriteColors$ True | Types$ Frog | RemoveCreatureTypes$ True | SpellDescription$ Until end of turn, each creature target player controls loses all abilities and becomes a blue Frog with base power and toughness 1/1.
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/polymorphists_jest.jpg
-Oracle:Until end of turn, each creature target player controls loses all abilities and becomes a blue Frog with base power and toughness 1/1.
+Name:Polymorphist's Jest
+ManaCost:1 U U
+Types:Instant
+A:SP$ AnimateAll | Cost$ 1 U U | ValidTgts$ Player | TgtPrompt$ Select target Player | ValidCards$ Creature | Power$ 1 | Toughness$ 1 | RemoveAllAbilities$ True | Colors$ Blue | OverwriteColors$ True | Types$ Frog | RemoveCreatureTypes$ True | SpellDescription$ Until end of turn, each creature target player controls loses all abilities and becomes a blue Frog with base power and toughness 1/1.
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/polymorphists_jest.jpg
+Oracle:Until end of turn, each creature target player controls loses all abilities and becomes a blue Frog with base power and toughness 1/1.
diff --git a/forge-gui/res/cardsfolder/p/profane_memento.txt b/forge-gui/res/cardsfolder/p/profane_memento.txt
index 3d2b00a7374..2cf62234d9b 100644
--- a/forge-gui/res/cardsfolder/p/profane_memento.txt
+++ b/forge-gui/res/cardsfolder/p/profane_memento.txt
@@ -1,7 +1,7 @@
-Name:Profane Memento
-ManaCost:1
-Types:Artifact
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Creature.nonToken+OppOwn | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature card is put into an opponent's graveyard from anywhere, you gain 1 life.
-SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/profane_memento.jpg
-Oracle:Whenever a creature card is put into an opponent's graveyard from anywhere, you gain 1 life.
+Name:Profane Memento
+ManaCost:1
+Types:Artifact
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Graveyard | ValidCard$ Creature.nonToken+OppOwn | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a creature card is put into an opponent's graveyard from anywhere, you gain 1 life.
+SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/profane_memento.jpg
+Oracle:Whenever a creature card is put into an opponent's graveyard from anywhere, you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/q/quickling.txt b/forge-gui/res/cardsfolder/q/quickling.txt
index 69a29ec7047..532caa979a5 100644
--- a/forge-gui/res/cardsfolder/q/quickling.txt
+++ b/forge-gui/res/cardsfolder/q/quickling.txt
@@ -1,11 +1,11 @@
-Name:Quickling
-ManaCost:1 U
-Types:Creature Faerie Rogue
-PT:2/2
-K:Flying
-K:Flash
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return another creature you control to its owner's hand.
-SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Creature.Other/other creature> | UnlessPayer$ You
-SVar:NeedsToPlay:Creature.YouCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/quickling.jpg
-Oracle:Flash (You may cast this spell any time you could cast an instant.)\nFlying\nWhen Quickling enters the battlefield, sacrifice it unless you return another creature you control to its owner's hand.
+Name:Quickling
+ManaCost:1 U
+Types:Creature Faerie Rogue
+PT:2/2
+K:Flying
+K:Flash
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSacUnless | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless you return another creature you control to its owner's hand.
+SVar:TrigSacUnless:DB$ Sacrifice | Defined$ Self | UnlessCost$ Return<1/Creature.Other/other creature> | UnlessPayer$ You
+SVar:NeedsToPlay:Creature.YouCtrl
+SVar:Picture:http://www.wizards.com/global/images/magic/general/quickling.jpg
+Oracle:Flash (You may cast this spell any time you could cast an instant.)\nFlying\nWhen Quickling enters the battlefield, sacrifice it unless you return another creature you control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/r/radiant_fountain.txt b/forge-gui/res/cardsfolder/r/radiant_fountain.txt
index 6875d8fa69c..aadde6bbdf7 100644
--- a/forge-gui/res/cardsfolder/r/radiant_fountain.txt
+++ b/forge-gui/res/cardsfolder/r/radiant_fountain.txt
@@ -1,8 +1,8 @@
-Name:Radiant Fountain
-ManaCost:no cost
-Types:Land
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 2 life.
-SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | LifeAmount$ 2
-A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add {1} to your mana pool.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/radiant_fountain.jpg
-Oracle:When Radiant Fountain enters the battlefield, you gain 2 life.\n{T}: Add {1} to your mana pool.
+Name:Radiant Fountain
+ManaCost:no cost
+Types:Land
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 2 life.
+SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | LifeAmount$ 2
+A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add {1} to your mana pool.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/radiant_fountain.jpg
+Oracle:When Radiant Fountain enters the battlefield, you gain 2 life.\n{T}: Add {1} to your mana pool.
diff --git a/forge-gui/res/cardsfolder/r/reclamation_sage.txt b/forge-gui/res/cardsfolder/r/reclamation_sage.txt
index 11c51ca9901..773d0013bfa 100644
--- a/forge-gui/res/cardsfolder/r/reclamation_sage.txt
+++ b/forge-gui/res/cardsfolder/r/reclamation_sage.txt
@@ -1,8 +1,8 @@
-Name:Reclamation Sage
-ManaCost:2 G
-Types:Creature Elf Shaman
-PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may destroy target artifact or enchantment.
-SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/reclamation_sage.jpg
-Oracle:When Reclamation Sage enters the battlefield, you may destroy target artifact or enchantment.
+Name:Reclamation Sage
+ManaCost:2 G
+Types:Creature Elf Shaman
+PT:2/1
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may destroy target artifact or enchantment.
+SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | ValidTgts$ Artifact,Enchantment | TgtPrompt$ Select target artifact or enchantment.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/reclamation_sage.jpg
+Oracle:When Reclamation Sage enters the battlefield, you may destroy target artifact or enchantment.
diff --git a/forge-gui/res/cardsfolder/r/research_assistant.txt b/forge-gui/res/cardsfolder/r/research_assistant.txt
index d859858754d..e59188c91cc 100644
--- a/forge-gui/res/cardsfolder/r/research_assistant.txt
+++ b/forge-gui/res/cardsfolder/r/research_assistant.txt
@@ -1,8 +1,8 @@
-Name:Research Assistant
-ManaCost:1 U
-Types:Creature Human Wizard
-PT:1/3
-A:AB$ Draw | Cost$ 3 U T | NumCards$ 1 | SubAbility$ DBDiscard | SpellDescription$ Draw a card, then discard a card.
-SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
-SVar:Picture:http://www.wizards.com/global/images/magic/general/research_assistant.jpg
-Oracle:{3}{U}, {T}: Draw a card, then discard a card.
+Name:Research Assistant
+ManaCost:1 U
+Types:Creature Human Wizard
+PT:1/3
+A:AB$ Draw | Cost$ 3 U T | NumCards$ 1 | SubAbility$ DBDiscard | SpellDescription$ Draw a card, then discard a card.
+SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
+SVar:Picture:http://www.wizards.com/global/images/magic/general/research_assistant.jpg
+Oracle:{3}{U}, {T}: Draw a card, then discard a card.
diff --git a/forge-gui/res/cardsfolder/r/resolute_archangel.txt b/forge-gui/res/cardsfolder/r/resolute_archangel.txt
index f7efd45e52d..6db246cb583 100644
--- a/forge-gui/res/cardsfolder/r/resolute_archangel.txt
+++ b/forge-gui/res/cardsfolder/r/resolute_archangel.txt
@@ -1,12 +1,12 @@
-Name:Resolute Archangel
-ManaCost:5 W W
-Types:Creature Angel
-PT:4/4
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSetLife | CheckSVar$ X | SVarCompare$ LTY | References$ X,Y | TriggerDescription$ When CARDNAME enters the battlefield, if your life total is lower than your starting life total, it becomes equal to your starting life total.
-SVar:TrigSetLife:DB$ SetLife | Defined$ You | LifeAmount$ Y | References$ Y
-SVar:X:Count$YourLifeTotal
-SVar:Y:Count$YourStartingLife
-SVar:NeedsToPlayVar:X LTY
-SVar:Picture:http://www.wizards.com/global/images/magic/general/resolute_archangel.jpg
-Oracle:Flying\nWhen Resolute Archangel enters the battlefield, if your life total is less than your starting life total, it becomes equal to your starting life total.
+Name:Resolute Archangel
+ManaCost:5 W W
+Types:Creature Angel
+PT:4/4
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSetLife | CheckSVar$ X | SVarCompare$ LTY | References$ X,Y | TriggerDescription$ When CARDNAME enters the battlefield, if your life total is lower than your starting life total, it becomes equal to your starting life total.
+SVar:TrigSetLife:DB$ SetLife | Defined$ You | LifeAmount$ Y | References$ Y
+SVar:X:Count$YourLifeTotal
+SVar:Y:Count$YourStartingLife
+SVar:NeedsToPlayVar:X LTY
+SVar:Picture:http://www.wizards.com/global/images/magic/general/resolute_archangel.jpg
+Oracle:Flying\nWhen Resolute Archangel enters the battlefield, if your life total is less than your starting life total, it becomes equal to your starting life total.
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 15097182336..f9640b44284 100644
--- a/forge-gui/res/cardsfolder/r/return_to_the_ranks.txt
+++ b/forge-gui/res/cardsfolder/r/return_to_the_ranks.txt
@@ -1,9 +1,9 @@
-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
-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.
+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
+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/rogues_gloves.txt b/forge-gui/res/cardsfolder/r/rogues_gloves.txt
index 491128cb47d..cbbfc76415f 100644
--- a/forge-gui/res/cardsfolder/r/rogues_gloves.txt
+++ b/forge-gui/res/cardsfolder/r/rogues_gloves.txt
@@ -1,8 +1,8 @@
-Name:Rogue's Gloves
-ManaCost:2
-Types:Artifact Equipment
-K:Equip 2
-T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature deals combat damage to a player, you may draw a card.
-SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/rogues_gloves.jpg
-Oracle:Whenever equipped creature deals combat damage to a player, you may draw a card.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
+Name:Rogue's Gloves
+ManaCost:2
+Types:Artifact Equipment
+K:Equip 2
+T:Mode$ DamageDone | ValidSource$ Creature.EquippedBy | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature deals combat damage to a player, you may draw a card.
+SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/rogues_gloves.jpg
+Oracle:Whenever equipped creature deals combat damage to a player, you may draw a card.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/s/rotfeaster_maggot.txt b/forge-gui/res/cardsfolder/r/rotfeaster_maggot.txt
similarity index 98%
rename from forge-gui/res/cardsfolder/s/rotfeaster_maggot.txt
rename to forge-gui/res/cardsfolder/r/rotfeaster_maggot.txt
index 25f976e965f..10276b4e6be 100644
--- a/forge-gui/res/cardsfolder/s/rotfeaster_maggot.txt
+++ b/forge-gui/res/cardsfolder/r/rotfeaster_maggot.txt
@@ -1,11 +1,11 @@
-Name:Rotfeaster Maggot
-ManaCost:4 B
-Types:Creature Insect
-PT:3/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, exile target creature card from a graveyard. You gain life equal to that card's toughness.
-SVar:TrigChange:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target creature card in a graveyard | ValidTgts$ Creature |  RememberLKI$ True | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$CardToughness
-SVar:Picture:http://www.wizards.com/global/images/magic/general/rotfeaster_maggot.jpg
-Oracle:When Rotfeaster Maggot enters the battlefield, exile target creature card from a graveyard. You gain life equal to that card's toughness.
+Name:Rotfeaster Maggot
+ManaCost:4 B
+Types:Creature Insect
+PT:3/5
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, exile target creature card from a graveyard. You gain life equal to that card's toughness.
+SVar:TrigChange:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Exile | TgtPrompt$ Choose target creature card in a graveyard | ValidTgts$ Creature |  RememberLKI$ True | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:RememberedLKI$CardToughness
+SVar:Picture:http://www.wizards.com/global/images/magic/general/rotfeaster_maggot.jpg
+Oracle:When Rotfeaster Maggot enters the battlefield, exile target creature card from a graveyard. You gain life equal to that card's toughness.
diff --git a/forge-gui/res/cardsfolder/s/sacred_armory.txt b/forge-gui/res/cardsfolder/s/sacred_armory.txt
index 5a1788c13ec..e819886e299 100644
--- a/forge-gui/res/cardsfolder/s/sacred_armory.txt
+++ b/forge-gui/res/cardsfolder/s/sacred_armory.txt
@@ -1,6 +1,6 @@
-Name:Sacred Armory
-ManaCost:2
-Types:Artifact
-A:AB$ Pump | Cost$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | SpellDescription$ Target creature gets +1/+0 until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sacred_armory.jpg
-Oracle:{2}: Target creature gets +1/+0 until end of turn.
+Name:Sacred Armory
+ManaCost:2
+Types:Artifact
+A:AB$ Pump | Cost$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +1 | SpellDescription$ Target creature gets +1/+0 until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/sacred_armory.jpg
+Oracle:{2}: Target creature gets +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sanctified_charge.txt b/forge-gui/res/cardsfolder/s/sanctified_charge.txt
index 467b7dae207..18b710e9006 100644
--- a/forge-gui/res/cardsfolder/s/sanctified_charge.txt
+++ b/forge-gui/res/cardsfolder/s/sanctified_charge.txt
@@ -1,7 +1,7 @@
-Name:Sanctified Charge
-ManaCost:4 W
-Types:Instant
-A:SP$ PumpAll | Cost$ 4 W | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ +1 | SubAbility$ DBPump | SpellDescription$ Creatures you control get +2/+1 until end of turn. White creatures you control also gain first strike until end of turn.
-SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl+White | KW$ First Strike
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sanctified_charge.jpg
-Oracle:Creatures you control get +2/+1 until end of turn. White creatures you control also gain first strike until end of turn. (They deal combat damage before creatures without first strike.)
+Name:Sanctified Charge
+ManaCost:4 W
+Types:Instant
+A:SP$ PumpAll | Cost$ 4 W | ValidCards$ Creature.YouCtrl | NumAtt$ +2 | NumDef$ +1 | SubAbility$ DBPump | SpellDescription$ Creatures you control get +2/+1 until end of turn. White creatures you control also gain first strike until end of turn.
+SVar:DBPump:DB$ PumpAll | ValidCards$ Creature.YouCtrl+White | KW$ First Strike
+SVar:Picture:http://www.wizards.com/global/images/magic/general/sanctified_charge.jpg
+Oracle:Creatures you control get +2/+1 until end of turn. White creatures you control also gain first strike until end of turn. (They deal combat damage before creatures without first strike.)
diff --git a/forge-gui/res/cardsfolder/s/scrapyard_mongrel.txt b/forge-gui/res/cardsfolder/s/scrapyard_mongrel.txt
index f237ef6ffc5..2eb2a067e02 100644
--- a/forge-gui/res/cardsfolder/s/scrapyard_mongrel.txt
+++ b/forge-gui/res/cardsfolder/s/scrapyard_mongrel.txt
@@ -1,10 +1,10 @@
-Name:Scrapyard Mongrel
-ManaCost:3 R
-Types:Creature Hound
-PT:3/3
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddKeyword$ Trample | CheckSVar$ X | SVarCompare$ GE1 | Description$ As long as you control an artifact, CARDNAME gets +2/+0 and has trample.
-SVar:X:Count$Valid Artifact.YouCtrl
-DeckNeeds:Type$Artifact
-SVar:BuffedBy:Artifact
-SVar:Picture:http://www.wizards.com/global/images/magic/general/scrapyard_mongrel.jpg
-Oracle:As long as you control an artifact, Scrapyard Mongrel gets +2/+0 and has trample. (If it would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
+Name:Scrapyard Mongrel
+ManaCost:3 R
+Types:Creature Hound
+PT:3/3
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddKeyword$ Trample | CheckSVar$ X | SVarCompare$ GE1 | Description$ As long as you control an artifact, CARDNAME gets +2/+0 and has trample.
+SVar:X:Count$Valid Artifact.YouCtrl
+DeckNeeds:Type$Artifact
+SVar:BuffedBy:Artifact
+SVar:Picture:http://www.wizards.com/global/images/magic/general/scrapyard_mongrel.jpg
+Oracle:As long as you control an artifact, Scrapyard Mongrel gets +2/+0 and has trample. (If it would assign enough damage to its blockers to destroy them, you may have it assign the rest of its damage to defending player or planeswalker.)
diff --git a/forge-gui/res/cardsfolder/s/scuttling_doom_engine.txt b/forge-gui/res/cardsfolder/s/scuttling_doom_engine.txt
index 290af6629bd..06350a945fc 100644
--- a/forge-gui/res/cardsfolder/s/scuttling_doom_engine.txt
+++ b/forge-gui/res/cardsfolder/s/scuttling_doom_engine.txt
@@ -1,9 +1,9 @@
-Name:Scuttling Doom Engine
-ManaCost:6
-Types:Artifact Creature Construct
-PT:6/6
-K:CantBeBlockedBy Creature.powerLE2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, it deals 6 damage to target opponnent.
-SVar:TrigDealDamage:AB$ DealDamage | Cost$ 0 | ValidTgts$ Opponent | NumDmg$ 6
-SVar:Picture:http://www.wizards.com/global/images/magic/general/scuttling_doom_engine.jpg
-Oracle:Scuttling Doom Engine can't be blocked by creatures with power 2 or less.\nWhen Scuttling Doom Engine dies, it deals 6 damage to target opponent.
+Name:Scuttling Doom Engine
+ManaCost:6
+Types:Artifact Creature Construct
+PT:6/6
+K:CantBeBlockedBy Creature.powerLE2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, it deals 6 damage to target opponnent.
+SVar:TrigDealDamage:AB$ DealDamage | Cost$ 0 | ValidTgts$ Opponent | NumDmg$ 6
+SVar:Picture:http://www.wizards.com/global/images/magic/general/scuttling_doom_engine.jpg
+Oracle:Scuttling Doom Engine can't be blocked by creatures with power 2 or less.\nWhen Scuttling Doom Engine dies, it deals 6 damage to target opponent.
diff --git a/forge-gui/res/cardsfolder/s/seraph_of_the_masses.txt b/forge-gui/res/cardsfolder/s/seraph_of_the_masses.txt
index 1640636fde7..84f5a0b56f7 100644
--- a/forge-gui/res/cardsfolder/s/seraph_of_the_masses.txt
+++ b/forge-gui/res/cardsfolder/s/seraph_of_the_masses.txt
@@ -1,11 +1,11 @@
-Name:Seraph of the Masses
-ManaCost:5 W W
-Types:Creature Angel
-PT:*/*
-K:Convoke
-K:Flying
-S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of creatures you control.
-SVar:X:Count$Valid Creature.YouCtrl
-SVar:BuffedBy:Creature
-SVar:Picture:http://www.wizards.com/global/images/magic/general/seraph_of_the_masses.jpg
-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.)\nFlying\nSeraph of the Masses's power and toughness are each equal to the number of creatures you control.
+Name:Seraph of the Masses
+ManaCost:5 W W
+Types:Creature Angel
+PT:*/*
+K:Convoke
+K:Flying
+S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of creatures you control.
+SVar:X:Count$Valid Creature.YouCtrl
+SVar:BuffedBy:Creature
+SVar:Picture:http://www.wizards.com/global/images/magic/general/seraph_of_the_masses.jpg
+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.)\nFlying\nSeraph of the Masses's power and toughness are each equal to the number of creatures you control.
diff --git a/forge-gui/res/cardsfolder/s/shadowcloak_vampire.txt b/forge-gui/res/cardsfolder/s/shadowcloak_vampire.txt
index d292905640d..7dfd157e2ad 100644
--- a/forge-gui/res/cardsfolder/s/shadowcloak_vampire.txt
+++ b/forge-gui/res/cardsfolder/s/shadowcloak_vampire.txt
@@ -1,7 +1,7 @@
-Name:Shadowcloak Vampire
-ManaCost:4 B
-Types:Creature Vampire
-PT:4/3
-A:AB$ Pump | Cost$ PayLife<2> | Defined$ Self | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/shadowcloak_vampire.jpg
-Oracle:Pay 2 life: Shadowcloak Vampire gains flying until end of turn. (It can't be blocked except by creatures with flying or reach.)
+Name:Shadowcloak Vampire
+ManaCost:4 B
+Types:Creature Vampire
+PT:4/3
+A:AB$ Pump | Cost$ PayLife<2> | Defined$ Self | KW$ Flying | SpellDescription$ CARDNAME gains flying until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/shadowcloak_vampire.jpg
+Oracle:Pay 2 life: Shadowcloak Vampire gains flying until end of turn. (It can't be blocked except by creatures with flying or reach.)
diff --git a/forge-gui/res/cardsfolder/s/shaman_of_spring.txt b/forge-gui/res/cardsfolder/s/shaman_of_spring.txt
index 45e5f0d80db..7128bcbcd10 100644
--- a/forge-gui/res/cardsfolder/s/shaman_of_spring.txt
+++ b/forge-gui/res/cardsfolder/s/shaman_of_spring.txt
@@ -1,8 +1,8 @@
-Name:Shaman of Spring
-ManaCost:3 G
-Types:Creature Elf Shaman
-PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
-SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/shaman_of_spring.jpg
-Oracle:When Shaman of Spring enters the battlefield, draw a card.
+Name:Shaman of Spring
+ManaCost:3 G
+Types:Creature Elf Shaman
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
+SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/shaman_of_spring.jpg
+Oracle:When Shaman of Spring enters the battlefield, draw a card.
diff --git a/forge-gui/res/cardsfolder/s/shield_of_the_avatar.txt b/forge-gui/res/cardsfolder/s/shield_of_the_avatar.txt
index 38adf3b7507..be21f483b33 100644
--- a/forge-gui/res/cardsfolder/s/shield_of_the_avatar.txt
+++ b/forge-gui/res/cardsfolder/s/shield_of_the_avatar.txt
@@ -1,8 +1,8 @@
-Name:Shield of the Avatar
-ManaCost:1
-Types:Artifact Equipment
-K:Equip 2
-S:Mode$ PreventDamage | Target$ Creature.EquippedBy | Amount$ X | References$ X | Description$ If a source would deal damage to equipped creature, prevent X of that damage, where X is the number of creatures you control.
-SVar:X:Count$Valid Creature.YouCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/shield_of_the_avatar.jpg
-Oracle:If a source would deal damage to equipped creature, prevent X of that damage, where X is the number of creatures you control.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
+Name:Shield of the Avatar
+ManaCost:1
+Types:Artifact Equipment
+K:Equip 2
+S:Mode$ PreventDamage | Target$ Creature.EquippedBy | Amount$ X | References$ X | Description$ If a source would deal damage to equipped creature, prevent X of that damage, where X is the number of creatures you control.
+SVar:X:Count$Valid Creature.YouCtrl
+SVar:Picture:http://www.wizards.com/global/images/magic/general/shield_of_the_avatar.jpg
+Oracle:If a source would deal damage to equipped creature, prevent X of that damage, where X is the number of creatures you control.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/s/siege_dragon.txt b/forge-gui/res/cardsfolder/s/siege_dragon.txt
index fb85bd46c31..ca43e3ecf5e 100644
--- a/forge-gui/res/cardsfolder/s/siege_dragon.txt
+++ b/forge-gui/res/cardsfolder/s/siege_dragon.txt
@@ -1,11 +1,11 @@
-Name:Siege Dragon
-ManaCost:5 R R
-Types:Creature Dragon
-PT:5/5
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroyAll | TriggerDescription$ When CARDNAME enters the battlefield, destroy all Walls your opponents control.
-SVar:TrigDestroyAll:AB$ DestroyAll | Cost$ 0 | ValidCards$ Wall.OppCtrl
-T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDmg | IsPresent$ Wall.DefenderCtrl | PresentCompare$ EQ0 | TriggerDescription$ Whenever CARDNAME attacks, if defending player controls no Walls, it deals 2 damage to each creature without flying that player controls.
-SVar:TrigDmg:DB$ DamageAll | ValidCards$ Creature.withoutFlying+DefenderCtrl | NumDmg$ 2 | ValidDescription$ each creature without flying that player controls.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/siege_dragon.jpg
-Oracle:Flying\nWhen Siege Dragon enters the battlefield, destroy all Walls your opponents control.\nWhenever Siege Dragon attacks, if defending player controls no Walls, it deals 2 damage to each creature without flying that player controls.
+Name:Siege Dragon
+ManaCost:5 R R
+Types:Creature Dragon
+PT:5/5
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroyAll | TriggerDescription$ When CARDNAME enters the battlefield, destroy all Walls your opponents control.
+SVar:TrigDestroyAll:AB$ DestroyAll | Cost$ 0 | ValidCards$ Wall.OppCtrl
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDmg | IsPresent$ Wall.DefenderCtrl | PresentCompare$ EQ0 | TriggerDescription$ Whenever CARDNAME attacks, if defending player controls no Walls, it deals 2 damage to each creature without flying that player controls.
+SVar:TrigDmg:DB$ DamageAll | ValidCards$ Creature.withoutFlying+DefenderCtrl | NumDmg$ 2 | ValidDescription$ each creature without flying that player controls.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/siege_dragon.jpg
+Oracle:Flying\nWhen Siege Dragon enters the battlefield, destroy all Walls your opponents control.\nWhenever Siege Dragon attacks, if defending player controls no Walls, it deals 2 damage to each creature without flying that player controls.
diff --git a/forge-gui/res/cardsfolder/s/sliver_hive.txt b/forge-gui/res/cardsfolder/s/sliver_hive.txt
index c7655885e38..731914c3a5e 100644
--- a/forge-gui/res/cardsfolder/s/sliver_hive.txt
+++ b/forge-gui/res/cardsfolder/s/sliver_hive.txt
@@ -1,9 +1,9 @@
-Name:Sliver Hive
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add {1} to your mana pool.
-A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Card.Sliver | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast a Sliver spell.
-A:AB$ Token | Cost$ 5 T | IsPresent$ Sliver.YouCtrl | TokenAmount$ 1 | TokenName$ Sliver | TokenTypes$ Creature,Sliver | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 colorless Sliver creature token onto the battlefield. Activate this ability only if you control a Sliver.
-SVar:BuffedBy:Sliver
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sliver_hive.jpg
-Oracle:{T}: Add {1} to your mana pool.\n{T}: Add one mana of any color to your mana pool. Spend this mana only to cast a Sliver spell.\n{5}, {T}: Put a 1/1 colorless Sliver creature token onto the battlefield. Activate this ability only if you control a Sliver.
+Name:Sliver Hive
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add {1} to your mana pool.
+A:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | RestrictValid$ Card.Sliver | SpellDescription$ Add one mana of any color to your mana pool. Spend this mana only to cast a Sliver spell.
+A:AB$ Token | Cost$ 5 T | IsPresent$ Sliver.YouCtrl | TokenAmount$ 1 | TokenName$ Sliver | TokenTypes$ Creature,Sliver | TokenOwner$ You | TokenColors$ Colorless | TokenPower$ 1 | TokenToughness$ 1 | SpellDescription$ Put a 1/1 colorless Sliver creature token onto the battlefield. Activate this ability only if you control a Sliver.
+SVar:BuffedBy:Sliver
+SVar:Picture:http://www.wizards.com/global/images/magic/general/sliver_hive.jpg
+Oracle:{T}: Add {1} to your mana pool.\n{T}: Add one mana of any color to your mana pool. Spend this mana only to cast a Sliver spell.\n{5}, {T}: Put a 1/1 colorless Sliver creature token onto the battlefield. Activate this ability only if you control a Sliver.
diff --git a/forge-gui/res/cardsfolder/s/sliver_hivelord.txt b/forge-gui/res/cardsfolder/s/sliver_hivelord.txt
index 8972d220746..c0d3fbb5ecd 100644
--- a/forge-gui/res/cardsfolder/s/sliver_hivelord.txt
+++ b/forge-gui/res/cardsfolder/s/sliver_hivelord.txt
@@ -1,9 +1,9 @@
-Name:Sliver Hivelord
-ManaCost:W U B R G
-Types:Legendary Creature Sliver
-PT:5/5
-S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddKeyword$ Indestructible | Description$ Sliver creatures you control have indestructible.
-SVar:PlayMain1:TRUE
-SVar:BuffedBy:Sliver
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sliver_hivelord.jpg
-Oracle:Sliver creatures you control have indestructible. (Damage and effects that say "destroy" don't destroy them.)
+Name:Sliver Hivelord
+ManaCost:W U B R G
+Types:Legendary Creature Sliver
+PT:5/5
+S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddKeyword$ Indestructible | Description$ Sliver creatures you control have indestructible.
+SVar:PlayMain1:TRUE
+SVar:BuffedBy:Sliver
+SVar:Picture:http://www.wizards.com/global/images/magic/general/sliver_hivelord.jpg
+Oracle:Sliver creatures you control have indestructible. (Damage and effects that say "destroy" don't destroy them.)
diff --git a/forge-gui/res/cardsfolder/s/soul_of_innistrad.txt b/forge-gui/res/cardsfolder/s/soul_of_innistrad.txt
index f8fce3f635d..27f94a8f198 100644
--- a/forge-gui/res/cardsfolder/s/soul_of_innistrad.txt
+++ b/forge-gui/res/cardsfolder/s/soul_of_innistrad.txt
@@ -1,9 +1,9 @@
-Name:Soul of Innistrad
-ManaCost:4 B B
-Types:Creature Avatar
-PT:6/6
-K:Deathtouch
-A:AB$ ChangeZone | Cost$ 3 B B | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 3 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SpellDescription$ Return up to three target creature cards from your graveyard to your hand.
-A:AB$ ChangeZone | Cost$ 3 B B ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 3 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SpellDescription$ Return up to three target creature cards from your graveyard to your hand.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_innistrad.jpg
-Oracle:Deathtouch\n{3}{B}{B}: Return up to three target creature cards from your graveyard to your hand.\n{3}{B}{B}, Exile Soul of Innistrad from your graveyard: Return up to three target creature cards from your graveyard to your hand.
+Name:Soul of Innistrad
+ManaCost:4 B B
+Types:Creature Avatar
+PT:6/6
+K:Deathtouch
+A:AB$ ChangeZone | Cost$ 3 B B | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 3 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SpellDescription$ Return up to three target creature cards from your graveyard to your hand.
+A:AB$ ChangeZone | Cost$ 3 B B ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 3 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SpellDescription$ Return up to three target creature cards from your graveyard to your hand.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_innistrad.jpg
+Oracle:Deathtouch\n{3}{B}{B}: Return up to three target creature cards from your graveyard to your hand.\n{3}{B}{B}, Exile Soul of Innistrad from your graveyard: Return up to three target creature cards from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/s/soul_of_new_phyrexia.txt b/forge-gui/res/cardsfolder/s/soul_of_new_phyrexia.txt
index 6934031f478..38119a00bd2 100644
--- a/forge-gui/res/cardsfolder/s/soul_of_new_phyrexia.txt
+++ b/forge-gui/res/cardsfolder/s/soul_of_new_phyrexia.txt
@@ -1,9 +1,9 @@
-Name:Soul of New Phyrexia
-ManaCost:6
-Types:Creature Avatar
-PT:6/6
-K:Trample
-A:AB$ PumpAll | Cost$ 5 | ValidCards$ Permanent.YouCtrl | KW$ Indestructible | SpellDescription$ Permanents you control gain indestructible until end of turn.
-A:AB$ PumpAll | Cost$ 5 ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | ValidCards$ Permanent.YouCtrl | KW$ Indestructible | SpellDescription$ Permanents you control gain indestructible until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_new_phyrexia.jpg
-Oracle:Trample\n{5}: Permanents you control gain indestructible until end of turn.\n{5}, Exile Soul of New Phyrexia from your graveyard: Permanents you control gain indestructible until end of turn.
+Name:Soul of New Phyrexia
+ManaCost:6
+Types:Creature Avatar
+PT:6/6
+K:Trample
+A:AB$ PumpAll | Cost$ 5 | ValidCards$ Permanent.YouCtrl | KW$ Indestructible | SpellDescription$ Permanents you control gain indestructible until end of turn.
+A:AB$ PumpAll | Cost$ 5 ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | ValidCards$ Permanent.YouCtrl | KW$ Indestructible | SpellDescription$ Permanents you control gain indestructible until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_new_phyrexia.jpg
+Oracle:Trample\n{5}: Permanents you control gain indestructible until end of turn.\n{5}, Exile Soul of New Phyrexia from your graveyard: Permanents you control gain indestructible until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/soul_of_ravnica.txt b/forge-gui/res/cardsfolder/s/soul_of_ravnica.txt
index 11c47861830..228c2070225 100644
--- a/forge-gui/res/cardsfolder/s/soul_of_ravnica.txt
+++ b/forge-gui/res/cardsfolder/s/soul_of_ravnica.txt
@@ -1,13 +1,13 @@
-Name:Soul of Ravnica
-ManaCost:4 U U
-Types:Creature Avatar
-PT:6/6
-K:Flying
-A:AB$ Draw | Cost$ 5 U U | NumCards$ 1 | ConditionPresent$ Permanent.Blue+YouCtrl | ConditionCompare$ GE1 | SubAbility$ DrawB | SpellDescription$ Draw a card for each color among permanents you control.
-SVar:DrawB:DB$ Draw | NumCards$ 1 | ConditionPresent$ Permanent.Black+YouCtrl | ConditionCompare$ GE1 | SubAbility$ DrawR
-SVar:DrawR:DB$ Draw | NumCards$ 1 | ConditionPresent$ Permanent.Red+YouCtrl | ConditionCompare$ GE1 | SubAbility$ DrawG
-SVar:DrawG:DB$ Draw | NumCards$ 1 | ConditionPresent$ Permanent.Green+YouCtrl | ConditionCompare$ GE1 | SubAbility$ DrawW
-SVar:DrawW:DB$ Draw | NumCards$ 1 | ConditionPresent$ Permanent.White+YouCtrl | ConditionCompare$ GE1
-A:AB$ Draw | Cost$ 5 U U ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | NumCards$ 1 | ConditionPresent$ Permanent.Blue+YouCtrl | ConditionCompare$ GE1 | SubAbility$ DrawB | SpellDescription$ Draw a card for each color among permanents you control.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_ravnica.jpg
-Oracle:Flying\n{5}{U}{U}: Draw a card for each color among permanents you control.\n{5}{U}{U}, Exile Soul of Ravnica from your graveyard: Draw a card for each color among permanents you control.
+Name:Soul of Ravnica
+ManaCost:4 U U
+Types:Creature Avatar
+PT:6/6
+K:Flying
+A:AB$ Draw | Cost$ 5 U U | NumCards$ 1 | ConditionPresent$ Permanent.Blue+YouCtrl | ConditionCompare$ GE1 | SubAbility$ DrawB | SpellDescription$ Draw a card for each color among permanents you control.
+SVar:DrawB:DB$ Draw | NumCards$ 1 | ConditionPresent$ Permanent.Black+YouCtrl | ConditionCompare$ GE1 | SubAbility$ DrawR
+SVar:DrawR:DB$ Draw | NumCards$ 1 | ConditionPresent$ Permanent.Red+YouCtrl | ConditionCompare$ GE1 | SubAbility$ DrawG
+SVar:DrawG:DB$ Draw | NumCards$ 1 | ConditionPresent$ Permanent.Green+YouCtrl | ConditionCompare$ GE1 | SubAbility$ DrawW
+SVar:DrawW:DB$ Draw | NumCards$ 1 | ConditionPresent$ Permanent.White+YouCtrl | ConditionCompare$ GE1
+A:AB$ Draw | Cost$ 5 U U ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | NumCards$ 1 | ConditionPresent$ Permanent.Blue+YouCtrl | ConditionCompare$ GE1 | SubAbility$ DrawB | SpellDescription$ Draw a card for each color among permanents you control.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_ravnica.jpg
+Oracle:Flying\n{5}{U}{U}: Draw a card for each color among permanents you control.\n{5}{U}{U}, Exile Soul of Ravnica from your graveyard: Draw a card for each color among permanents you control.
diff --git a/forge-gui/res/cardsfolder/s/soul_of_shandalar.txt b/forge-gui/res/cardsfolder/s/soul_of_shandalar.txt
index c04bdb6d9be..b3a0ebf8c0f 100644
--- a/forge-gui/res/cardsfolder/s/soul_of_shandalar.txt
+++ b/forge-gui/res/cardsfolder/s/soul_of_shandalar.txt
@@ -1,10 +1,10 @@
-Name:Soul of Shandalar
-ManaCost:4 R R
-Types:Creature Avatar
-PT:6/6
-K:First Strike
-A:AB$ DealDamage | Cost$ 3 R R | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 3 damage to target player and 3 damage to up to one target creature that player controls.
-SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.TargetedPlayerCtrl | TgtPrompt$ Select target creature that player controls | TargetMin$ 0 | TargetMax$ 1 | NumDmg$ 3
-A:AB$ DealDamage | Cost$ 3 R R ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 3 damage to target player and 3 damage to up to one target creature that player controls.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_shandalar.jpg
-Oracle:First strike\n{3}{R}{R}: Soul of Shandalar deals 3 damage to target player and 3 damage to up to one target creature that player controls.\n{3}{R}{R}, Exile Soul of Shandalar from your graveyard: Soul of Shandalar deals 3 damage to target player and 3 damage to up to one target creature that player controls.
+Name:Soul of Shandalar
+ManaCost:4 R R
+Types:Creature Avatar
+PT:6/6
+K:First Strike
+A:AB$ DealDamage | Cost$ 3 R R | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 3 damage to target player and 3 damage to up to one target creature that player controls.
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.TargetedPlayerCtrl | TgtPrompt$ Select target creature that player controls | TargetMin$ 0 | TargetMax$ 1 | NumDmg$ 3
+A:AB$ DealDamage | Cost$ 3 R R ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 3 damage to target player and 3 damage to up to one target creature that player controls.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_shandalar.jpg
+Oracle:First strike\n{3}{R}{R}: Soul of Shandalar deals 3 damage to target player and 3 damage to up to one target creature that player controls.\n{3}{R}{R}, Exile Soul of Shandalar from your graveyard: Soul of Shandalar deals 3 damage to target player and 3 damage to up to one target creature that player controls.
diff --git a/forge-gui/res/cardsfolder/s/soul_of_theros.txt b/forge-gui/res/cardsfolder/s/soul_of_theros.txt
index 91da917bd43..d0e9babcab8 100644
--- a/forge-gui/res/cardsfolder/s/soul_of_theros.txt
+++ b/forge-gui/res/cardsfolder/s/soul_of_theros.txt
@@ -1,9 +1,9 @@
-Name:Soul of Theros
-ManaCost:4 W W
-Types:Creature Avatar
-PT:6/6
-K:Vigilance
-A:AB$ PumpAll | Cost$ 4 W W | ValidCards$ Creature.YouCtrl | KW$ First Strike & Lifelink | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Creatures you control get +2/+2 and gain first strike and lifelink until end of turn.
-A:AB$ PumpAll | Cost$ 4 W W ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | ValidCards$ Creature.YouCtrl | KW$ First Strike & Lifelink | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Creatures you control get +2/+2 and gain first strike and lifelink until end of turn.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_theros.jpg
-Oracle:Vigilance\n{4}{W}{W}: Creatures you control get +2/+2 and gain first strike and lifelink until end of turn.\n{4}{W}{W}, Exile Soul of Theros from your graveyard: Creatures you control get +2/+2 and gain first strike and lifelink until end of turn.
+Name:Soul of Theros
+ManaCost:4 W W
+Types:Creature Avatar
+PT:6/6
+K:Vigilance
+A:AB$ PumpAll | Cost$ 4 W W | ValidCards$ Creature.YouCtrl | KW$ First Strike & Lifelink | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Creatures you control get +2/+2 and gain first strike and lifelink until end of turn.
+A:AB$ PumpAll | Cost$ 4 W W ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | ValidCards$ Creature.YouCtrl | KW$ First Strike & Lifelink | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Creatures you control get +2/+2 and gain first strike and lifelink until end of turn.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_theros.jpg
+Oracle:Vigilance\n{4}{W}{W}: Creatures you control get +2/+2 and gain first strike and lifelink until end of turn.\n{4}{W}{W}, Exile Soul of Theros from your graveyard: Creatures you control get +2/+2 and gain first strike and lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/soul_of_zendikar.txt b/forge-gui/res/cardsfolder/s/soul_of_zendikar.txt
index 6acaee5016b..6d369826699 100644
--- a/forge-gui/res/cardsfolder/s/soul_of_zendikar.txt
+++ b/forge-gui/res/cardsfolder/s/soul_of_zendikar.txt
@@ -1,9 +1,9 @@
-Name:Soul of Zendikar
-ManaCost:4 G G
-Types:Creature Avatar
-PT:6/6
-K:Reach
-A:AB$ Token | Cost$ 3 G G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Beast creature token onto the battlefield.
-A:AB$ Token | Cost$ 3 G G ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3| TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Beast creature token onto the battlefield.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_zendikar.jpg
-Oracle:Reach\n{3}{G}{G}: Put a 3/3 green Beast creature token onto the battlefield.\n{3}{G}{G}, Exile Soul of Zendikar from your graveyard: Put a 3/3 green Beast creature token onto the battlefield.
+Name:Soul of Zendikar
+ManaCost:4 G G
+Types:Creature Avatar
+PT:6/6
+K:Reach
+A:AB$ Token | Cost$ 3 G G | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Beast creature token onto the battlefield.
+A:AB$ Token | Cost$ 3 G G ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3| TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Beast creature token onto the battlefield.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/soul_of_zendikar.jpg
+Oracle:Reach\n{3}{G}{G}: Put a 3/3 green Beast creature token onto the battlefield.\n{3}{G}{G}, Exile Soul of Zendikar from your graveyard: Put a 3/3 green Beast creature token onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/s/spirit_bonds.txt b/forge-gui/res/cardsfolder/s/spirit_bonds.txt
index 45f314e12bc..b002db93aa2 100644
--- a/forge-gui/res/cardsfolder/s/spirit_bonds.txt
+++ b/forge-gui/res/cardsfolder/s/spirit_bonds.txt
@@ -1,9 +1,9 @@
-Name:Spirit Bonds
-ManaCost:1 W
-Types:Enchantment
-T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature enters the battlefield under your control, you may pay {W}. If you do, put a 1/1 white Spirit creature token with flying onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ W | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
-A:AB$ Pump | Cost$ 1 W Sac<1/Spirit> | ValidTgts$ Creature.nonSpirit+YouCtrl | TgtPrompt$ Select target non-Spirit creature you control  | KW$ Indestructible | SpellDescription$ Target non-Spirit creature you control gains indestructible until end of turn.
-SVar:BuffedBy:Creature
-SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_bonds.jpg
-Oracle:Whenever a nontoken creature enters the battlefield under your control, you may pay {W}. If you do, put a 1/1 white Spirit creature token with flying onto the battlefield.\n{1}{W}, Sacrifice a Spirit: Target non-Spirit creature gains indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.)
+Name:Spirit Bonds
+ManaCost:1 W
+Types:Enchantment
+T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+YouCtrl | Origin$ Any | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature enters the battlefield under your control, you may pay {W}. If you do, put a 1/1 white Spirit creature token with flying onto the battlefield.
+SVar:TrigToken:AB$ Token | Cost$ W | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
+A:AB$ Pump | Cost$ 1 W Sac<1/Spirit> | ValidTgts$ Creature.nonSpirit+YouCtrl | TgtPrompt$ Select target non-Spirit creature you control  | KW$ Indestructible | SpellDescription$ Target non-Spirit creature you control gains indestructible until end of turn.
+SVar:BuffedBy:Creature
+SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_bonds.jpg
+Oracle:Whenever a nontoken creature enters the battlefield under your control, you may pay {W}. If you do, put a 1/1 white Spirit creature token with flying onto the battlefield.\n{1}{W}, Sacrifice a Spirit: Target non-Spirit creature gains indestructible until end of turn. (Damage and effects that say "destroy" don't destroy it.)
diff --git a/forge-gui/res/cardsfolder/s/stain_the_mind.txt b/forge-gui/res/cardsfolder/s/stain_the_mind.txt
index 96671c0cca4..5c7da07e5d9 100644
--- a/forge-gui/res/cardsfolder/s/stain_the_mind.txt
+++ b/forge-gui/res/cardsfolder/s/stain_the_mind.txt
@@ -1,14 +1,14 @@
-Name:Stain the Mind
-ManaCost:4 B
-Types:Sorcery
-K:Convoke
-A:SP$ NameCard | Cost$ 4 B | Defined$ You | ValidCards$ Card.nonLand | ValidDesc$ nonland | SubAbility$ ExileYard | SpellDescription$ Name a nonland card. Search target player's graveyard, hand, and library for any number of card's with that name and exile them. Then that player shuffles his or her library.
-SVar:ExileYard:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Player | TgtPrompt$ Select target player | ChangeType$ Card.NamedCard | Chooser$ You | ChangeNum$ NumInYard | Hidden$ True | SubAbility$ ExileHand | StackDescription$ Name a nonland card. Search target player's graveyard, hand, and library for any number of cards with that name and exile them. Then that player shuffles his or her library.
-SVar:ExileHand:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | DefinedPlayer$ Targeted | ChangeType$ Card.NamedCard | ChangeNum$ NumInHand | Chooser$ You | SubAbility$ ExileLib | StackDescription$ None
-SVar:ExileLib:DB$ ChangeZone | Origin$ Library | Destination$ Exile | DefinedPlayer$ Targeted | ChangeType$ Card.NamedCard | ChangeNum$ NumInLib | Chooser$ You | Shuffle$ True | StackDescription$ None
-SVar:NumInLib:TargetedPlayer$CardsInLibrary
-SVar:NumInHand:TargetedPlayer$CardsInHand
-SVar:NumInYard:TargetedPlayer$CardsInGraveyard
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/stain_the_mind.jpg
-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.)\nName a nonland card. Search target player's graveyard, hand, and library for any number of cards with that name and exile them. Then that player shuffles his or her library.
+Name:Stain the Mind
+ManaCost:4 B
+Types:Sorcery
+K:Convoke
+A:SP$ NameCard | Cost$ 4 B | Defined$ You | ValidCards$ Card.nonLand | ValidDesc$ nonland | SubAbility$ ExileYard | SpellDescription$ Name a nonland card. Search target player's graveyard, hand, and library for any number of card's with that name and exile them. Then that player shuffles his or her library.
+SVar:ExileYard:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Player | TgtPrompt$ Select target player | ChangeType$ Card.NamedCard | Chooser$ You | ChangeNum$ NumInYard | Hidden$ True | SubAbility$ ExileHand | StackDescription$ Name a nonland card. Search target player's graveyard, hand, and library for any number of cards with that name and exile them. Then that player shuffles his or her library.
+SVar:ExileHand:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | DefinedPlayer$ Targeted | ChangeType$ Card.NamedCard | ChangeNum$ NumInHand | Chooser$ You | SubAbility$ ExileLib | StackDescription$ None
+SVar:ExileLib:DB$ ChangeZone | Origin$ Library | Destination$ Exile | DefinedPlayer$ Targeted | ChangeType$ Card.NamedCard | ChangeNum$ NumInLib | Chooser$ You | Shuffle$ True | StackDescription$ None
+SVar:NumInLib:TargetedPlayer$CardsInLibrary
+SVar:NumInHand:TargetedPlayer$CardsInHand
+SVar:NumInYard:TargetedPlayer$CardsInGraveyard
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/stain_the_mind.jpg
+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.)\nName a nonland card. Search target player's graveyard, hand, and library for any number of cards with that name and exile them. Then that player shuffles his or her library.
diff --git a/forge-gui/res/cardsfolder/s/statute_of_denial.txt b/forge-gui/res/cardsfolder/s/statute_of_denial.txt
index 11debf8edbf..85e7b808a99 100644
--- a/forge-gui/res/cardsfolder/s/statute_of_denial.txt
+++ b/forge-gui/res/cardsfolder/s/statute_of_denial.txt
@@ -1,8 +1,8 @@
-Name:Statute of Denial
-ManaCost:2 U U
-Types:Instant
-A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ DBDraw | SpellDescription$ Counter target spell. If you control a blue creature, draw a card, then discard a card.
-SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionPresent$ Creature.Blue+YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a blue creature, | SubAbility$ DBDiscard
-SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | ConditionPresent$ Creature.Blue+YouCtrl | ConditionCompare$ GE1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/statute_of_denial.jpg
-Oracle:Counter target spell. If you control a blue creature, draw a card, then discard a card.
+Name:Statute of Denial
+ManaCost:2 U U
+Types:Instant
+A:SP$ Counter | Cost$ 2 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ DBDraw | SpellDescription$ Counter target spell. If you control a blue creature, draw a card, then discard a card.
+SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionPresent$ Creature.Blue+YouCtrl | ConditionCompare$ GE1 | ConditionDescription$ If you control a blue creature, | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose | ConditionPresent$ Creature.Blue+YouCtrl | ConditionCompare$ GE1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/statute_of_denial.jpg
+Oracle:Counter target spell. If you control a blue creature, draw a card, then discard a card.
diff --git a/forge-gui/res/cardsfolder/s/stoke_the_flames.txt b/forge-gui/res/cardsfolder/s/stoke_the_flames.txt
index ca17bfab08c..6d20b9c26bf 100644
--- a/forge-gui/res/cardsfolder/s/stoke_the_flames.txt
+++ b/forge-gui/res/cardsfolder/s/stoke_the_flames.txt
@@ -1,7 +1,7 @@
-Name:Stoke the Flames
-ManaCost:2 R R
-Types:Instant
-K:Convoke
-A:SP$ DealDamage | Cost$ 2 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature or player.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/stoke_the_flames.jpg
-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.)\nStoke the Flames deals 4 damage to target creature or player.
+Name:Stoke the Flames
+ManaCost:2 R R
+Types:Instant
+K:Convoke
+A:SP$ DealDamage | Cost$ 2 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature or player.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/stoke_the_flames.jpg
+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.)\nStoke the Flames deals 4 damage to target creature or player.
diff --git a/forge-gui/res/cardsfolder/s/sunblade_elf.txt b/forge-gui/res/cardsfolder/s/sunblade_elf.txt
index 156ad4e857b..05fc454f6e1 100644
--- a/forge-gui/res/cardsfolder/s/sunblade_elf.txt
+++ b/forge-gui/res/cardsfolder/s/sunblade_elf.txt
@@ -1,11 +1,11 @@
-Name:Sunblade Elf
-ManaCost:G
-Types:Creature Elf Warrior
-PT:1/1
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | References$ X | Description$ CARDNAME gets +1/+1 as long as you control a Plains.
-SVar:X:Count$Valid Plains.YouCtrl
-A:AB$ PumpAll | Cost$ 4 W | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
-SVar:BuffedBy:Plains
-DeckNeeds:Color$White
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sunblade_elf.jpg
-Oracle:Sunblade Elf gets +1/+1 as long as you control a Plains.\n{4}{W}: Creatures you control get +1/+1 until end of turn.
+Name:Sunblade Elf
+ManaCost:G
+Types:Creature Elf Warrior
+PT:1/1
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE1 | References$ X | Description$ CARDNAME gets +1/+1 as long as you control a Plains.
+SVar:X:Count$Valid Plains.YouCtrl
+A:AB$ PumpAll | Cost$ 4 W | ValidCards$ Creature.YouCtrl | NumAtt$ 1 | NumDef$ 1 | SpellDescription$ Creatures you control get +1/+1 until end of turn.
+SVar:BuffedBy:Plains
+DeckNeeds:Color$White
+SVar:Picture:http://www.wizards.com/global/images/magic/general/sunblade_elf.jpg
+Oracle:Sunblade Elf gets +1/+1 as long as you control a Plains.\n{4}{W}: Creatures you control get +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/sungrace_pegasus.txt b/forge-gui/res/cardsfolder/s/sungrace_pegasus.txt
index 3f12a66eb9b..9b89b8df810 100644
--- a/forge-gui/res/cardsfolder/s/sungrace_pegasus.txt
+++ b/forge-gui/res/cardsfolder/s/sungrace_pegasus.txt
@@ -1,8 +1,8 @@
-Name:Sungrace Pegasus
-ManaCost:1 W
-Types:Creature Pegasus
-PT:1/2
-K:Flying
-K:Lifelink
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sungrace_pegasus.jpg
-Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nLifelink (Damage dealt by this creature also causes you to gain that much life.)
+Name:Sungrace Pegasus
+ManaCost:1 W
+Types:Creature Pegasus
+PT:1/2
+K:Flying
+K:Lifelink
+SVar:Picture:http://www.wizards.com/global/images/magic/general/sungrace_pegasus.jpg
+Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nLifelink (Damage dealt by this creature also causes you to gain that much life.)
diff --git a/forge-gui/res/cardsfolder/t/the_chain_veil.txt b/forge-gui/res/cardsfolder/t/the_chain_veil.txt
index acb649694e7..a4ce59910d6 100644
--- a/forge-gui/res/cardsfolder/t/the_chain_veil.txt
+++ b/forge-gui/res/cardsfolder/t/the_chain_veil.txt
@@ -1,11 +1,11 @@
-Name:The Chain Veil
-ManaCost:4
-Types:Legendary Artifact
-T:Mode$ Phase | Phase$ End of Turn | ActivateNoLoyaltyAbilitiesCondition$ True | ValidPlayer$ You | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$  At the beginning of your end step, if you didn't activate a loyalty ability of a planeswalker this turn, you lose 2 life.
-SVar:TrigLoseLife:AB$ LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 2
-A:AB$ Effect | Cost$ 4 T | StaticAbilities$ STPump | SpellDescription$ For each planeswalker you control, you may activate one of its loyalty abilities once this turn as though none of its loyalty abilities had been activated this turn.
-SVar:STPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Planeswalker.YouCtrl | AddHiddenKeyword$ May activate CARDNAME's loyalty abilities once | Description$ For each planeswalker you control, you may activate one of its loyalty abilities once this turn as though none of its loyalty abilities had been activated this turn.
-SVar:RemAIDeck:True
-SVar:RemRandomDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/the_chain_veil.jpg
-Oracle:At the beginning of your end step, if you didn't activate a loyalty ability of a planeswalker this turn, you lose 2 life.\n{4}, {T}: For each planeswalker you control, you may activate one of its loyalty abilities once this turn as though none of its loyalty abilities have been activated this turn.
+Name:The Chain Veil
+ManaCost:4
+Types:Legendary Artifact
+T:Mode$ Phase | Phase$ End of Turn | ActivateNoLoyaltyAbilitiesCondition$ True | ValidPlayer$ You | Execute$ TrigLoseLife | TriggerZones$ Battlefield | TriggerDescription$  At the beginning of your end step, if you didn't activate a loyalty ability of a planeswalker this turn, you lose 2 life.
+SVar:TrigLoseLife:AB$ LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 2
+A:AB$ Effect | Cost$ 4 T | StaticAbilities$ STPump | SpellDescription$ For each planeswalker you control, you may activate one of its loyalty abilities once this turn as though none of its loyalty abilities had been activated this turn.
+SVar:STPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Planeswalker.YouCtrl | AddHiddenKeyword$ May activate CARDNAME's loyalty abilities once | Description$ For each planeswalker you control, you may activate one of its loyalty abilities once this turn as though none of its loyalty abilities had been activated this turn.
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/the_chain_veil.jpg
+Oracle:At the beginning of your end step, if you didn't activate a loyalty ability of a planeswalker this turn, you lose 2 life.\n{4}, {T}: For each planeswalker you control, you may activate one of its loyalty abilities once this turn as though none of its loyalty abilities have been activated this turn.
diff --git a/forge-gui/res/cardsfolder/t/triplicate_spirits.txt b/forge-gui/res/cardsfolder/t/triplicate_spirits.txt
index 31f7baf92c6..46ea6c4febc 100644
--- a/forge-gui/res/cardsfolder/t/triplicate_spirits.txt
+++ b/forge-gui/res/cardsfolder/t/triplicate_spirits.txt
@@ -1,7 +1,7 @@
-Name:Triplicate Spirits
-ManaCost:4 W W
-Types:Sorcery
-K:Convoke
-A:SP$ Token | Cost$ 4 W W | TokenAmount$ 3 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Put three 1/1 white Spirit creature tokens with flying onto the battlefield.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/triplicate_spirits.jpg
-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.)\nPut three 1/1 white Spirit creature tokens with flying onto the battlefield. (They can't be blocked except by creatures with flying or reach.)
+Name:Triplicate Spirits
+ManaCost:4 W W
+Types:Sorcery
+K:Convoke
+A:SP$ Token | Cost$ 4 W W | TokenAmount$ 3 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SpellDescription$ Put three 1/1 white Spirit creature tokens with flying onto the battlefield.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/triplicate_spirits.jpg
+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.)\nPut three 1/1 white Spirit creature tokens with flying onto the battlefield. (They can't be blocked except by creatures with flying or reach.)
diff --git a/forge-gui/res/cardsfolder/t/tyrants_machine.txt b/forge-gui/res/cardsfolder/t/tyrants_machine.txt
index fd1ced0e8b1..a85f85b6647 100644
--- a/forge-gui/res/cardsfolder/t/tyrants_machine.txt
+++ b/forge-gui/res/cardsfolder/t/tyrants_machine.txt
@@ -1,6 +1,6 @@
-Name:Tyrant's Machine
-ManaCost:2
-Types:Artifact
-A:AB$ Tap | Cost$ 4 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/tyrants_machine.jpg
-Oracle:{4}, {T}: Tap target creature.
+Name:Tyrant's Machine
+ManaCost:2
+Types:Artifact
+A:AB$ Tap | Cost$ 4 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/tyrants_machine.jpg
+Oracle:{4}, {T}: Tap target creature.
diff --git a/forge-gui/res/cardsfolder/u/ulcerate.txt b/forge-gui/res/cardsfolder/u/ulcerate.txt
index 978a15deec4..c4231c9e36b 100644
--- a/forge-gui/res/cardsfolder/u/ulcerate.txt
+++ b/forge-gui/res/cardsfolder/u/ulcerate.txt
@@ -1,7 +1,7 @@
-Name:Ulcerate
-ManaCost:B
-Types:Instant
-A:SP$ Pump | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | NumDef$ -3 | IsCurse$ True | SubAbility$ DBLoseLife | SpellDescription$ Target creature gets -3/-3 until end of turn. You lose 3 life.
-SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 3
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ulcerate.jpg
-Oracle:Target creature gets -3/-3 until end of turn. You lose 3 life.
+Name:Ulcerate
+ManaCost:B
+Types:Instant
+A:SP$ Pump | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | NumDef$ -3 | IsCurse$ True | SubAbility$ DBLoseLife | SpellDescription$ Target creature gets -3/-3 until end of turn. You lose 3 life.
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 3
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ulcerate.jpg
+Oracle:Target creature gets -3/-3 until end of turn. You lose 3 life.
diff --git a/forge-gui/res/cardsfolder/u/undergrowth_scavenger.txt b/forge-gui/res/cardsfolder/u/undergrowth_scavenger.txt
index 9fa4d93945b..a195eb7f48d 100644
--- a/forge-gui/res/cardsfolder/u/undergrowth_scavenger.txt
+++ b/forge-gui/res/cardsfolder/u/undergrowth_scavenger.txt
@@ -1,9 +1,9 @@
-Name:Undergrowth Scavenger
-ManaCost:3 G
-Types:Creature Fungus Horror
-PT:0/0
-K:etbCounter:P1P1:Y:no Condition:CARDNAME enters the battlefield with a number of +1/+1 counters on it equal to the number of creature cards in all graveyards.
-SVar:Y:Count$ValidGraveyard Creature
-SVar:NeedsToPlayVar:Y GE4
-SVar:Picture:http://www.wizards.com/global/images/magic/general/undergrowth_scavenger.jpg
-Oracle:Undergrowth Scavenger enters the battlefield with a number of +1/+1 counters on it equal to the number of creature cards in all graveyards.
+Name:Undergrowth Scavenger
+ManaCost:3 G
+Types:Creature Fungus Horror
+PT:0/0
+K:etbCounter:P1P1:Y:no Condition:CARDNAME enters the battlefield with a number of +1/+1 counters on it equal to the number of creature cards in all graveyards.
+SVar:Y:Count$ValidGraveyard Creature
+SVar:NeedsToPlayVar:Y GE4
+SVar:Picture:http://www.wizards.com/global/images/magic/general/undergrowth_scavenger.jpg
+Oracle:Undergrowth Scavenger enters the battlefield with a number of +1/+1 counters on it equal to the number of creature cards in all graveyards.
diff --git a/forge-gui/res/cardsfolder/u/unmake_the_graves.txt b/forge-gui/res/cardsfolder/u/unmake_the_graves.txt
index d57019be9d1..90bc1ec610a 100644
--- a/forge-gui/res/cardsfolder/u/unmake_the_graves.txt
+++ b/forge-gui/res/cardsfolder/u/unmake_the_graves.txt
@@ -1,7 +1,7 @@
-Name:Unmake the Graves
-ManaCost:4 B
-Types:Instant
-K:Convoke
-A:SP$ ChangeZone | Cost$ 4 B | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return up to two target creature cards from your graveyard to your hand.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/unmake_the_graves.jpg
-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 up to two target creature cards from your graveyard to your hand.
+Name:Unmake the Graves
+ManaCost:4 B
+Types:Instant
+K:Convoke
+A:SP$ ChangeZone | Cost$ 4 B | Origin$ Graveyard | Destination$ Hand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | SpellDescription$ Return up to two target creature cards from your graveyard to your hand.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/unmake_the_graves.jpg
+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 up to two target creature cards from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/v/venom_sliver.txt b/forge-gui/res/cardsfolder/v/venom_sliver.txt
index 791e66165c9..90a9cf61046 100644
--- a/forge-gui/res/cardsfolder/v/venom_sliver.txt
+++ b/forge-gui/res/cardsfolder/v/venom_sliver.txt
@@ -1,8 +1,8 @@
-Name:Venom Sliver
-ManaCost:1 G
-Types:Creature Sliver
-PT:1/1
-S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddKeyword$ Deathtouch | Description$ Sliver creatures you control have deathtouch.
-SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/venom_sliver.jpg
-Oracle:Sliver creatures you control have deathtouch. (Any amount of damage a creature with deathtouch deals to a creature is enough to destroy it.)
+Name:Venom Sliver
+ManaCost:1 G
+Types:Creature Sliver
+PT:1/1
+S:Mode$ Continuous | Affected$ Creature.Sliver+YouCtrl | AddKeyword$ Deathtouch | Description$ Sliver creatures you control have deathtouch.
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/venom_sliver.jpg
+Oracle:Sliver creatures you control have deathtouch. (Any amount of damage a creature with deathtouch deals to a creature is enough to destroy it.)
diff --git a/forge-gui/res/cardsfolder/v/vineweft.txt b/forge-gui/res/cardsfolder/v/vineweft.txt
index 98656658b47..270d150edf7 100644
--- a/forge-gui/res/cardsfolder/v/vineweft.txt
+++ b/forge-gui/res/cardsfolder/v/vineweft.txt
@@ -1,9 +1,9 @@
-Name:Vineweft
-ManaCost:G
-Types:Enchantment Aura
-K:Enchant creature
-A:SP$ Attach | Cost$ G | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Enchanted creature gets +1/+1.
-A:AB$ ChangeZone | Cost$ 4 G | Origin$ Graveyard | Destination$ Hand | Defined$ Self | ActivationZone$ Graveyard | SpellDescription$ Return CARDNAME from your graveyard to your hand.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/vineweft.jpg
-Oracle:Enchant creature\nEnchanted creature gets +1/+1.\n{4}{G}: Return Vineweft from your graveyard to your hand.
+Name:Vineweft
+ManaCost:G
+Types:Enchantment Aura
+K:Enchant creature
+A:SP$ Attach | Cost$ G | ValidTgts$ Creature | AILogic$ Pump
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Enchanted creature gets +1/+1.
+A:AB$ ChangeZone | Cost$ 4 G | Origin$ Graveyard | Destination$ Hand | Defined$ Self | ActivationZone$ Graveyard | SpellDescription$ Return CARDNAME from your graveyard to your hand.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/vineweft.jpg
+Oracle:Enchant creature\nEnchanted creature gets +1/+1.\n{4}{G}: Return Vineweft from your graveyard to your hand.
diff --git a/forge-gui/res/cardsfolder/v/void_snare.txt b/forge-gui/res/cardsfolder/v/void_snare.txt
index 8f432b507e7..788442afff1 100644
--- a/forge-gui/res/cardsfolder/v/void_snare.txt
+++ b/forge-gui/res/cardsfolder/v/void_snare.txt
@@ -1,6 +1,6 @@
-Name:Void Snare
-ManaCost:U
-Types:Sorcery
-A:SP$ ChangeZone | Cost$ U | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target nonland permanent to its owner's hand.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/void_snare.jpg
-Oracle:Return target nonland permanent to its owner's hand.
+Name:Void Snare
+ManaCost:U
+Types:Sorcery
+A:SP$ ChangeZone | Cost$ U | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target nonland permanent to its owner's hand.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/void_snare.jpg
+Oracle:Return target nonland permanent to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/w/wall_of_limbs.txt b/forge-gui/res/cardsfolder/w/wall_of_limbs.txt
index 15cc847cbba..115801f4c18 100644
--- a/forge-gui/res/cardsfolder/w/wall_of_limbs.txt
+++ b/forge-gui/res/cardsfolder/w/wall_of_limbs.txt
@@ -1,13 +1,13 @@
-Name:Wall of Limbs
-ManaCost:2 B
-Types:Creature Zombie Wall
-PT:0/3
-K:Defender
-T:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you gain life, put a +1/+1 counter on CARDNAME.
-SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-A:AB$ LoseLife | Cost$ 5 B B Sac<1/CARDNAME> | LifeAmount$ X | References$ X | ValidTgts$ Player | TgtPrompt$ Select a player | SpellDescription$ Target player loses X life, where X is CARDNAME's power.
-SVar:X:Sacrificed$CardPower
-SVar:RemAIDeck:True
-SVar:RemRandomDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_limbs.jpg
-Oracle:Defender (This creature can't attack.)\nWhenever you gain life, put a +1/+1 counter on Wall of Limbs.\n{5}{B}{B}, Sacrifice Wall of Limbs: Target player loses X life, where X is Wall of Limbs's power.
+Name:Wall of Limbs
+ManaCost:2 B
+Types:Creature Zombie Wall
+PT:0/3
+K:Defender
+T:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you gain life, put a +1/+1 counter on CARDNAME.
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
+A:AB$ LoseLife | Cost$ 5 B B Sac<1/CARDNAME> | LifeAmount$ X | References$ X | ValidTgts$ Player | TgtPrompt$ Select a player | SpellDescription$ Target player loses X life, where X is CARDNAME's power.
+SVar:X:Sacrificed$CardPower
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/wall_of_limbs.jpg
+Oracle:Defender (This creature can't attack.)\nWhenever you gain life, put a +1/+1 counter on Wall of Limbs.\n{5}{B}{B}, Sacrifice Wall of Limbs: Target player loses X life, where X is Wall of Limbs's power.
diff --git a/forge-gui/res/cardsfolder/w/warden_of_the_beyond.txt b/forge-gui/res/cardsfolder/w/warden_of_the_beyond.txt
index 34e22fb18bd..d4fb37c79e5 100644
--- a/forge-gui/res/cardsfolder/w/warden_of_the_beyond.txt
+++ b/forge-gui/res/cardsfolder/w/warden_of_the_beyond.txt
@@ -1,9 +1,9 @@
-Name:Warden of the Beyond
-ManaCost:2 W
-Types:Creature Human Wizard
-PT:2/2
-K:Vigilance
-S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | CheckSVar$ X | SVarCompare$ GE1 | References$ X | Description$ CARDNAME gets +2/+2 as long as an opponent owns a card in exile.
-SVar:X:Count$ValidExile Card.OppCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/warden_of_the_beyond.jpg
-Oracle:Vigilance (Attacking doesn't cause this creature to tap.)\nWarden of the Beyond gets +2/+2 as long as an opponent owns a card in exile.
+Name:Warden of the Beyond
+ManaCost:2 W
+Types:Creature Human Wizard
+PT:2/2
+K:Vigilance
+S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | CheckSVar$ X | SVarCompare$ GE1 | References$ X | Description$ CARDNAME gets +2/+2 as long as an opponent owns a card in exile.
+SVar:X:Count$ValidExile Card.OppCtrl
+SVar:Picture:http://www.wizards.com/global/images/magic/general/warden_of_the_beyond.jpg
+Oracle:Vigilance (Attacking doesn't cause this creature to tap.)\nWarden of the Beyond gets +2/+2 as long as an opponent owns a card in exile.
diff --git a/forge-gui/res/cardsfolder/w/waste_not.txt b/forge-gui/res/cardsfolder/w/waste_not.txt
index b0ff15f72b1..fb677351af6 100644
--- a/forge-gui/res/cardsfolder/w/waste_not.txt
+++ b/forge-gui/res/cardsfolder/w/waste_not.txt
@@ -1,12 +1,12 @@
-Name:Waste Not
-ManaCost:1 B
-Types:Enchantment
-T:Mode$ Discarded | ValidCard$ Creature.OppOwn | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever an opponent discards a creature card, put a 2/2 black Zombie creature token onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2
-T:Mode$ Discarded | ValidCard$ Land.OppOwn | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ Whenever an opponent discards a land card, add {B}{B} to your mana pool.
-SVar:TrigMana:DB$ Mana | Produced$ B | Amount$ 2 | Defined$ You
-T:Mode$ Discarded | ValidCard$ Card.nonLand+nonCreature+OppOwn | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent discards a noncreature, nonland card, draw a card.
-SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
-SVar:RemRandomDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/waste_not.jpg
-Oracle:Whenever an opponent discards a creature card, put a 2/2 black Zombie creature token onto the battlefield.\nWhenever an opponent discards a land card, add {B}{B} to your mana pool.\nWhenever an opponent discards a noncreature, nonland card, draw a card.
+Name:Waste Not
+ManaCost:1 B
+Types:Enchantment
+T:Mode$ Discarded | ValidCard$ Creature.OppOwn | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever an opponent discards a creature card, put a 2/2 black Zombie creature token onto the battlefield.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2
+T:Mode$ Discarded | ValidCard$ Land.OppOwn | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ Whenever an opponent discards a land card, add {B}{B} to your mana pool.
+SVar:TrigMana:DB$ Mana | Produced$ B | Amount$ 2 | Defined$ You
+T:Mode$ Discarded | ValidCard$ Card.nonLand+nonCreature+OppOwn | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent discards a noncreature, nonland card, draw a card.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/waste_not.jpg
+Oracle:Whenever an opponent discards a creature card, put a 2/2 black Zombie creature token onto the battlefield.\nWhenever an opponent discards a land card, add {B}{B} to your mana pool.\nWhenever an opponent discards a noncreature, nonland card, draw a card.
diff --git a/forge-gui/res/cardsfolder/w/will_forged_golem.txt b/forge-gui/res/cardsfolder/w/will_forged_golem.txt
index 6642d504010..a638a863463 100644
--- a/forge-gui/res/cardsfolder/w/will_forged_golem.txt
+++ b/forge-gui/res/cardsfolder/w/will_forged_golem.txt
@@ -1,7 +1,7 @@
-Name:Will-Forged Golem
-ManaCost:6
-Types:Artifact Creature Golem
-PT:4/4
-K:Convoke
-SVar:Picture:http://www.wizards.com/global/images/magic/general/will_forged_golem.jpg
-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.)
+Name:Will-Forged Golem
+ManaCost:6
+Types:Artifact Creature Golem
+PT:4/4
+K:Convoke
+SVar:Picture:http://www.wizards.com/global/images/magic/general/will_forged_golem.jpg
+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.)
diff --git a/forge-gui/res/cardsfolder/w/witchs_familiar.txt b/forge-gui/res/cardsfolder/w/witchs_familiar.txt
index d3287bd2cf6..27fe511f980 100644
--- a/forge-gui/res/cardsfolder/w/witchs_familiar.txt
+++ b/forge-gui/res/cardsfolder/w/witchs_familiar.txt
@@ -1,6 +1,6 @@
-Name:Witch's Familiar
-ManaCost:2 B
-Types:Creature Frog
-PT:2/3
-SVar:Picture:http://www.wizards.com/global/images/magic/general/witchs_familiar.jpg
-Oracle:
+Name:Witch's Familiar
+ManaCost:2 B
+Types:Creature Frog
+PT:2/3
+SVar:Picture:http://www.wizards.com/global/images/magic/general/witchs_familiar.jpg
+Oracle:
diff --git a/forge-gui/res/cardsfolder/x/xathrid_slyblade.txt b/forge-gui/res/cardsfolder/x/xathrid_slyblade.txt
index 72d007f4b08..efe3bb05b94 100644
--- a/forge-gui/res/cardsfolder/x/xathrid_slyblade.txt
+++ b/forge-gui/res/cardsfolder/x/xathrid_slyblade.txt
@@ -1,10 +1,10 @@
-Name:Xathrid Slyblade
-ManaCost:2 B
-Types:Creature Human Assassin
-PT:2/1
-K:Hexproof
-A:AB$ Debuff | Cost$ 3 B | Defined$ Self | Keywords$ Hexproof | SubAbility$ DBPump | SpellDescription$ Until end of turn, CARDNAME loses hexproof and gains first strike and deathtouch.
-SVar:DBPump:DB$ Pump | KW$ First Strike & Deathtouch | Defined$ Self
-SVar:RemAIDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/xathrid_slyblade.jpg
-Oracle:Hexproof (This creature can't be the target of spells or abilities your opponents control.)\n{3}{B}: Until end of turn, Xathrid Slyblade loses hexproof and gains first strike and deathtouch. (It deals combat damage before creatures without first strike. Any amount of damage it deals to a creature is enough to destroy it.)
+Name:Xathrid Slyblade
+ManaCost:2 B
+Types:Creature Human Assassin
+PT:2/1
+K:Hexproof
+A:AB$ Debuff | Cost$ 3 B | Defined$ Self | Keywords$ Hexproof | SubAbility$ DBPump | SpellDescription$ Until end of turn, CARDNAME loses hexproof and gains first strike and deathtouch.
+SVar:DBPump:DB$ Pump | KW$ First Strike & Deathtouch | Defined$ Self
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/xathrid_slyblade.jpg
+Oracle:Hexproof (This creature can't be the target of spells or abilities your opponents control.)\n{3}{B}: Until end of turn, Xathrid Slyblade loses hexproof and gains first strike and deathtouch. (It deals combat damage before creatures without first strike. Any amount of damage it deals to a creature is enough to destroy it.)
diff --git a/forge-gui/res/cardsfolder/y/yisan_the_wanderer_bard.txt b/forge-gui/res/cardsfolder/y/yisan_the_wanderer_bard.txt
index d80d3fcc0e6..878d6735520 100644
--- a/forge-gui/res/cardsfolder/y/yisan_the_wanderer_bard.txt
+++ b/forge-gui/res/cardsfolder/y/yisan_the_wanderer_bard.txt
@@ -1,8 +1,8 @@
-Name:Yisan, the Wanderer Bard
-ManaCost:2 G
-Types:Legendary Creature Human Rogue
-PT:2/3
-A:AB$ ChangeZone | Cost$ 2 G T AddCounter<1/VERSE> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.cmcEQX | References$ X | ChangeNum$ 1 | StackDescription$ SpellDescription | SpellDescription$ Search your library for a creature card with converted mana cost equal to the number of verse counters on CARDNAME, put it onto the battlefield, then shuffle your library.
-SVar:X:Count$CardCounters.VERSE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/yisan_the_wanderer_bard.jpg
-Oracle:{2}{G}, {T}, Put a verse counter on Yisan, the Wanderer Bard: Search your library for a creature card with converted mana cost equal to the number of verse counters on Yisan, put it onto the battlefield, then shuffle your library.
+Name:Yisan, the Wanderer Bard
+ManaCost:2 G
+Types:Legendary Creature Human Rogue
+PT:2/3
+A:AB$ ChangeZone | Cost$ 2 G T AddCounter<1/VERSE> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.cmcEQX | References$ X | ChangeNum$ 1 | StackDescription$ SpellDescription | SpellDescription$ Search your library for a creature card with converted mana cost equal to the number of verse counters on CARDNAME, put it onto the battlefield, then shuffle your library.
+SVar:X:Count$CardCounters.VERSE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/yisan_the_wanderer_bard.jpg
+Oracle:{2}{G}, {T}, Put a verse counter on Yisan, the Wanderer Bard: Search your library for a creature card with converted mana cost equal to the number of verse counters on Yisan, put it onto the battlefield, then shuffle your library.