diff --git a/forge-gui/res/cardsfolder/o/ogre_shaman.txt b/forge-gui/res/cardsfolder/o/ogre_shaman.txt
index 0efb3f3345f..38f413eb301 100644
--- a/forge-gui/res/cardsfolder/o/ogre_shaman.txt
+++ b/forge-gui/res/cardsfolder/o/ogre_shaman.txt
@@ -2,6 +2,6 @@ Name:Ogre Shaman
 ManaCost:3 R R
 Types:Creature Ogre Shaman
 PT:3/3
-A:AB$ DealDamage | Cost$ 2 Discard<1/Random> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
+A:AB$ DealDamage | Cost$ 2 Discard<1/Random> | 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/ogre_shaman.jpg
-Oracle:{2}, Discard a card at random: Ogre Shaman deals 2 damage to target creature or player.
+Oracle:{2}, Discard a card at random: Ogre Shaman deals 2 damage to any target.
diff --git a/forge-gui/res/cardsfolder/o/omnath_locus_of_rage.txt b/forge-gui/res/cardsfolder/o/omnath_locus_of_rage.txt
index 027285c5c7a..418b4f06421 100644
--- a/forge-gui/res/cardsfolder/o/omnath_locus_of_rage.txt
+++ b/forge-gui/res/cardsfolder/o/omnath_locus_of_rage.txt
@@ -4,8 +4,8 @@ Types:Legendary Creature Elemental
 PT:5/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Landfall — Whenever a land enters the battlefield under your control, create a 5/5 red and green Elemental creature token.
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Elemental | TokenTypes$ Creature,Elemental | TokenOwner$ You | TokenColors$ Red,Green | TokenPower$ 5 | TokenToughness$ 5
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerController$ TriggeredCardController | TriggerDescription$ Whenever CARDNAME or another Elemental you control dies, CARDNAME deals 3 damage to target creature or player.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Elemental.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerController$ TriggeredCardController | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Elemental you control dies, CARDNAME deals 3 damage to target creature or player.
-SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerController$ TriggeredCardController | TriggerDescription$ Whenever CARDNAME or another Elemental you control dies, CARDNAME deals 3 damage to any target.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Elemental.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerController$ TriggeredCardController | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Elemental you control dies, CARDNAME deals 3 damage to any target.
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/omnath_locus_of_rage.jpg
-Oracle:Landfall — Whenever a land enters the battlefield under your control, create a 5/5 red and green Elemental creature token.\nWhenever Omnath, Locus of Rage or another Elemental you control dies, Omnath deals 3 damage to target creature or player.
\ No newline at end of file
+Oracle:Landfall — Whenever a land enters the battlefield under your control, create a 5/5 red and green Elemental creature token.\nWhenever Omnath, Locus of Rage or another Elemental you control dies, Omnath deals 3 damage to any target.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/o/open_fire.txt b/forge-gui/res/cardsfolder/o/open_fire.txt
index ca69d5b79e9..fc69ec45cd8 100644
--- a/forge-gui/res/cardsfolder/o/open_fire.txt
+++ b/forge-gui/res/cardsfolder/o/open_fire.txt
@@ -1,6 +1,6 @@
 Name:Open Fire
 ManaCost:2 R
 Types:Instant
-A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player.
+A:SP$ DealDamage | Cost$ 2 R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to any target.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/open_fire.jpg
-Oracle:Open Fire deals 3 damage to target creature or player.
+Oracle:Open Fire deals 3 damage to any target.
diff --git a/forge-gui/res/cardsfolder/o/orcish_artillery.txt b/forge-gui/res/cardsfolder/o/orcish_artillery.txt
index 31ee2584962..afd009cd141 100644
--- a/forge-gui/res/cardsfolder/o/orcish_artillery.txt
+++ b/forge-gui/res/cardsfolder/o/orcish_artillery.txt
@@ -2,9 +2,9 @@ Name:Orcish Artillery
 ManaCost:1 R R
 Types:Creature Orc Warrior
 PT:1/3
-A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | AILogic$ SelfDamage | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to you.
+A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | AILogic$ SelfDamage | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to any target and 3 damage to you.
 SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3
 SVar:SelfDamageAmount:3
 SVar:RemRandomDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83193.jpg
-Oracle:{T}: Orcish Artillery deals 2 damage to target creature or player and 3 damage to you.
+Oracle:{T}: Orcish Artillery deals 2 damage to any target and 3 damage to you.
diff --git a/forge-gui/res/cardsfolder/o/orcish_bloodpainter.txt b/forge-gui/res/cardsfolder/o/orcish_bloodpainter.txt
index 359397afaa9..75b92e2fbbf 100644
--- a/forge-gui/res/cardsfolder/o/orcish_bloodpainter.txt
+++ b/forge-gui/res/cardsfolder/o/orcish_bloodpainter.txt
@@ -2,7 +2,7 @@ Name:Orcish Bloodpainter
 ManaCost:2 R
 Types:Creature Orc Shaman
 PT:2/1
-A:AB$ DealDamage | Cost$ T Sac<1/Creature> | 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$ T Sac<1/Creature> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_bloodpainter.jpg
-Oracle:{T}, Sacrifice a creature: Orcish Bloodpainter deals 1 damage to target creature or player.
+Oracle:{T}, Sacrifice a creature: Orcish Bloodpainter deals 1 damage to any target.
diff --git a/forge-gui/res/cardsfolder/o/orcish_cannonade.txt b/forge-gui/res/cardsfolder/o/orcish_cannonade.txt
index 7a7bb0fded0..530b79e1457 100644
--- a/forge-gui/res/cardsfolder/o/orcish_cannonade.txt
+++ b/forge-gui/res/cardsfolder/o/orcish_cannonade.txt
@@ -1,9 +1,9 @@
 Name:Orcish Cannonade
 ManaCost:1 R R
 Types:Instant
-A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SubAbility$ DB1 | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to you. Draw a card.
+A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SubAbility$ DB1 | SpellDescription$ CARDNAME deals 2 damage to any target and 3 damage to you. Draw a card.
 SVar:DB1:DB$DealDamage | NumDmg$ 3 | Defined$ You | SubAbility$ DB2
 SVar:DB2:DB$Draw | NumCards$ 1
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_cannonade.jpg
-Oracle:Orcish Cannonade deals 2 damage to target creature or player and 3 damage to you.\nDraw a card.
+Oracle:Orcish Cannonade deals 2 damage to any target and 3 damage to you.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/o/orcish_cannoneers.txt b/forge-gui/res/cardsfolder/o/orcish_cannoneers.txt
index d11b6edb926..0719fc99f93 100644
--- a/forge-gui/res/cardsfolder/o/orcish_cannoneers.txt
+++ b/forge-gui/res/cardsfolder/o/orcish_cannoneers.txt
@@ -2,8 +2,8 @@ Name:Orcish Cannoneers
 ManaCost:1 R R
 Types:Creature Orc Warrior
 PT:1/3
-A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to target creature or player and 3 damage to you.
+A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 2 damage to any target and 3 damage to you.
 SVar:DBDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_cannoneers.jpg
-Oracle:{T}: Orcish Cannoneers deals 2 damage to target creature or player and 3 damage to you.
+Oracle:{T}: Orcish Cannoneers deals 2 damage to any target and 3 damage to you.
diff --git a/forge-gui/res/cardsfolder/o/orcish_mechanics.txt b/forge-gui/res/cardsfolder/o/orcish_mechanics.txt
index 64b40f29db8..78da41fad95 100644
--- a/forge-gui/res/cardsfolder/o/orcish_mechanics.txt
+++ b/forge-gui/res/cardsfolder/o/orcish_mechanics.txt
@@ -2,7 +2,7 @@ Name:Orcish Mechanics
 ManaCost:2 R
 Types:Creature Orc
 PT:1/1
-A:AB$ DealDamage | Cost$ T Sac<1/Artifact> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player.
+A:AB$ DealDamage | Cost$ T Sac<1/Artifact> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to any target.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orcish_mechanics.jpg
-Oracle:{T}, Sacrifice an artifact: Orcish Mechanics deals 2 damage to target creature or player.
+Oracle:{T}, Sacrifice an artifact: Orcish Mechanics deals 2 damage to any target.
diff --git a/forge-gui/res/cardsfolder/o/orcish_vandal.txt b/forge-gui/res/cardsfolder/o/orcish_vandal.txt
index 497ba33b83c..9c76bab4367 100644
--- a/forge-gui/res/cardsfolder/o/orcish_vandal.txt
+++ b/forge-gui/res/cardsfolder/o/orcish_vandal.txt
@@ -2,7 +2,7 @@ Name:Orcish Vandal
 ManaCost:1 R
 Types:Creature Orc Warrior
 PT:1/1
-A:AB$ DealDamage | Cost$ T Sac<1/Artifact> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select target | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target.
+A:AB$ DealDamage | Cost$ T Sac<1/Artifact> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to any target.
 SVar:AIPreference:SacCost$Artifact.token+nonCreature,Artifact.token+powerLE1,Artifact.cmcEQ1,Artifact.cmcEQ2
 SVar:RemRandomDeck:True
-Oracle:{T}, Sacrifice an artifact: Orcish Vandal deals 2 damage to target.
\ No newline at end of file
+Oracle:{T}, Sacrifice an artifact: Orcish Vandal deals 2 damage to any target.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/o/ordeal_of_purphoros.txt b/forge-gui/res/cardsfolder/o/ordeal_of_purphoros.txt
index d843b73653c..af76302255a 100644
--- a/forge-gui/res/cardsfolder/o/ordeal_of_purphoros.txt
+++ b/forge-gui/res/cardsfolder/o/ordeal_of_purphoros.txt
@@ -7,9 +7,9 @@ T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigPutCounter | Trigger
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Enchanted | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBSac
 SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionCheckSVar$ EnchantedCounters | ConditionSVarCompare$ GE3 | References$ EnchantedCounters
 SVar:EnchantedCounters:Enchanted$CardCounters.P1P1
-T:Mode$ Sacrificed | ValidPlayer$ You | ValidCard$ Card.Self | Execute$ TrigDmg | TriggerDescription$ When you sacrifice CARDNAME, it deals 3 damage to target creature or player.
-SVar:TrigDmg:DB$ DealDamage | NumDmg$ 3 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player
+T:Mode$ Sacrificed | ValidPlayer$ You | ValidCard$ Card.Self | Execute$ TrigDmg | TriggerDescription$ When you sacrifice CARDNAME, it deals 3 damage to any target.
+SVar:TrigDmg:DB$ DealDamage | NumDmg$ 3 | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target
 S:Mode$ Continuous | Affected$ Creature.AttachedBy | AddSVar$ AE
 SVar:AE:SVar:HasAttackEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ordeal_of_purphoros.jpg
-Oracle:Enchant creature\nWhenever enchanted creature attacks, put a +1/+1 counter on it. Then if it has three or more +1/+1 counters on it, sacrifice Ordeal of Purphoros.\nWhen you sacrifice Ordeal of Purphoros, it deals 3 damage to target creature or player.
+Oracle:Enchant creature\nWhenever enchanted creature attacks, put a +1/+1 counter on it. Then if it has three or more +1/+1 counters on it, sacrifice Ordeal of Purphoros.\nWhen you sacrifice Ordeal of Purphoros, it deals 3 damage to any target.
diff --git a/forge-gui/res/cardsfolder/o/orim_samite_healer.txt b/forge-gui/res/cardsfolder/o/orim_samite_healer.txt
index 017dee140de..d0ce60a44c2 100644
--- a/forge-gui/res/cardsfolder/o/orim_samite_healer.txt
+++ b/forge-gui/res/cardsfolder/o/orim_samite_healer.txt
@@ -2,7 +2,7 @@ Name:Orim, Samite Healer
 ManaCost:1 W W
 Types:Legendary Creature Human Cleric
 PT:1/3
-A:AB$ PreventDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 3 | SpellDescription$ Prevent the next 3 damage that would be dealt to target creature or player this turn.
+A:AB$ PreventDamage | Cost$ T | ValidTgts$ Permanent,Player | TgtPrompt$ Select target permanent or player | Amount$ 3 | SpellDescription$ Prevent the next 3 damage that would be dealt to target permanent or player this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orim_samite_healer.jpg
 SVar:NonCombatPriority:1
-Oracle:{T}: Prevent the next 3 damage that would be dealt to target creature or player this turn.
+Oracle:{T}: Prevent the next 3 damage that would be dealt to target permanent or player this turn.
diff --git a/forge-gui/res/cardsfolder/o/orims_cure.txt b/forge-gui/res/cardsfolder/o/orims_cure.txt
index f618bd1a257..571087f552d 100644
--- a/forge-gui/res/cardsfolder/o/orims_cure.txt
+++ b/forge-gui/res/cardsfolder/o/orims_cure.txt
@@ -1,7 +1,7 @@
 Name:Orim's Cure
 ManaCost:1 W
 Types:Instant
-A:SP$ PreventDamage | Cost$ tapXType<1/Creature> | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 4 | IsPresent$ Plains.YouCtrl | CostDesc$ If you control a Plains, | SpellDescription$ you may tap an untapped creature you control rather than pay CARDNAME's mana cost.
-A:SP$ PreventDamage | Cost$ 1 W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ 4 | SpellDescription$ Prevent the next 4 damage that would be dealt to target creature or player this turn.
+A:SP$ PreventDamage | Cost$ tapXType<1/Creature> | ValidTgts$ Permanent,Player | TgtPrompt$ Select target permanent or player | Amount$ 4 | IsPresent$ Plains.YouCtrl | CostDesc$ Tap an untapped creature you control | SpellDescription$ Prevent the next 4 damage that would be dealt to target permanent or player this turn.
+A:SP$ PreventDamage | Cost$ 1 W | ValidTgts$ Permanent,Player | TgtPrompt$ Select target permanent or player | Amount$ 4 | SpellDescription$ Prevent the next 4 damage that would be dealt to target permanent or player this turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orims_cure.jpg
-Oracle:If you control a Plains, you may tap an untapped creature you control rather than pay Orim's Cure's mana cost.\nPrevent the next 4 damage that would be dealt to target creature or player this turn.
+Oracle:If you control a Plains, you may tap an untapped creature you control rather than pay Orim's Cure's mana cost.\nPrevent the next 4 damage that would be dealt to target permanent or player this turn.
diff --git a/forge-gui/res/cardsfolder/o/orims_touch.txt b/forge-gui/res/cardsfolder/o/orims_touch.txt
index 6ec65b9e08e..6f7419bbc37 100644
--- a/forge-gui/res/cardsfolder/o/orims_touch.txt
+++ b/forge-gui/res/cardsfolder/o/orims_touch.txt
@@ -2,7 +2,7 @@ Name:Orim's Touch
 ManaCost:W
 Types:Instant
 K:Kicker:1
-A:SP$ PreventDamage | Cost$ W | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | Amount$ X | References$ X | SpellDescription$ Prevent the next 2 damage that would be dealt to target creature or player this turn. If CARDNAME was kicked, prevent the next 4 damage that would be dealt to that creature or player this turn instead.
+A:SP$ PreventDamage | Cost$ W | ValidTgts$ Permanent,Player | TgtPrompt$ Select target permanent or player | Amount$ X | References$ X | SpellDescription$ Prevent the next 2 damage that would be dealt to target permanent or player this turn. If CARDNAME was kicked, prevent the next 4 damage that would be dealt to that permanent or player this turn instead.
 SVar:X:Count$Kicked.4.2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orims_touch.jpg
-Oracle:Kicker {1} (You may pay an additional {1} as you cast this spell.)\nPrevent the next 2 damage that would be dealt to target creature or player this turn. If Orim's Touch was kicked, prevent the next 4 damage that would be dealt to that creature or player this turn instead.
+Oracle:Kicker {1} (You may pay an additional {1} as you cast this spell.)\nPrevent the next 2 damage that would be dealt to target permanent or player this turn. If Orim's Touch was kicked, prevent the next 4 damage that would be dealt to that permanent or player this turn instead.
diff --git a/forge-gui/res/cardsfolder/o/outpost_siege.txt b/forge-gui/res/cardsfolder/o/outpost_siege.txt
index cccd987d5c1..eaec775c612 100644
--- a/forge-gui/res/cardsfolder/o/outpost_siege.txt
+++ b/forge-gui/res/cardsfolder/o/outpost_siege.txt
@@ -1,7 +1,7 @@
 Name:Outpost Siege
 ManaCost:3 R
 Types:Enchantment
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ SiegeChoice | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose Khans or Dragons. Khans — At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card. Dragons — Whenever a creature you control leaves the battlefield, CARDNAME deals 1 damage to target creature or player.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ SiegeChoice | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose Khans or Dragons. Khans — At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card. Dragons — Whenever a creature you control leaves the battlefield, CARDNAME deals 1 damage to any target.
 SVar:SiegeChoice:DB$ GenericChoice | Choices$ Khans,Dragons | Defined$ You | SetChosenMode$ True | AILogic$ Khans | ShowChoice$ ExceptSelf
 SVar:Khans:DB$ Animate | Defined$ Self | Triggers$ KhansTrigger | Permanent$ True | SpellDescription$ Khans
 SVar:KhansTrigger:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ PseudoDraw | TriggerDescription$ At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card.
@@ -10,7 +10,7 @@ SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Pl
 SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play remembered card.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Dragons:DB$ Animate | Defined$ Self | Triggers$ DragonsTrigger | Permanent$ True | SpellDescription$ Dragons
-SVar:DragonsTrigger:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ SmallBurnination | TriggerDescription$ Whenever a creature you control leaves the battlefield, CARDNAME deals 1 damage to target creature or player.
-SVar:SmallBurnination:DB$ DealDamage | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1
+SVar:DragonsTrigger:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ SmallBurnination | TriggerDescription$ Whenever a creature you control leaves the battlefield, CARDNAME deals 1 damage to any target.
+SVar:SmallBurnination:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/outpost_siege.jpg
-Oracle:As Outpost Siege enters the battlefield, choose Khans or Dragons.\n• Khans — At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card.\n• Dragons — Whenever a creature you control leaves the battlefield, Outpost Siege deals 1 damage to target creature or player.
+Oracle:As Outpost Siege enters the battlefield, choose Khans or Dragons.\n• Khans — At the beginning of your upkeep, exile the top card of your library. Until end of turn, you may play that card.\n• Dragons — Whenever a creature you control leaves the battlefield, Outpost Siege deals 1 damage to any target.
diff --git a/forge-gui/res/cardsfolder/o/overblaze.txt b/forge-gui/res/cardsfolder/o/overblaze.txt
index 7482538bd4f..666d4275e16 100644
--- a/forge-gui/res/cardsfolder/o/overblaze.txt
+++ b/forge-gui/res/cardsfolder/o/overblaze.txt
@@ -2,8 +2,8 @@ Name:Overblaze
 ManaCost:3 R
 Types:Instant Arcane
 K:Splice:Arcane:2 R R
-A:SP$ Effect | Cost$ 3 R | Name$ Overblaze Effect | ValidTgts$ Permanent | RememberObjects$ Targeted | ReplacementEffects$ OverblazeEvent | SVars$ DmgTwice,X | References$ OverblazeEvent,DmgTwice,X | SpellDescription$ Each time target permanent would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead.
-SVar:OverblazeEvent:Event$ DamageDone | ValidSource$ Permanent.IsRemembered | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwice | Description$ Each time target permanent would deal noncombat damage to a creature or player this turn, it deals double that damage to that creature or player instead.
+A:SP$ Effect | Cost$ 3 R | Name$ Overblaze Effect | ValidTgts$ Permanent,Player | RememberObjects$ Targeted | ReplacementEffects$ OverblazeEvent | SVars$ DmgTwice,X | References$ OverblazeEvent,DmgTwice,X | SpellDescription$ Each time target permanent would deal damage to a permanent or player this turn, it deals double that damage to that permanent or player instead.
+SVar:OverblazeEvent:Event$ DamageDone | ValidSource$ Permanent.IsRemembered | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ Each time target permanent would deal noncombat damage to a permanent or player this turn, it deals double that damage to that permanent or player instead.
 SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:PlayMain1:TRUE
@@ -11,4 +11,4 @@ SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 DeckHints:Type$Arcane
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overblaze.jpg
-Oracle:Each time target permanent would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead.\nSplice onto Arcane {2}{R}{R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+Oracle:Each time target permanent would deal damage to a permanent or player this turn, it deals double that damage to that permanent or player instead.\nSplice onto Arcane {2}{R}{R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)