diff --git a/forge-gui/res/cardsfolder/n/naar_isle.txt b/forge-gui/res/cardsfolder/n/naar_isle.txt
index f221884941f..83f96809583 100644
--- a/forge-gui/res/cardsfolder/n/naar_isle.txt
+++ b/forge-gui/res/cardsfolder/n/naar_isle.txt
@@ -5,8 +5,8 @@ T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execu
 SVar:TrigPutCounter:DB$ PutCounter | CounterType$ FLAME | CounterNum$ 1 | SubAbility$ DBDmg
 SVar:DBDmg:DB$ DealDamage | Defined$ You | NumDmg$ Y | References$ Y
 SVar:Y:Count$CardCounters.FLAME
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, CARDNAME deals 3 damage to target player.
-SVar:RolledChaos:DB$ DealDamage | ValidTgts$ Player | NumDmg$ 3
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, CARDNAME deals 3 damage to target player or planeswalker.
+SVar:RolledChaos:DB$ DealDamage | ValidTgts$ Player,Planeswalker | NumDmg$ 3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/naar_isle.jpg
 SVar:AIRollPlanarDieParams:Mode$ Always
-Oracle:At the beginning of your upkeep, put a flame counter on Naar Isle, then Naar Isle deals damage to you equal to the number of flame counters on it.\nWhenever you roll {CHAOS}, Naar Isle deals 3 damage to target player.
+Oracle:At the beginning of your upkeep, put a flame counter on Naar Isle, then Naar Isle deals damage to you equal to the number of flame counters on it.\nWhenever you roll {CHAOS}, Naar Isle deals 3 damage to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/n/nicol_bolas_planeswalker.txt b/forge-gui/res/cardsfolder/n/nicol_bolas_planeswalker.txt
index 30333570082..0d249f9de2f 100644
--- a/forge-gui/res/cardsfolder/n/nicol_bolas_planeswalker.txt
+++ b/forge-gui/res/cardsfolder/n/nicol_bolas_planeswalker.txt
@@ -4,8 +4,8 @@ Types:Legendary Planeswalker Bolas
 Loyalty:5
 A:AB$ Destroy | Cost$ AddCounter<3/LOYALTY> | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select a noncreature permanent. | Planeswalker$ True | SpellDescription$ Destroy target noncreature permanent.
 A:AB$ GainControl | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Creature | Planeswalker$ True | SpellDescription$ Gain control of target creature.
-A:AB$ DealDamage | Cost$ SubCounter<9/LOYALTY> | NumDmg$ 7 | ValidTgts$ Player | Planeswalker$ True | Ultimate$ True | SubAbility$ DBDiscard | SpellDescription$ CARDNAME deals 7 damage to target player. That player discards seven cards, then sacrifices seven permanents.
-SVar:DBDiscard:DB$Discard | Defined$ Targeted | NumCards$ 7 | Mode$ TgtChoose | SubAbility$ DBSac
-SVar:DBSac:DB$Sacrifice | Defined$ Targeted | SacValid$ Permanent | Amount$ 7
+A:AB$ DealDamage | Cost$ SubCounter<9/LOYALTY> | NumDmg$ 7 | ValidTgts$ Player,Planeswalker | Planeswalker$ True | Ultimate$ True | SubAbility$ DBDiscard | SpellDescription$ CARDNAME deals 7 damage to target player or planeswalker. That player or that planeswalker's controller discards seven cards, then sacrifices seven permanents.
+SVar:DBDiscard:DB$Discard | Defined$ TargetedOrController | NumCards$ 7 | Mode$ TgtChoose | SubAbility$ DBSac
+SVar:DBSac:DB$Sacrifice | Defined$ TargetedOrController | SacValid$ Permanent | Amount$ 7
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nicol_bolas_planeswalker.jpg
-Oracle:[+3]: Destroy target noncreature permanent.\n[-2]: Gain control of target creature.\n[-9]: Nicol Bolas, Planeswalker deals 7 damage to target player. That player discards seven cards, then sacrifices seven permanents.
+Oracle:[+3]: Destroy target noncreature permanent.\n[-2]: Gain control of target creature.\n[-9]: Nicol Bolas, Planeswalker deals 7 damage to target player or planeswalker. That player or that planeswalker's controller discards seven cards, then sacrifices seven permanents.
diff --git a/forge-gui/res/cardsfolder/n/noble_vestige.txt b/forge-gui/res/cardsfolder/n/noble_vestige.txt
index ebf5bf01cc9..f1106626954 100644
--- a/forge-gui/res/cardsfolder/n/noble_vestige.txt
+++ b/forge-gui/res/cardsfolder/n/noble_vestige.txt
@@ -3,6 +3,6 @@ ManaCost:2 W
 Types:Creature Spirit
 PT:1/2
 K:Flying
-A:AB$ PreventDamage | Cost$ T | ValidTgts$ Player | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to target player this turn.
+A:AB$ PreventDamage | Cost$ T | ValidTgts$ Player,Planeswalker | Amount$ 1 | SpellDescription$ Prevent the next 1 damage that would be dealt to target player or planeswalker this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noble_vestige.jpg
-Oracle:Flying\n{T}: Prevent the next 1 damage that would be dealt to target player this turn.
+Oracle:Flying\n{T}: Prevent the next 1 damage that would be dealt to target player or planeswalker this turn.
diff --git a/forge-gui/res/cardsfolder/n/noggle_hedge_mage.txt b/forge-gui/res/cardsfolder/n/noggle_hedge_mage.txt
index 17ee886c76f..c0fb74d5c2a 100644
--- a/forge-gui/res/cardsfolder/n/noggle_hedge_mage.txt
+++ b/forge-gui/res/cardsfolder/n/noggle_hedge_mage.txt
@@ -3,8 +3,8 @@ ManaCost:2 UR
 Types:Creature Noggle Wizard
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Island.YouCtrl | PresentCompare$ GE2 | Execute$ TrigTap | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Islands, you may tap two target permanents.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Mountain.YouCtrl | PresentCompare$ GE2 | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Mountains, you may have CARDNAME deal 2 damage to target player.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Mountain.YouCtrl | PresentCompare$ GE2 | Execute$ TrigDamage | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, if you control two or more Mountains, you may have CARDNAME deal 2 damage to target player or planeswalker.
 SVar:TrigTap:DB$Tap | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Permanent
-SVar:TrigDamage:DB$DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 2
+SVar:TrigDamage:DB$DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noggle_hedge_mage.jpg
-Oracle:When Noggle Hedge-Mage enters the battlefield, if you control two or more Islands, you may tap two target permanents.\nWhen Noggle Hedge-Mage enters the battlefield, if you control two or more Mountains, you may have Noggle Hedge-Mage deal 2 damage to target player.
+Oracle:When Noggle Hedge-Mage enters the battlefield, if you control two or more Islands, you may tap two target permanents.\nWhen Noggle Hedge-Mage enters the battlefield, if you control two or more Mountains, you may have Noggle Hedge-Mage deal 2 damage to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/o/obelisk_of_alara.txt b/forge-gui/res/cardsfolder/o/obelisk_of_alara.txt
index cd3fae49eac..532307dc96b 100644
--- a/forge-gui/res/cardsfolder/o/obelisk_of_alara.txt
+++ b/forge-gui/res/cardsfolder/o/obelisk_of_alara.txt
@@ -5,7 +5,7 @@ A:AB$ GainLife | Cost$ 1 W T | LifeAmount$ 5 | SpellDescription$ You gain 5 life
 A:AB$ Draw | Cost$ 1 U T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 A:AB$ Pump | Cost$ 1 B T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -2 | NumDef$ -2 | IsCurse$ True | SpellDescription$ Target creature gets -2/-2 until end of turn.
-A:AB$ DealDamage | Cost$ 1 R T | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target player.
+A:AB$ DealDamage | Cost$ 1 R T | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target player or planeswalker.
 A:AB$ Pump | Cost$ 1 G T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +4 | NumDef$ +4 | SpellDescription$ Target creature gets +4/+4 until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/obelisk_of_alara.jpg
-Oracle:{1}{W}, {T}: You gain 5 life.\n{1}{U}, {T}: Draw a card, then discard a card.\n{1}{B}, {T}: Target creature gets -2/-2 until end of turn.\n{1}{R}, {T}: Obelisk of Alara deals 3 damage to target player.\n{1}{G}, {T}: Target creature gets +4/+4 until end of turn.
+Oracle:{1}{W}, {T}: You gain 5 life.\n{1}{U}, {T}: Draw a card, then discard a card.\n{1}{B}, {T}: Target creature gets -2/-2 until end of turn.\n{1}{R}, {T}: Obelisk of Alara deals 3 damage to target player or planeswalker.\n{1}{G}, {T}: Target creature gets +4/+4 until end of turn.
diff --git a/forge-gui/res/cardsfolder/p/pulse_of_the_forge.txt b/forge-gui/res/cardsfolder/p/pulse_of_the_forge.txt
index 4511082cbe8..b565e48fe66 100644
--- a/forge-gui/res/cardsfolder/p/pulse_of_the_forge.txt
+++ b/forge-gui/res/cardsfolder/p/pulse_of_the_forge.txt
@@ -1,8 +1,8 @@
 Name:Pulse of the Forge
 ManaCost:1 R R
 Types:Instant
-A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 4 | SubAbility$ ReheatTheForge | SpellDescription$ CARDNAME deals 4 damage to target player. Then if that player has more life than you, return CARDNAME to its owner's hand.
-SVar:ReheatTheForge:DB$ ChangeZone | ConditionLifeTotal$ You | ConditionLifeAmount$ LTX | References$ X | Defined$ Self | Origin$ Stack | Destination$ Hand | ConditionDescription$ If an opponent has more life than you,
-SVar:X:Count$TargetedLifeTotal
+A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 4 | SubAbility$ ReheatTheForge | SpellDescription$ CARDNAME deals 4 damage to target player or planeswalker. Then if that player or that planeswalker's controller has more life than you, return CARDNAME to its owner's hand.
+SVar:ReheatTheForge:DB$ ChangeZone | ConditionLifeTotal$ TargetedOrController | ConditionLifeAmount$ GTX | References$ X | Defined$ Self | Origin$ Stack | Destination$ Hand | ConditionDescription$ If that player or that planeswalker's controller has more life than you,
+SVar:X:Count$YourLifeTotal
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pulse_of_the_forge.jpg
-Oracle:Pulse of the Forge deals 4 damage to target player. Then if that player has more life than you, return Pulse of the Forge to its owner's hand.
+Oracle:Pulse of the Forge deals 4 damage to target player or planeswalker. Then if that player or that planeswalker's controller has more life than you, return Pulse of the Forge to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/p/punish_the_enemy.txt b/forge-gui/res/cardsfolder/p/punish_the_enemy.txt
index d194b34f459..824d88a3868 100644
--- a/forge-gui/res/cardsfolder/p/punish_the_enemy.txt
+++ b/forge-gui/res/cardsfolder/p/punish_the_enemy.txt
@@ -1,7 +1,7 @@
 Name:Punish the Enemy
 ManaCost:4 R
 Types:Instant
-A:SP$ DealDamage | Cost$ 4 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | SubAbility$ DB1 | SpellDescription$ CARDNAME deals 3 damage to target player and 3 damage to target creature.
-SVar:DB1:DB$ DealDamage | NumDmg$ 3 | ValidTgts$ Player | TgtPrompt$ Select target player
+A:SP$ DealDamage | Cost$ 4 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | SubAbility$ DB1 | SpellDescription$ CARDNAME deals 3 damage to target player or planeswalker and 3 damage to target creature.
+SVar:DB1:DB$ DealDamage | NumDmg$ 3 | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker
 SVar:Picture:http://www.wizards.com/global/images/magic/general/punish_the_enemy.jpg
-Oracle:Punish the Enemy deals 3 damage to target player and 3 damage to target creature.
+Oracle:Punish the Enemy deals 3 damage to target player or planeswalker and 3 damage to target creature.
diff --git a/forge-gui/res/cardsfolder/q/quicksilver_dagger.txt b/forge-gui/res/cardsfolder/q/quicksilver_dagger.txt
index 3812e3cdcbd..0f83fe79bd8 100644
--- a/forge-gui/res/cardsfolder/q/quicksilver_dagger.txt
+++ b/forge-gui/res/cardsfolder/q/quicksilver_dagger.txt
@@ -3,9 +3,9 @@ ManaCost:1 U R
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 1 U R | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ Damage | AddSVar$ QuicksilverDraw | Description$ Enchanted creature has "{T}: This creature deals 1 damage to target player. You draw a card."
-SVar:Damage:AB$DealDamage | Cost$ T | ValidTgts$ Player | TgtPrompt$ Select a player | NumDmg$ 1 | SubAbility$ QuicksilverDraw | SpellDescription$ CARDNAME deals 1 damage to target player.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ Damage | AddSVar$ QuicksilverDraw | Description$ Enchanted creature has "{T}: This creature deals 1 damage to target player or planeswalker. You draw a card."
+SVar:Damage:AB$DealDamage | Cost$ T | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | SubAbility$ QuicksilverDraw | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker.
 SVar:QuicksilverDraw:DB$Draw | NumCards$ 1 | Defined$ You | SpellDescription$ Draw a card.
 SVar:NonStackingAttachEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/quicksilver_dagger.jpg
-Oracle:Enchant creature\nEnchanted creature has "{T}: This creature deals 1 damage to target player. You draw a card."
+Oracle:Enchant creature\nEnchanted creature has "{T}: This creature deals 1 damage to target player or planeswalker. You draw a card."
diff --git a/forge-gui/res/cardsfolder/r/rage_forger.txt b/forge-gui/res/cardsfolder/r/rage_forger.txt
index 7f0a40dc910..389d583f76d 100644
--- a/forge-gui/res/cardsfolder/r/rage_forger.txt
+++ b/forge-gui/res/cardsfolder/r/rage_forger.txt
@@ -4,7 +4,7 @@ Types:Creature Elemental Shaman
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounters | TriggerDescription$ When CARDNAME enters the battlefield, put a +1/+1 counter each other Shaman creature you control.
 SVar:TrigPutCounters:DB$PutCounterAll | ValidCards$ Creature.Shaman+Other+YouCtrl | CounterType$ P1P1 | CounterNum$ 1
-T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+counters_GE1_P1P1 | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature you control with a +1/+1 counter on it attacks, you may have that creature deal 1 damage to target player.
-SVar:TrigDamage:DB$DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | TgtPrompt$ Select target player | NumDmg$ 1 | DamageSource$ TriggeredAttacker
+T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+counters_GE1_P1P1 | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature you control with a +1/+1 counter on it attacks, you may have that creature deal 1 damage to target player or planeswalker.
+SVar:TrigDamage:DB$DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | DamageSource$ TriggeredAttacker
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rage_forger.jpg
-Oracle:When Rage Forger enters the battlefield, put a +1/+1 counter on each other Shaman creature you control.\nWhenever a creature you control with a +1/+1 counter on it attacks, you may have that creature deal 1 damage to target player.
+Oracle:When Rage Forger enters the battlefield, put a +1/+1 counter on each other Shaman creature you control.\nWhenever a creature you control with a +1/+1 counter on it attacks, you may have that creature deal 1 damage to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/r/rage_thrower.txt b/forge-gui/res/cardsfolder/r/rage_thrower.txt
index a384093832c..8366821a05a 100644
--- a/forge-gui/res/cardsfolder/r/rage_thrower.txt
+++ b/forge-gui/res/cardsfolder/r/rage_thrower.txt
@@ -2,7 +2,7 @@ Name:Rage Thrower
 ManaCost:5 R
 Types:Creature Human Shaman
 PT:4/2
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever another creature dies, CARDNAME deals 2 damage to target player.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever another creature dies, CARDNAME deals 2 damage to target player or planeswalker.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rage_thrower.jpg
-Oracle:Whenever another creature dies, Rage Thrower deals 2 damage to target player.
+Oracle:Whenever another creature dies, Rage Thrower deals 2 damage to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/r/relic_bind.txt b/forge-gui/res/cardsfolder/r/relic_bind.txt
index c0ee6578d07..2ab309c4483 100644
--- a/forge-gui/res/cardsfolder/r/relic_bind.txt
+++ b/forge-gui/res/cardsfolder/r/relic_bind.txt
@@ -5,9 +5,9 @@ K:Enchant artifact an opponent controls
 A:SP$ Attach | Cost$ 2 U | ValidTgts$ Artifact.OppCtrl | TgtPrompt$ Select target artifact an opponent controls | AILogic$ Curse
 T:Mode$ Taps | ValidCard$ Card.AttachedBy | TriggerZones$ Battlefield | Execute$ TrigCharm | TriggerDescription$ Whenever enchanted artifact becomes tapped, ABILITY
 SVar:TrigCharm:DB$ Charm | Choices$ DBDamage,DBGain
-SVar:DBDamage:DB$ DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player.
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker.
 SVar:DBGain:DB$ GainLife | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ 1 | SpellDescription$ Target player gains 1 life.
 SVar:RemAIDeck:True
 DeckHas:Ability$LifeGain
 SVar:Picture:http://www.wizards.com/global/images/magic/general/relic_bind.jpg
-Oracle:Enchant artifact an opponent controls\nWhenever enchanted artifact becomes tapped, choose one —\n• Relic Bind deals 1 damage to target player.\n• Target player gains 1 life.
+Oracle:Enchant artifact an opponent controls\nWhenever enchanted artifact becomes tapped, choose one —\n• Relic Bind deals 1 damage to target player or planeswalker.\n• Target player gains 1 life.
diff --git a/forge-gui/res/cardsfolder/s/sarkhan_the_mad.txt b/forge-gui/res/cardsfolder/s/sarkhan_the_mad.txt
index b23fb1ab862..e28b9061a0e 100644
--- a/forge-gui/res/cardsfolder/s/sarkhan_the_mad.txt
+++ b/forge-gui/res/cardsfolder/s/sarkhan_the_mad.txt
@@ -9,8 +9,8 @@ SVar:Y:Remembered$CardManaCost
 A:AB$ Destroy | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Creature | TgtPrompt$ Select target creature | Sacrifice$ True | SubAbility$ DBToken | Planeswalker$ True | AILogic$ MadSarkhanDragon | SpellDescription$ Target creature's controller sacrifices it, then that player creates a 5/5 red Dragon creature token with flying.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenOwner$ TargetedController | TokenColors$ Red | TokenPower$ 5 | TokenToughness$ 5 | TokenImage$ r 5 5 dragon WWK | TokenKeywords$ Flying
 #for this AF, the DefinedCards$ Self is the target for Each damaging. They EachDamage themselves.
-A:AB$ EachDamage | Cost$ SubCounter<4/LOYALTY> | ValidCards$ Dragon.Creature+YouCtrl | ValidDescription$ Dragon creature you control | NumDmg$ X | DamageDesc$ damage equal to its power | ValidTgts$ Player | TgtPrompt$ Select target player | Planeswalker$ True | Ultimate$ True | References$ X | AILogic$ MadSarkhanUltimate | SpellDescription$ Each Dragon creature you control deals damage equal to its power to target player.
+A:AB$ EachDamage | Cost$ SubCounter<4/LOYALTY> | ValidCards$ Dragon.Creature+YouCtrl | ValidDescription$ Dragon creature you control | NumDmg$ X | DamageDesc$ damage equal to its power | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | Planeswalker$ True | Ultimate$ True | References$ X | AILogic$ MadSarkhanUltimate | SpellDescription$ Each Dragon creature you control deals damage equal to its power to target player or planeswalker.
 #NumDmg isn't really used here. It is left for clarity. The AF pulls Damage straight from "X" hardcoded.
 SVar:X:Count$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sarkhan_the_mad.jpg
-Oracle:[0]: Reveal the top card of your library and put it into your hand. Sarkhan the Mad deals damage to himself equal to that card's converted mana cost.\n[-2]: Target creature's controller sacrifices it, then that player creates a 5/5 red Dragon creature token with flying.\n[-4]: Each Dragon creature you control deals damage equal to its power to target player.
+Oracle:[0]: Reveal the top card of your library and put it into your hand. Sarkhan the Mad deals damage to himself equal to that card's converted mana cost.\n[-2]: Target creature's controller sacrifices it, then that player creates a 5/5 red Dragon creature token with flying.\n[-4]: Each Dragon creature you control deals damage equal to its power to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/s/scalding_devil.txt b/forge-gui/res/cardsfolder/s/scalding_devil.txt
index 7a1709c7b95..44bcef4c16e 100644
--- a/forge-gui/res/cardsfolder/s/scalding_devil.txt
+++ b/forge-gui/res/cardsfolder/s/scalding_devil.txt
@@ -2,6 +2,6 @@ Name:Scalding Devil
 ManaCost:1 R
 Types:Creature Devil
 PT:1/1
-A:AB$ DealDamage | Cost$ 2 R | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player.
+A:AB$ DealDamage | Cost$ 2 R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scalding_devil.jpg
-Oracle:{2}{R}: Scalding Devil deals 1 damage to target player.
+Oracle:{2}{R}: Scalding Devil deals 1 damage to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/s/scepter_of_empires.txt b/forge-gui/res/cardsfolder/s/scepter_of_empires.txt
index 26737c50db4..6e07c6d65ae 100644
--- a/forge-gui/res/cardsfolder/s/scepter_of_empires.txt
+++ b/forge-gui/res/cardsfolder/s/scepter_of_empires.txt
@@ -1,7 +1,7 @@
 Name:Scepter of Empires
 ManaCost:3
 Types:Artifact
-A:AB$ DealDamage | Cost$ T | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ X | References$ X,Y,Z,AllM12Empires | SpellDescription$ CARDNAME deals 1 damage to target player. It deals 3 damage to that player instead if you control artifacts named Crown of Empires and Throne of Empires.
+A:AB$ DealDamage | Cost$ T | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ X | References$ X,Y,Z,AllM12Empires | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker. It deals 3 damage to that player or planeswalker instead if you control artifacts named Crown of Empires and Throne of Empires.
 SVar:X:Count$Compare AllM12Empires GT0.3.1
 SVar:AllM12Empires:SVar$Z/Times.Y
 SVar:Z:Count$Valid Artifact.namedCrown of Empires+YouCtrl
@@ -9,4 +9,4 @@ SVar:Y:Count$Valid Artifact.namedThrone of Empires+YouCtrl
 SVar:RemRandomDeck:True
 DeckHints:Name$Throne of Empires|Crown of Empires
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scepter_of_empires.jpg
-Oracle:{T}: Scepter of Empires deals 1 damage to target player. It deals 3 damage to that player instead if you control artifacts named Crown of Empires and Throne of Empires.
+Oracle:{T}: Scepter of Empires deals 1 damage to target player or planeswalker. It deals 3 damage to that player or planeswalker instead if you control artifacts named Crown of Empires and Throne of Empires.
diff --git a/forge-gui/res/cardsfolder/s/scorched_rusalka.txt b/forge-gui/res/cardsfolder/s/scorched_rusalka.txt
index 03e738ebe75..1c9787fcfa8 100644
--- a/forge-gui/res/cardsfolder/s/scorched_rusalka.txt
+++ b/forge-gui/res/cardsfolder/s/scorched_rusalka.txt
@@ -2,7 +2,7 @@ Name:Scorched Rusalka
 ManaCost:R
 Types:Creature Spirit
 PT:1/1
-A:AB$ DealDamage | Cost$ R Sac<1/Creature> | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player.
+A:AB$ DealDamage | Cost$ R Sac<1/Creature> | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker.
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scorched_rusalka.jpg
-Oracle:{R}, Sacrifice a creature: Scorched Rusalka deals 1 damage to target player.
+Oracle:{R}, Sacrifice a creature: Scorched Rusalka deals 1 damage to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/s/scorching_missile.txt b/forge-gui/res/cardsfolder/s/scorching_missile.txt
index 88866033c54..1c788fef89f 100644
--- a/forge-gui/res/cardsfolder/s/scorching_missile.txt
+++ b/forge-gui/res/cardsfolder/s/scorching_missile.txt
@@ -2,6 +2,6 @@ Name:Scorching Missile
 ManaCost:3 R
 Types:Sorcery
 K:Flashback 9 R
-A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target player.
+A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target player or planeswalker.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scorching_missile.jpg
-Oracle:Scorching Missile deals 4 damage to target player.\nFlashback {9}{R} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+Oracle:Scorching Missile deals 4 damage to target player or planeswalker.\nFlashback {9}{R} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/s/scrapyard_salvo.txt b/forge-gui/res/cardsfolder/s/scrapyard_salvo.txt
index 51b14d4c4bb..8f1690c936f 100644
--- a/forge-gui/res/cardsfolder/s/scrapyard_salvo.txt
+++ b/forge-gui/res/cardsfolder/s/scrapyard_salvo.txt
@@ -1,8 +1,8 @@
 Name:Scrapyard Salvo
 ManaCost:1 R R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals damage to target player equal to the number of artifact cards in your graveyard.
+A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals damage to target player or planeswalker equal to the number of artifact cards in your graveyard.
 SVar:X:Count$TypeInYourYard.Artifact
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scrapyard_salvo.jpg
-Oracle:Scrapyard Salvo deals damage to target player equal to the number of artifact cards in your graveyard.
+Oracle:Scrapyard Salvo deals damage to target player or planeswalker equal to the number of artifact cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/s/searing_blaze.txt b/forge-gui/res/cardsfolder/s/searing_blaze.txt
index 0376815c804..83d9c1f51b6 100644
--- a/forge-gui/res/cardsfolder/s/searing_blaze.txt
+++ b/forge-gui/res/cardsfolder/s/searing_blaze.txt
@@ -1,8 +1,8 @@
 Name:Searing Blaze
 ManaCost:R R
 Types:Instant
-A:SP$ DealDamage | Cost$ R R | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ SearingX | SubAbility$ SearingDamage | References$ SearingX | SpellDescription$ CARDNAME deals 1 damage to target player and 1 damage to target creature that player controls. Landfall — If you had a land enter the battlefield under your control this turn, CARDNAME deals 3 damage to that player and 3 damage to that creature instead.
-SVar:SearingDamage:DB$ DealDamage | ValidTgts$ Creature.TargetedPlayerCtrl | TgtPrompt$ Select target creature that player controls | NumDmg$ SearingX | References$ SearingX
+A:SP$ DealDamage | Cost$ R R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ SearingX | SubAbility$ SearingDamage | References$ SearingX | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker and 1 damage to target creature that player or that planeswalker's controller controls. Landfall — If you had a land enter the battlefield under your control this turn, CARDNAME deals 3 damage to that player or planeswalker and 3 damage to that creature instead.
+SVar:SearingDamage:DB$ DealDamage | ValidTgts$ Creature.ControlledBy TargetedOrController | TgtPrompt$ Select target creature that player or that planeswalker's controller controls | NumDmg$ SearingX | References$ SearingX
 SVar:SearingX:Count$Landfall.3.1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/searing_blaze.jpg
-Oracle:Searing Blaze deals 1 damage to target player and 1 damage to target creature that player controls.\nLandfall — If you had a land enter the battlefield under your control this turn, Searing Blaze deals 3 damage to that player and 3 damage to that creature instead.
+Oracle:Searing Blaze deals 1 damage to target player or planeswalker and 1 damage to target creature that player or that planeswalker's controller controls.\nLandfall — If you had a land enter the battlefield under your control this turn, Searing Blaze deals 3 damage to that player or planeswalker and 3 damage to that creature instead.
diff --git a/forge-gui/res/cardsfolder/s/shower_of_sparks.txt b/forge-gui/res/cardsfolder/s/shower_of_sparks.txt
index 210430b1f9b..c229d92e3a0 100644
--- a/forge-gui/res/cardsfolder/s/shower_of_sparks.txt
+++ b/forge-gui/res/cardsfolder/s/shower_of_sparks.txt
@@ -2,6 +2,6 @@ Name:Shower of Sparks
 ManaCost:R
 Types:Instant
 A:SP$ DealDamage | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 1 damage to target creature
-SVar:DBDamage:DB$DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1 | SpellDescription$ and 1 damage to target player.
+SVar:DBDamage:DB$DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | SpellDescription$ and 1 damage to target player or planeswalker.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shower_of_sparks.jpg
-Oracle:Shower of Sparks deals 1 damage to target creature and 1 damage to target player.
+Oracle:Shower of Sparks deals 1 damage to target creature and 1 damage to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/s/skullcrack.txt b/forge-gui/res/cardsfolder/s/skullcrack.txt
index be45c92ac8f..d563368321e 100644
--- a/forge-gui/res/cardsfolder/s/skullcrack.txt
+++ b/forge-gui/res/cardsfolder/s/skullcrack.txt
@@ -1,9 +1,9 @@
 Name:Skullcrack
 ManaCost:1 R
 Types:Instant
-A:SP$ Effect | Cost$ 1 R | Name$ Skullcrack Effect | StaticAbilities$ STCantGain,STCantPrevent | AILogic$ Burn | SubAbility$ DBDamage | SpellDescription$ Players can't gain life this turn. Damage can't be prevented this turn. CARDNAME deals 3 damage to target player.
+A:SP$ Effect | Cost$ 1 R | Name$ Skullcrack Effect | StaticAbilities$ STCantGain,STCantPrevent | AILogic$ Burn | SubAbility$ DBDamage | SpellDescription$ Players can't gain life this turn. Damage can't be prevented this turn. CARDNAME deals 3 damage to target player or planeswalker.
 SVar:STCantGain:Mode$ Continuous | EffectZone$ Command | Affected$ Player | AddKeyword$ You can't gain life. | Description$ Players can't gain life.
 SVar:STCantPrevent:Mode$ Continuous | EffectZone$ Command | GlobalRule$ Damage can't be prevented. | Description$ Damage can't be prevented.
-SVar:DBDamage:DB$ DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | NoPrevention$ True
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 3 | NoPrevention$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skullcrack.jpg
-Oracle:Players can't gain life this turn. Damage can't be prevented this turn. Skullcrack deals 3 damage to target player.
+Oracle:Players can't gain life this turn. Damage can't be prevented this turn. Skullcrack deals 3 damage to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/s/sorins_vengeance.txt b/forge-gui/res/cardsfolder/s/sorins_vengeance.txt
index 72641359f64..0f4b5c35718 100644
--- a/forge-gui/res/cardsfolder/s/sorins_vengeance.txt
+++ b/forge-gui/res/cardsfolder/s/sorins_vengeance.txt
@@ -1,7 +1,7 @@
 Name:Sorin's Vengeance
 ManaCost:4 B B B
 Types:Sorcery
-A:SP$ DealDamage | Cost$ 4 B B B | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 10 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 10 damage to target player and you gain 10 life.
+A:SP$ DealDamage | Cost$ 4 B B B | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 10 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 10 damage to target player or planeswalker and you gain 10 life.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 10
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sorins_vengeance.jpg
-Oracle:Sorin's Vengeance deals 10 damage to target player and you gain 10 life.
+Oracle:Sorin's Vengeance deals 10 damage to target player or planeswalker and you gain 10 life.
diff --git a/forge-gui/res/cardsfolder/s/soul_of_shandalar.txt b/forge-gui/res/cardsfolder/s/soul_of_shandalar.txt
index b3a0ebf8c0f..e00b3567e29 100644
--- a/forge-gui/res/cardsfolder/s/soul_of_shandalar.txt
+++ b/forge-gui/res/cardsfolder/s/soul_of_shandalar.txt
@@ -3,8 +3,8 @@ 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.
+A:AB$ DealDamage | Cost$ 3 R R | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 3 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 3 damage to target player or planeswalker and 3 damage to up to one target creature that player or that planeswalker's controller controls.
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature.ControlledBy TargetedOrController | TgtPrompt$ Select target creature that player or that planeswalker's controller controls | TargetMin$ 0 | TargetMax$ 1 | NumDmg$ 3
+A:AB$ DealDamage | Cost$ 3 R R ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 3 | SubAbility$ DBDamage | SpellDescription$ CARDNAME deals 3 damage to target player or planeswalker and 3 damage to up to one target creature that player or that planeswalker's controller 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.
+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 or planeswalker and 3 damage to up to one target creature that player or that planeswalker's controller controls.
diff --git a/forge-gui/res/cardsfolder/s/sparkcaster.txt b/forge-gui/res/cardsfolder/s/sparkcaster.txt
index 3ce3bfdfb33..bd368917a18 100644
--- a/forge-gui/res/cardsfolder/s/sparkcaster.txt
+++ b/forge-gui/res/cardsfolder/s/sparkcaster.txt
@@ -3,9 +3,9 @@ ManaCost:2 R G
 Types:Creature Kavu
 PT:5/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a red or green creature you control to its owner's hand.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to target player.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to target player or planeswalker.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Creature.Red+YouCtrl,Creature.Green+YouCtrl | ChangeNum$ 1 | Mandatory$ True | AILogic$ NeverBounceItself
-SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1
 SVar:NeedsToPlay:Creature.Red+YouCtrl+cmcLE4+inZoneBattlefield,Creature.Green+YouCtrl+cmcLE4+inZoneBattlefield
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sparkcaster.jpg
-Oracle:When Sparkcaster enters the battlefield, return a red or green creature you control to its owner's hand.\nWhen Sparkcaster enters the battlefield, it deals 1 damage to target player.
+Oracle:When Sparkcaster enters the battlefield, return a red or green creature you control to its owner's hand.\nWhen Sparkcaster enters the battlefield, it deals 1 damage to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/s/stalking_vengeance.txt b/forge-gui/res/cardsfolder/s/stalking_vengeance.txt
index ca3f211a3bd..5629ebcd504 100644
--- a/forge-gui/res/cardsfolder/s/stalking_vengeance.txt
+++ b/forge-gui/res/cardsfolder/s/stalking_vengeance.txt
@@ -3,8 +3,8 @@ ManaCost:5 R R
 Types:Creature Avatar
 PT:5/5
 K:Haste
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever another creature you control dies, it deals damage equal to its power to target player.
-SVar:TrigDamage:DB$DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ X
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever another creature you control dies, it deals damage equal to its power to target player or planeswalker.
+SVar:TrigDamage:DB$DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ X
 SVar:X:TriggeredCard$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stalking_vengeance.jpg
-Oracle:Haste\nWhenever another creature you control dies, it deals damage equal to its power to target player.
+Oracle:Haste\nWhenever another creature you control dies, it deals damage equal to its power to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/s/stensia_bloodhall.txt b/forge-gui/res/cardsfolder/s/stensia_bloodhall.txt
index 9fa2d177b68..152c01742f3 100644
--- a/forge-gui/res/cardsfolder/s/stensia_bloodhall.txt
+++ b/forge-gui/res/cardsfolder/s/stensia_bloodhall.txt
@@ -2,6 +2,6 @@ Name:Stensia Bloodhall
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ DealDamage | Cost$ 3 B R T | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target player.
+A:AB$ DealDamage | Cost$ 3 B R T | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target player or planeswalker.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stensia_bloodhall.jpg
-Oracle:{T}: Add {C}.\n{3}{B}{R}, {T}: Stensia Bloodhall deals 2 damage to target player.
+Oracle:{T}: Add {C}.\n{3}{B}{R}, {T}: Stensia Bloodhall deals 2 damage to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/s/sunscorched_desert.txt b/forge-gui/res/cardsfolder/s/sunscorched_desert.txt
index 63b764cc7d5..11c687b2140 100644
--- a/forge-gui/res/cardsfolder/s/sunscorched_desert.txt
+++ b/forge-gui/res/cardsfolder/s/sunscorched_desert.txt
@@ -1,8 +1,8 @@
 Name:Sunscorched Desert
 ManaCost:no cost
 Types:Land Desert
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to target player.
-SVar:TrigDealDamage:DB$DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1 
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 1 damage to target player or planeswalker.
+SVar:TrigDealDamage:DB$DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sunscorched_desert.jpg
-Oracle:When Sunscorched Desert enters the battlefield, it deals 1 damage to target player.\n{T}: Add {C}.
\ No newline at end of file
+Oracle:When Sunscorched Desert enters the battlefield, it deals 1 damage to target player or planeswalker.\n{T}: Add {C}.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/surestrike_trident.txt b/forge-gui/res/cardsfolder/s/surestrike_trident.txt
index f1713f3ddf6..9828210c934 100644
--- a/forge-gui/res/cardsfolder/s/surestrike_trident.txt
+++ b/forge-gui/res/cardsfolder/s/surestrike_trident.txt
@@ -2,7 +2,7 @@ Name:Surestrike Trident
 ManaCost:2
 Types:Artifact Equipment
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ First Strike | AddAbility$ SurestrikeTridentDmg | AddSVar$ SurestrikeTridentX | Description$ Equipped creature has first strike and "{T}, Unattach CARDNAME: This creature deals damage equal to its power to target player or planeswalker."
-SVar:SurestrikeTridentDmg:AB$ DealDamage | Cost$ T Unattach<OriginalHost/Surestrike Trident> | NumDmg$ SurestrikeTridentX | References$ SurestrikeTridentX | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | SpellDescription$ CARDNAME deals damage equal toits power to target player or planeswalker.
+SVar:SurestrikeTridentDmg:AB$ DealDamage | Cost$ T Unattach<OriginalHost/Surestrike Trident> | NumDmg$ SurestrikeTridentX | References$ SurestrikeTridentX | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | SpellDescription$ CARDNAME deals damage equal to its power to target player or planeswalker.
 SVar:SurestrikeTridentX:Count$CardPower
 K:Equip:4
 SVar:Picture:http://www.wizards.com/global/images/magic/general/surestrike_trident.jpg
diff --git a/forge-gui/res/cardsfolder/t/taste_of_blood.txt b/forge-gui/res/cardsfolder/t/taste_of_blood.txt
index e3c28202b42..57a6d54aff9 100644
--- a/forge-gui/res/cardsfolder/t/taste_of_blood.txt
+++ b/forge-gui/res/cardsfolder/t/taste_of_blood.txt
@@ -1,7 +1,7 @@
 Name:Taste of Blood
 ManaCost:B
 Types:Sorcery
-A:SP$ DealDamage | Cost$ B | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 1 damage to target player and you gain 1 life.
+A:SP$ DealDamage | Cost$ B | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker and you gain 1 life.
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/taste_of_blood.jpg
-Oracle:Taste of Blood deals 1 damage to target player and you gain 1 life.
+Oracle:Taste of Blood deals 1 damage to target player or planeswalker and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/t/telimtors_darts.txt b/forge-gui/res/cardsfolder/t/telimtors_darts.txt
index 01fd513d48e..f512f11ae11 100644
--- a/forge-gui/res/cardsfolder/t/telimtors_darts.txt
+++ b/forge-gui/res/cardsfolder/t/telimtors_darts.txt
@@ -1,6 +1,6 @@
 Name:Telim'Tor's Darts
 ManaCost:2
 Types:Artifact
-A:AB$ DealDamage | Cost$ 2 T | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player.
+A:AB$ DealDamage | Cost$ 2 T | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/telimtors_darts.jpg
-Oracle:{2}, {T}: Telim'Tor's Darts deals 1 damage to target player.
+Oracle:{2}, {T}: Telim'Tor's Darts deals 1 damage to target player or planeswalker.
diff --git a/forge-gui/res/cardsfolder/t/thunderbolt.txt b/forge-gui/res/cardsfolder/t/thunderbolt.txt
index d963d2ac624..61ae19504b8 100644
--- a/forge-gui/res/cardsfolder/t/thunderbolt.txt
+++ b/forge-gui/res/cardsfolder/t/thunderbolt.txt
@@ -2,7 +2,7 @@ Name:Thunderbolt
 ManaCost:1 R
 Types:Instant
 A:SP$ Charm | Cost$ 1 R | Choices$ DBDmg,DBDmg2
-SVar:DBDmg:DB$ DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target player.
+SVar:DBDmg:DB$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target player or planeswalker.
 SVar:DBDmg2:DB$ DealDamage | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with Flying | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature with flying.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thunderbolt.jpg
-Oracle:Choose one —\n• Thunderbolt deals 3 damage to target player.\n• Thunderbolt deals 4 damage to target creature with flying.
+Oracle:Choose one —\n• Thunderbolt deals 3 damage to target player or planeswalker.\n• Thunderbolt deals 4 damage to target creature with flying.
diff --git a/forge-gui/res/cardsfolder/t/touch_of_death.txt b/forge-gui/res/cardsfolder/t/touch_of_death.txt
index 85d0ddb47c2..b618ffc0ebd 100644
--- a/forge-gui/res/cardsfolder/t/touch_of_death.txt
+++ b/forge-gui/res/cardsfolder/t/touch_of_death.txt
@@ -1,9 +1,9 @@
 Name:Touch of Death
 ManaCost:2 B
 Types:Sorcery
-A:SP$ DealDamage | Cost$ 2 B | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player. You gain 1 life. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DBGainLife
+A:SP$ DealDamage | Cost$ 2 B | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player or planeswalker. You gain 1 life. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 1 | SubAbility$ DelTrigSlowtrip
 SVar:DelTrigSlowtrip:DB$ DelayedTrigger | Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ DrawSlowtrip | TriggerDescription$ Draw a card.
 SVar:DrawSlowtrip:DB$Draw | NumCards$ 1 | Defined$ You
 SVar:Picture:http://www.wizards.com/global/images/magic/general/touch_of_death.jpg
-Oracle:Touch of Death deals 1 damage to target player. You gain 1 life.\nDraw a card at the beginning of the next turn's upkeep.
+Oracle:Touch of Death deals 1 damage to target player or planeswalker. You gain 1 life.\nDraw a card at the beginning of the next turn's upkeep.
diff --git a/forge-gui/res/cardsfolder/t/tymaret_the_murder_king.txt b/forge-gui/res/cardsfolder/t/tymaret_the_murder_king.txt
index cd9f9771978..cd3c9d5f2a0 100644
--- a/forge-gui/res/cardsfolder/t/tymaret_the_murder_king.txt
+++ b/forge-gui/res/cardsfolder/t/tymaret_the_murder_king.txt
@@ -2,7 +2,7 @@ Name:Tymaret, the Murder King
 ManaCost:B R
 Types:Legendary Creature Zombie Warrior
 PT:2/2
-A:AB$ DealDamage | Cost$ 1 R Sac<1/Creature.Other/another creature> | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target player.
+A:AB$ DealDamage | Cost$ 1 R Sac<1/Creature.Other/another creature> | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target player or planeswalker.
 A:AB$ ChangeZone | Cost$ 1 B Sac<1/Creature> | 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/tymaret_the_murder_king.jpg
-Oracle:{1}{R}, Sacrifice another creature: Tymaret, the Murder King deals 2 damage to target player.\n{1}{B}, Sacrifice a creature: Return Tymaret from your graveyard to your hand.
+Oracle:{1}{R}, Sacrifice another creature: Tymaret, the Murder King deals 2 damage to target player or planeswalker.\n{1}{B}, Sacrifice a creature: Return Tymaret from your graveyard to your hand.