diff --git a/forge-gui/res/cardsfolder/a/apocalypse_hydra.txt b/forge-gui/res/cardsfolder/a/apocalypse_hydra.txt
index 9dab86e7953..680348c1fc9 100644
--- a/forge-gui/res/cardsfolder/a/apocalypse_hydra.txt
+++ b/forge-gui/res/cardsfolder/a/apocalypse_hydra.txt
@@ -3,10 +3,10 @@ ManaCost:X R G
 Types:Creature Hydra
 PT:0/0
 K:etbCounter:P1P1:Y:no condition:CARDNAME enters the battlefield with X +1/+1 counters on it. If X is 5 or more, it enters the battlefield with an additional X +1/+1 counters on it.
-A:AB$ DealDamage | Cost$ 1 R SubCounter<1/P1P1> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
+A:AB$ DealDamage | Cost$ 1 R SubCounter<1/P1P1> | ValidTgts$ Creature, Player, Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target.
 # This xPaid doesn't do anything, it's just needed to make Cost work properly
 SVar:X:Count$xPaid
 SVar:Y:Count$Compare X LT5.X.Z
 SVar:Z:Count$xPaid/Twice
 SVar:Picture:http://www.wizards.com/global/images/magic/general/apocalypse_hydra.jpg
-Oracle:Apocalypse Hydra enters the battlefield with X +1/+1 counters on it. If X is 5 or more, it enters the battlefield with an additional X +1/+1 counters on it.\n{1}{R}, Remove a +1/+1 counter from Apocalypse Hydra: Apocalypse Hydra deals 1 damage to target creature or player.
+Oracle:Apocalypse Hydra enters the battlefield with X +1/+1 counters on it. If X is 5 or more, it enters the battlefield with an additional X +1/+1 counters on it.\n{1}{R}, Remove a +1/+1 counter from Apocalypse Hydra: Apocalypse Hydra deals 1 damage to any target.
diff --git a/forge-gui/res/cardsfolder/b/blaze.txt b/forge-gui/res/cardsfolder/b/blaze.txt
index 3a74605f514..956722c52c3 100644
--- a/forge-gui/res/cardsfolder/b/blaze.txt
+++ b/forge-gui/res/cardsfolder/b/blaze.txt
@@ -1,7 +1,7 @@
 Name:Blaze
 ManaCost:X R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals X damage to target creature or player.
+A:SP$ DealDamage | Cost$ X R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals X damage to any target.
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blaze.jpg
-Oracle:Blaze deals X damage to target creature or player.
+Oracle:Blaze deals X damage to any target.
diff --git a/forge-gui/res/cardsfolder/f/fill_with_fright.txt b/forge-gui/res/cardsfolder/f/fill_with_fright.txt
index d9bf11212d0..cd0f7ff8521 100644
--- a/forge-gui/res/cardsfolder/f/fill_with_fright.txt
+++ b/forge-gui/res/cardsfolder/f/fill_with_fright.txt
@@ -1,7 +1,7 @@
 Name:Fill with Fright
 ManaCost:3 B
 Types:Sorcery
-A:SP$ Discard | Cost$ 3 B | ValidTgts$ Player | TgtPrompt$ Select a player | Mode$ TgtChoose | NumCards$ 2 | SubAbility$ DBScry | SpellDescription$ Target player discards two cards. Scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
-SVar:DBScry:DB$Scry | ScryNum$ 2
+A:SP$ Discard | Cost$ 3 B | ValidTgts$ Player | TgtPrompt$ Select a player | Mode$ TgtChoose | NumCards$ 2 | SubAbility$ DBScry | SpellDescription$ Target player discards two cards.
+SVar:DBScry:DB$ Scry | ScryNum$ 2 | SpellDescription$ Scry 2.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fill_with_fright.jpg
-Oracle:Target player discards two cards. Scry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
+Oracle:Target player discards two cards.\nScry 2. (Look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.)
diff --git a/forge-gui/res/cardsfolder/f/flamewave_invoker.txt b/forge-gui/res/cardsfolder/f/flamewave_invoker.txt
index 28529f08d73..06c1e66a03a 100644
--- a/forge-gui/res/cardsfolder/f/flamewave_invoker.txt
+++ b/forge-gui/res/cardsfolder/f/flamewave_invoker.txt
@@ -2,6 +2,6 @@ Name:Flamewave Invoker
 ManaCost:2 R
 Types:Creature Goblin Mutant
 PT:2/2
-A:AB$ DealDamage | Cost$ 7 R | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target player.
+A:AB$ DealDamage | Cost$ 7 R | ValidTgts$ Player, Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target player or planeswalker.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flamewave_invoker.jpg
-Oracle:{7}{R}: Flamewave Invoker deals 5 damage to target player.
+Oracle:{7}{R}: Flamewave Invoker deals 5 damage to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/g/goblin_razerunners.txt b/forge-gui/res/cardsfolder/g/goblin_razerunners.txt
index a7408435b4a..2f5a4e8c458 100644
--- a/forge-gui/res/cardsfolder/g/goblin_razerunners.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_razerunners.txt
@@ -3,8 +3,8 @@ ManaCost:2 R R
 Types:Creature Goblin Warrior
 PT:3/4
 A:AB$ PutCounter | Cost$ 1 R Sac<1/Land> | CounterType$ P1P1 | CounterNum$ 1 | SpellDescription$ Put a +1/+1 counter on CARDNAME.
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | OptionalDecider$ You | TriggerDescription$ At the beginning of your end step, you may have CARDNAME deal damage equal to the number of +1/+1 counters on it to target player.
-SVar:TrigDealDamage:DB$DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ X | References$ X
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDealDamage | OptionalDecider$ You | TriggerDescription$ At the beginning of your end step, you may have CARDNAME deal damage equal to the number of +1/+1 counters on it to target player or planeswalker.
+SVar:TrigDealDamage:DB$DealDamage | ValidTgts$ Player, Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ X | References$ X
 SVar:X:Count$CardCounters.P1P1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_razerunners.jpg
-Oracle:{1}{R}, Sacrifice a land: Put a +1/+1 counter on Goblin Razerunners.\nAt the beginning of your end step, you may have Goblin Razerunners deal damage equal to the number of +1/+1 counters on it to target player.
+Oracle:{1}{R}, Sacrifice a land: Put a +1/+1 counter on Goblin Razerunners.\nAt the beginning of your end step, you may have Goblin Razerunners deal damage equal to the number of +1/+1 counters on it to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/m/magmatic_force.txt b/forge-gui/res/cardsfolder/m/magmatic_force.txt
index 98be911e754..4ce93f952c6 100644
--- a/forge-gui/res/cardsfolder/m/magmatic_force.txt
+++ b/forge-gui/res/cardsfolder/m/magmatic_force.txt
@@ -2,7 +2,7 @@ Name:Magmatic Force
 ManaCost:5 R R R
 Types:Creature Elemental
 PT:7/7
-T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each upkeep, CARDNAME deals 3 damage to target creature or player.
-SVar:TrigDamage:DB$DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each upkeep, CARDNAME deals 3 damage to any target.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature, Player, Planeswalker | TgtPrompt$ Select any target | NumDmg$ 3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magmatic_force.jpg
-Oracle:At the beginning of each upkeep, Magmatic Force deals 3 damage to target creature or player.
+Oracle:At the beginning of each upkeep, Magmatic Force deals 3 damage to any target.
diff --git a/forge-gui/res/cardsfolder/s/shock.txt b/forge-gui/res/cardsfolder/s/shock.txt
index 0db6272e53e..4e5199b9ec2 100644
--- a/forge-gui/res/cardsfolder/s/shock.txt
+++ b/forge-gui/res/cardsfolder/s/shock.txt
@@ -1,6 +1,6 @@
 Name:Shock
 ManaCost:R
 Types:Instant
-A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
+A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature, Player, Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to any target.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shock.jpg
-Oracle:Shock deals 2 damage to target creature or player.
+Oracle:Shock deals 2 damage to any target.