diff --git a/forge-gui/res/cardsfolder/a/abzan_ascendancy.txt b/forge-gui/res/cardsfolder/a/abzan_ascendancy.txt
index 53182de9933..21b93406981 100644
--- a/forge-gui/res/cardsfolder/a/abzan_ascendancy.txt
+++ b/forge-gui/res/cardsfolder/a/abzan_ascendancy.txt
@@ -1,11 +1,11 @@
-Name:Abzan Ascendancy
-ManaCost:W B G
-Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounters | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on each creature you control.
-SVar:TrigPutCounters:AB$ PutCounterAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying
-SVar:PlayMain1:TRUE
-SVar:NeedsToPlay:Creature.YouCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/abzan_ascendancy.jpg
-Oracle:When Abzan Ascendancy enters the battlefield, put a +1/+1 counter on each creature you control.\nWhenever a nontoken creature you control dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
+Name:Abzan Ascendancy
+ManaCost:W B G
+Types:Enchantment
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounters | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter on each creature you control.
+SVar:TrigPutCounters:AB$ PutCounterAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ w 1 1 spirit KTK | TokenKeywords$ Flying
+SVar:PlayMain1:TRUE
+SVar:NeedsToPlay:Creature.YouCtrl
+SVar:Picture:http://www.wizards.com/global/images/magic/general/abzan_ascendancy.jpg
+Oracle:When Abzan Ascendancy enters the battlefield, put a +1/+1 counter on each creature you control.\nWhenever a nontoken creature you control dies, put a 1/1 white Spirit creature token with flying onto the battlefield.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/hooded_hydra.txt b/forge-gui/res/cardsfolder/h/hooded_hydra.txt
index d43f5622ad5..aeba56eb068 100644
--- a/forge-gui/res/cardsfolder/h/hooded_hydra.txt
+++ b/forge-gui/res/cardsfolder/h/hooded_hydra.txt
@@ -1,14 +1,14 @@
-Name:Hooded Hydra
-ManaCost:X G G
-Types:Creature Snake Hydra
-PT:0/0
-K:etbCounter:P1P1:X
-SVar:X:Count$xPaid
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a 1/1 green Snake creature token onto the battlefield for each +1/+1 counter on it.
-SVar:TrigToken:DB$ Token | TokenAmount$ Y | TokenName$ Snake | TokenTypes$ Creature,Snake | TokenOwner$ TriggeredCardController | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | References$ Y
-SVar:Y:TriggeredCard$CardCounters.P1P1
-K:Morph:3 G G
-R:Event$ TurnFaceUp | ValidCard$ Card.Self | ReplaceWith$ AddCounters | ActiveZones$ Battlefield | Description$ As CARDNAME is turned face up, put five +1/+1 counters on it.
-SVar:AddCounters:DB$ PutCounter | Defined$ Self | CounterNum$ 5 | CounterType$ P1P1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hooded_hydra.jpg
-Oracle:Hooded Hydra enters the battlefield with X +1/+1 counters on it.\nWhen Hooded Hydra dies, put a 1/1 green Snake creature token onto the battlefield for each +1/+1 counter on it.\nMorph {3}{G}{G}\nAs Hooded Hydra is turned face up, put five +1/+1 counters on it.
+Name:Hooded Hydra
+ManaCost:X G G
+Types:Creature Snake Hydra
+PT:0/0
+K:etbCounter:P1P1:X
+SVar:X:Count$xPaid
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigToken | TriggerController$ TriggeredCardController | TriggerDescription$ When CARDNAME dies, put a 1/1 green Snake creature token onto the battlefield for each +1/+1 counter on it.
+SVar:TrigToken:DB$ Token | TokenAmount$ Y | TokenName$ Snake | TokenTypes$ Creature,Snake | TokenOwner$ TriggeredCardController | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ g 1 1 snake KTK | References$ Y
+SVar:Y:TriggeredCard$CardCounters.P1P1
+K:Morph:3 G G
+R:Event$ TurnFaceUp | ValidCard$ Card.Self | ReplaceWith$ AddCounters | ActiveZones$ Battlefield | Description$ As CARDNAME is turned face up, put five +1/+1 counters on it.
+SVar:AddCounters:DB$ PutCounter | Defined$ Self | CounterNum$ 5 | CounterType$ P1P1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hooded_hydra.jpg
+Oracle:Hooded Hydra enters the battlefield with X +1/+1 counters on it.\nWhen Hooded Hydra dies, put a 1/1 green Snake creature token onto the battlefield for each +1/+1 counter on it.\nMorph {3}{G}{G}\nAs Hooded Hydra is turned face up, put five +1/+1 counters on it.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/mardu_ascendancy.txt b/forge-gui/res/cardsfolder/m/mardu_ascendancy.txt
index ef1a5def5b8..22a3d919698 100644
--- a/forge-gui/res/cardsfolder/m/mardu_ascendancy.txt
+++ b/forge-gui/res/cardsfolder/m/mardu_ascendancy.txt
@@ -1,9 +1,9 @@
-Name:Mardu Ascendancy
-ManaCost:R W B
-Types:Enchantment
-T:Mode$ Attacks | ValidCard$ Creature.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control attacks, put a 1/1 red Goblin creature token onto the battlefield tapped and attacking.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenTapped$ True | TokenAttacking$ True
-A:AB$ PumpAll | Cost$ Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl | NumDef$ +3 | SpellDescription$ Creatures you control get +0/+3 until end of turn.
-SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mardu_ascendancy.jpg
-Oracle:Whenever a nontoken creature you control attacks, put a 1/1 red Goblin creature token onto the battlefield tapped and attacking.\nSacrifice Mardu Ascendancy: Creatures you control get +0/+3 until end of turn.
+Name:Mardu Ascendancy
+ManaCost:R W B
+Types:Enchantment
+T:Mode$ Attacks | ValidCard$ Creature.nonToken+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control attacks, put a 1/1 red Goblin creature token onto the battlefield tapped and attacking.
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Goblin | TokenTypes$ Creature,Goblin | TokenOwner$ You | TokenColors$ Red | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ r 1 1 goblin KTK | TokenTapped$ True | TokenAttacking$ True
+A:AB$ PumpAll | Cost$ Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl | NumDef$ +3 | SpellDescription$ Creatures you control get +0/+3 until end of turn.
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mardu_ascendancy.jpg
+Oracle:Whenever a nontoken creature you control attacks, put a 1/1 red Goblin creature token onto the battlefield tapped and attacking.\nSacrifice Mardu Ascendancy: Creatures you control get +0/+3 until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/r/rite_of_the_serpent.txt b/forge-gui/res/cardsfolder/r/rite_of_the_serpent.txt
index 2d728b67db5..0f7047824e9 100644
--- a/forge-gui/res/cardsfolder/r/rite_of_the_serpent.txt
+++ b/forge-gui/res/cardsfolder/r/rite_of_the_serpent.txt
@@ -1,9 +1,9 @@
-Name:Rite of the Serpent
-ManaCost:4 B B
-Types:Sorcery
-A:SP$ Destroy | Cost$ 4 B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberLKI$ True | SubAbility$ DBToken | SpellDescription$ Destroy target creature. If that creature had a +1/+1 counter on it, put a 1/1 green Snake creature token onto the battlefield.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Snake | TokenTypes$ Creature,Snake | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | ConditionCheckSVar$ X | References$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:RememberedLKI$Valid Creature.counters_GE1_P1P1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/rite_of_the_serpent.jpg
-Oracle:Destroy target creature. If that creature had a +1/+1 counter on it, put a 1/1 green Snake creature token onto the battlefield.
+Name:Rite of the Serpent
+ManaCost:4 B B
+Types:Sorcery
+A:SP$ Destroy | Cost$ 4 B B | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberLKI$ True | SubAbility$ DBToken | SpellDescription$ Destroy target creature. If that creature had a +1/+1 counter on it, put a 1/1 green Snake creature token onto the battlefield.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Snake | TokenTypes$ Creature,Snake | TokenOwner$ You | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ g 1 1 snake KTK | ConditionCheckSVar$ X | References$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:RememberedLKI$Valid Creature.counters_GE1_P1P1
+SVar:Picture:http://www.wizards.com/global/images/magic/general/rite_of_the_serpent.jpg
+Oracle:Destroy target creature. If that creature had a +1/+1 counter on it, put a 1/1 green Snake creature token onto the battlefield.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/sorin_solemn_visitor.txt b/forge-gui/res/cardsfolder/s/sorin_solemn_visitor.txt
index 5365c64f254..fd5a331c91c 100644
--- a/forge-gui/res/cardsfolder/s/sorin_solemn_visitor.txt
+++ b/forge-gui/res/cardsfolder/s/sorin_solemn_visitor.txt
@@ -1,12 +1,12 @@
-Name:Sorin, Solemn Visitor
-ManaCost:2 W B
-Types:Planeswalker Sorin
-Loyalty:4
-A:AB$ PumpAll | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | KW$ Lifelink | UntilYourNextTurn$ True | SpellDescription$ Until your next turn, creatures you control get +1/+0 and gain lifelink.
-A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenOwner$ You | TokenName$ Vampire | TokenColors$ Black | TokenTypes$ Creature,Vampire | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Flying | SpellDescription$ Put a 2/2 black Vampire creature token with flying onto the battlefield.
-A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Sorin, Solemn Visitor emblem | Triggers$ BOTTrig | SVars$ SorinSac | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of each opponent's upkeep, that player sacrifices a creature."
-SVar:BOTTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.Opponent | TriggerZones$ Command | Execute$ SorinSac | TriggerDescription$ At the beginning of each opponent's upkeep, that player sacrifices a creature.
-SVar:SorinSac:AB$ Sacrifice | Cost$ 0 | SacValid$ Creature | Defined$ TriggeredPlayer
-SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sorin_solemn_visitor.jpg
-Oracle:[+1] Until your next turn, creatures you control get +1/+0 and gain lifelink.\n[-2] Put a 2/2 black Vampire creature token with flying onto the battlefield.\n[-6] You get an emblem with "At the beginning of each opponent's upkeep, that player sacrifices a creature."
+Name:Sorin, Solemn Visitor
+ManaCost:2 W B
+Types:Planeswalker Sorin
+Loyalty:4
+A:AB$ PumpAll | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | KW$ Lifelink | UntilYourNextTurn$ True | SpellDescription$ Until your next turn, creatures you control get +1/+0 and gain lifelink.
+A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenImage$ b 2 2 vampire KTK | TokenOwner$ You | TokenName$ Vampire | TokenColors$ Black | TokenTypes$ Creature,Vampire | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Flying | SpellDescription$ Put a 2/2 black Vampire creature token with flying onto the battlefield.
+A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Sorin, Solemn Visitor emblem | Triggers$ BOTTrig | SVars$ SorinSac | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of each opponent's upkeep, that player sacrifices a creature."
+SVar:BOTTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.Opponent | TriggerZones$ Command | Execute$ SorinSac | TriggerDescription$ At the beginning of each opponent's upkeep, that player sacrifices a creature.
+SVar:SorinSac:AB$ Sacrifice | Cost$ 0 | SacValid$ Creature | Defined$ TriggeredPlayer
+SVar:PlayMain1:TRUE
+SVar:Picture:http://www.wizards.com/global/images/magic/general/sorin_solemn_visitor.jpg
+Oracle:[+1] Until your next turn, creatures you control get +1/+0 and gain lifelink.\n[-2] Put a 2/2 black Vampire creature token with flying onto the battlefield.\n[-6] You get an emblem with "At the beginning of each opponent's upkeep, that player sacrifices a creature."
\ No newline at end of file