diff --git a/forge-gui/res/cardsfolder/h/higure_the_still_wind.txt b/forge-gui/res/cardsfolder/h/higure_the_still_wind.txt
index 476bcb931da..66fd07cc536 100644
--- a/forge-gui/res/cardsfolder/h/higure_the_still_wind.txt
+++ b/forge-gui/res/cardsfolder/h/higure_the_still_wind.txt
@@ -2,7 +2,7 @@ Name:Higure, the Still Wind
 ManaCost:3 U U
 Types:Legendary Creature Human Ninja
 PT:3/4
-A:AB$ ChangeZone | Cost$ 2 U U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 2 U U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (2 U U, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
+A:AB$ ChangeZone | Cost$ 2 U U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 2 U U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({2}{U}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigSearch | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may search your library for a Ninja card, reveal it, and put it into your hand. If you do, shuffle your library.
 SVar:TrigSearch:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Ninja | ChangeNum$ 1 | ShuffleNonMandatory$ True
 A:AB$ Pump | Cost$ 2 | ValidTgts$ Creature.Ninja | KW$ HIDDEN Unblockable | SpellDescription$ Target Ninja creature can't be blocked this turn. | TgtPrompt$ Select target Ninja creature
diff --git a/forge-gui/res/cardsfolder/i/ink_eyes_servant_of_oni.txt b/forge-gui/res/cardsfolder/i/ink_eyes_servant_of_oni.txt
index 630a27da8df..ba16565c1f5 100644
--- a/forge-gui/res/cardsfolder/i/ink_eyes_servant_of_oni.txt
+++ b/forge-gui/res/cardsfolder/i/ink_eyes_servant_of_oni.txt
@@ -2,7 +2,7 @@ Name:Ink-Eyes, Servant of Oni
 ManaCost:4 B B
 Types:Legendary Creature Rat Ninja
 PT:5/4
-A:AB$ ChangeZone | Cost$ 3 B B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 3 B B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (3 B B, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
+A:AB$ ChangeZone | Cost$ 3 B B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 3 B B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({3}{B}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigAnimate | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may put target creature card from that player's graveyard onto the battlefield under your control.
 SVar:TrigAnimate:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Choose target creature card in an opponent's graveyard | ValidTgts$ Creature.DefenderCtrl | SpellDescription$ Put target creature card from an opponent's graveyard onto the battlefield under your control.
 A:AB$ Regenerate | Cost$ 1 B | SpellDescription$ Regenerate CARDNAME.
diff --git a/forge-gui/res/cardsfolder/k/karametras_acolyte.txt b/forge-gui/res/cardsfolder/k/karametras_acolyte.txt
index 0205fb33a5b..fd9a9976d06 100644
--- a/forge-gui/res/cardsfolder/k/karametras_acolyte.txt
+++ b/forge-gui/res/cardsfolder/k/karametras_acolyte.txt
@@ -2,7 +2,7 @@ Name:Karametra's Acolyte
 ManaCost:3 G
 Types:Creature Human Druid
 PT:1/4
-A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add an amount of {G} to your mana pool equal to your devotion to green. (Each G in the mana costs of permanents you control counts towards your devotion to green.)
+A:AB$ Mana | Cost$ T | Produced$ G | Amount$ X | References$ X | SpellDescription$ Add an amount of {G} to your mana pool equal to your devotion to green. (Each {G} in the mana costs of permanents you control counts towards your devotion to green.)
 SVar:X:Count$Devotion.G
 SVar:Picture:http://www.wizards.com/global/images/magic/general/karametras_acolyte.jpg
 Oracle:{T}: Add an amount of {G} to your mana pool equal to your devotion to green. (Each {G} in the mana costs of permanents you control counts toward your devotion to green.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/n/nafs_asp.txt b/forge-gui/res/cardsfolder/n/nafs_asp.txt
index bf199c88042..54c09866f71 100644
--- a/forge-gui/res/cardsfolder/n/nafs_asp.txt
+++ b/forge-gui/res/cardsfolder/n/nafs_asp.txt
@@ -4,7 +4,7 @@ Types:Creature Snake
 PT:1/1
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ NafsEffect | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to a player, that player loses 1 life at the beginning of his or her next draw step unless he or she pays {1} before that draw step.
 SVar:NafsEffect:AB$ Effect | Cost$ 0 | Name$ Nafs Asp Effect | EffectOwner$ TriggeredTarget | Duration$ Permanent | Triggers$ DrawTrig | Abilities$ PayUp | SVars$ Bleed,ExileEffect
-SVar:DrawTrig:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | TriggerZones$ Command | Execute$ Bleed | TriggerDescription$ You lose 1 life at the beginning of your next draw step unless you pay 1 before that draw step.
+SVar:DrawTrig:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | TriggerZones$ Command | Execute$ Bleed | TriggerDescription$ You lose 1 life at the beginning of your next draw step unless you pay {1} before that draw step.
 SVar:Bleed:AB$ LoseLife | Cost$ 0 | Defined$ You | LifeAmount$ 1 | SubAbility$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:PayUp:AB$ ChangeZone | Cost$ 1 | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True | ActivationZone$ Command | AILogic$ Always | SpellDescription$ Pay 1 to remove this effect.
diff --git a/forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt b/forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt
index ee3e31f071a..66dbddc6f34 100644
--- a/forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt
+++ b/forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt
@@ -2,7 +2,7 @@ Name:Ninja of the Deep Hours
 ManaCost:3 U
 Types:Creature Human Ninja
 PT:2/2
-A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (1 U, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
+A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDraw | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME 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/ninja_of_the_deep_hours.jpg
diff --git a/forge-gui/res/cardsfolder/o/okiba_gang_shinobi.txt b/forge-gui/res/cardsfolder/o/okiba_gang_shinobi.txt
index d99cf7b4906..2213c0c738e 100644
--- a/forge-gui/res/cardsfolder/o/okiba_gang_shinobi.txt
+++ b/forge-gui/res/cardsfolder/o/okiba_gang_shinobi.txt
@@ -2,7 +2,7 @@ Name:Okiba-Gang Shinobi
 ManaCost:3 B B
 Types:Creature Rat Ninja
 PT:3/2
-A:AB$ ChangeZone | Cost$ 3 B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 3 B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (3 B, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
+A:AB$ ChangeZone | Cost$ 3 B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 3 B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({3}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDiscard | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards two cards.
 SVar:TrigDiscard:AB$ Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 2 | Mode$ TgtChoose
 SVar:Picture:http://www.wizards.com/global/images/magic/general/okiba_gang_shinobi.jpg
diff --git a/forge-gui/res/cardsfolder/s/sakashimas_student.txt b/forge-gui/res/cardsfolder/s/sakashimas_student.txt
index a3375b3e40d..0c5732bd8bb 100644
--- a/forge-gui/res/cardsfolder/s/sakashimas_student.txt
+++ b/forge-gui/res/cardsfolder/s/sakashimas_student.txt
@@ -2,7 +2,7 @@ Name:Sakashima's Student
 ManaCost:2 U U
 Types:Creature Human Ninja
 PT:0/0
-A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (1 U, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
+A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
 K:ETBReplacement:Copy:ChooseCreature:Optional
 SVar:ChooseCreature:DB$ ChooseCard | Cost$ 0 | Defined$ You | Amount$ 1 | Choices$ Creature.Other | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except it's still a Ninja in addition to its other creature types.
 SVar:DBCopy:DB$ Clone | Defined$ Remembered | AddTypes$ Ninja
diff --git a/forge-gui/res/cardsfolder/s/sedris_the_traitor_king.txt b/forge-gui/res/cardsfolder/s/sedris_the_traitor_king.txt
index 116013dcac3..1ac5ec712cb 100644
--- a/forge-gui/res/cardsfolder/s/sedris_the_traitor_king.txt
+++ b/forge-gui/res/cardsfolder/s/sedris_the_traitor_king.txt
@@ -2,8 +2,8 @@ Name:Sedris, the Traitor King
 ManaCost:3 U B R
 Types:Legendary Creature Zombie Warrior
 PT:5/5
-S:Mode$ Continuous | EffectZone$ Battlefield | AffectedZone$ Graveyard | Affected$ Creature.YouCtrl | AddAbility$ Unearth | AddSVar$ Unearthed & TrueDeath & Unavailable | Description$ Each creature card in your graveyard has unearth {2}{B}. (2 B: Return the card to the battlefield. The creature gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-SVar:Unearth:AB$ ChangeZone | Cost$ 2 B | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SorcerySpeed$ True | ActivationZone$ Graveyard | SubAbility$ Unearthed | PrecostDesc$ Unearth | CostDesc$ 2 B | StackDescription$ Unearth: Return CARDNAME to the battlefield. | SpellDescription$ (2 B: Return CARDNAME to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
+S:Mode$ Continuous | EffectZone$ Battlefield | AffectedZone$ Graveyard | Affected$ Creature.YouCtrl | AddAbility$ Unearth | AddSVar$ Unearthed & TrueDeath & Unavailable | Description$ Each creature card in your graveyard has unearth {2}{B}. ({2}{B}: Return the card to the battlefield. The creature gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
+SVar:Unearth:AB$ ChangeZone | Cost$ 2 B | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | SorcerySpeed$ True | ActivationZone$ Graveyard | SubAbility$ Unearthed | PrecostDesc$ Unearth | CostDesc$ 2 B | StackDescription$ Unearth: Return CARDNAME to the battlefield. | SpellDescription$ ({2}{B}: Return CARDNAME to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 SVar:Unearthed:DB$ Pump | Defined$ Self | KW$ Haste & HIDDEN If CARDNAME would leave the battlefield, exile it instead of putting it anywhere else. | Permanent$ True | SubAbility$ TrueDeath | StackDescription$ It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield.
 SVar:TrueDeath:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ Unavailable | TriggerDescription$ Exile CARDNAME at the beginning of the next end step.
 SVar:Unavailable:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile
diff --git a/forge-gui/res/cardsfolder/s/silent_blade_oni.txt b/forge-gui/res/cardsfolder/s/silent_blade_oni.txt
index b5e8cefa424..67129caeef8 100644
--- a/forge-gui/res/cardsfolder/s/silent_blade_oni.txt
+++ b/forge-gui/res/cardsfolder/s/silent_blade_oni.txt
@@ -2,7 +2,7 @@ Name:Silent-Blade Oni
 ManaCost:3 U U B B
 Types:Creature Demon Ninja
 PT:6/5
-A:AB$ ChangeZone | Cost$ 4 U B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 4 U B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (4 U B, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
+A:AB$ ChangeZone | Cost$ 4 U B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 4 U B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({4}{U}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigReveal | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, look at that player's hand. You may cast a nonland card in it without paying that card's mana cost.
 SVar:TrigReveal:DB$ RevealHand | Defined$ TriggeredTarget | SubAbility$ TrigPlay
 SVar:TrigPlay:DB$ Play | Valid$ Card.nonLand+DefenderCtrl | ValidZone$ Hand | WithoutManaCost$ True | Optional$ True
diff --git a/forge-gui/res/cardsfolder/t/throat_slitter.txt b/forge-gui/res/cardsfolder/t/throat_slitter.txt
index 1c2396d2af2..78d196049f3 100644
--- a/forge-gui/res/cardsfolder/t/throat_slitter.txt
+++ b/forge-gui/res/cardsfolder/t/throat_slitter.txt
@@ -2,7 +2,7 @@ Name:Throat Slitter
 ManaCost:4 B
 Types:Creature Rat Ninja
 PT:2/2
-A:AB$ ChangeZone | Cost$ 2 B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 2 B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (2 B, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
+A:AB$ ChangeZone | Cost$ 2 B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 2 B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({2}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDestroy | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, destroy target nonblack creature that player controls.
 SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | ValidTgts$ Creature.nonBlack+DefenderCtrl | TgtPrompt$ Select target nonblack creature defending player controls
 SVar:MustBeBlocked:True
diff --git a/forge-gui/res/cardsfolder/w/walker_of_secret_ways.txt b/forge-gui/res/cardsfolder/w/walker_of_secret_ways.txt
index 9737aa501d0..9a72523ded4 100644
--- a/forge-gui/res/cardsfolder/w/walker_of_secret_ways.txt
+++ b/forge-gui/res/cardsfolder/w/walker_of_secret_ways.txt
@@ -2,9 +2,9 @@ Name:Walker of Secret Ways
 ManaCost:2 U
 Types:Creature Human Ninja
 PT:1/2
-A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (1 U, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
+A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigReveal | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, look at that player's hand.
-SVar:TrigReveal:AB$ RevealHand | Cost$ 0 | Defined$ TriggeredTarget 
+SVar:TrigReveal:AB$ RevealHand | Cost$ 0 | Defined$ TriggeredTarget
 A:AB$ ChangeZone | Cost$ 1 U | ValidTgts$ Ninja.YouCtrl | TgtPrompt$ Select target Ninja you control | Origin$ Battlefield | Destination$ Hand | PlayerTurn$ True | SpellDescription$ Return target Ninja you control to its owner's hand. Activate this ability only during your turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/walker_of_secret_ways.jpg
 Oracle:Ninjutsu {1}{U} ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)\nWhenever Walker of Secret Ways deals combat damage to a player, look at that player's hand.\n{1}{U}: Return target Ninja you control to its owner's hand. Activate this ability only during your turn.
\ No newline at end of file