diff --git a/res/cardsfolder/acceptable_losses.txt b/res/cardsfolder/acceptable_losses.txt
index f60952f94a7..ad17b8f4c48 100644
--- a/res/cardsfolder/acceptable_losses.txt
+++ b/res/cardsfolder/acceptable_losses.txt
@@ -2,7 +2,7 @@ Name:Acceptable Losses
 ManaCost:3 R
 Types:Sorcery
 Text:no text
-A:SP$DealDamage|Cost$3 R Discard<1/Random>|Tgt$TgtC|NumDmg$5|SpellDescription$CARDNAME deals 5 damage to target creature.
+A:SP$DealDamage | Cost$ 3 R Discard<1/Random> | Tgt$ TgtC | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acceptable_losses.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/apprentice_sorcerer.txt b/res/cardsfolder/apprentice_sorcerer.txt
index f266f464d06..d15c4885565 100644
--- a/res/cardsfolder/apprentice_sorcerer.txt
+++ b/res/cardsfolder/apprentice_sorcerer.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Wizard
 Text:no text
 PT:1/1
-A:AB$DealDamage|Cost$T|Tgt$TgtCP|NumDmg$1|PlayerTurn$True|ActivatingPhases$Upkeep,Draw,Main1,BeginCombat|SpellDescription$Apprentice Sorcerer deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared.
+A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | PlayerTurn$ True | ActivatingPhases$ Upkeep,Draw,Main1,BeginCombat | SpellDescription$ Apprentice Sorcerer deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/apprentice_sorcerer.jpg
 End
diff --git a/res/cardsfolder/arashi_the_sky_asunder.txt b/res/cardsfolder/arashi_the_sky_asunder.txt
index fc178ec1cb5..7bfa9907143 100644
--- a/res/cardsfolder/arashi_the_sky_asunder.txt
+++ b/res/cardsfolder/arashi_the_sky_asunder.txt
@@ -3,7 +3,7 @@ ManaCost:3 G G
 Types:Legendary Creature Spirit
 Text:(NOTE: "Channel - X G G, Discard Arashi: Arashi deals X damage to each creature with flying." not implemented.)
 PT:5/5
-A:AB$DealDamage | Cost$X G T | ValidTgts$Creature.withFlying | TgtPrompt$Select target flying creature. | NumDmg$X | SpellDescription$CARDNAME deals X damage to target creature with flying.
+A:AB$DealDamage | Cost$ X G T | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target flying creature. | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to target creature with flying.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/armed_response.txt b/res/cardsfolder/armed_response.txt
index f406a48d0de..637d534590c 100644
--- a/res/cardsfolder/armed_response.txt
+++ b/res/cardsfolder/armed_response.txt
@@ -2,7 +2,7 @@ Name:Armed Response
 ManaCost:2 W
 Types:Instant
 Text:no text
-A:SP$DealDamage|Cost$2 W|ValidTgts$Creature.attacking|TgtPrompt$Select target Creature|NumDmg$X|SpellDescription$Armed Response deals damage to target attacking creature equal to the number of Equipment you control.
+A:SP$DealDamage | Cost$ 2 W | ValidTgts$ Creature.attacking | TgtPrompt$ Select target Creature | NumDmg$ X | SpellDescription$ Armed Response deals damage to target attacking creature equal to the number of Equipment you control.
 SVar:X:Count$Valid Equipment.YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/ben_ben_akki_hermit.txt b/res/cardsfolder/ben_ben_akki_hermit.txt
index df60e8d4277..37b1dedc498 100644
--- a/res/cardsfolder/ben_ben_akki_hermit.txt
+++ b/res/cardsfolder/ben_ben_akki_hermit.txt
@@ -3,7 +3,7 @@ ManaCost:2 R R
 Types:Legendary Creature Goblin Shaman
 Text:no text
 PT:1/1
-A:AB$DealDamage|Cost$T|ValidTgts$Creature.attacking|TgtPrompt$Select target attacking Creature|NumDmg$X|SpellDescription$Ben-Ben, Akki Hermit deals damage to target attacking creature equal to the number of untapped Mountains you control.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking Creature | NumDmg$ X | SpellDescription$ Ben-Ben, Akki Hermit deals damage to target attacking creature equal to the number of untapped Mountains you control.
 SVar:X:Count$Valid Mountain.untapped+YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/bloodpyre_elemental.txt b/res/cardsfolder/bloodpyre_elemental.txt
index 1bc71521206..8f7dc3a67a6 100644
--- a/res/cardsfolder/bloodpyre_elemental.txt
+++ b/res/cardsfolder/bloodpyre_elemental.txt
@@ -3,7 +3,7 @@ ManaCost:4 R
 Types:Creature Elemental
 Text:no text
 PT:4/1
-A:AB$DealDamage|Cost$Sac<1/CARDNAME>|Tgt$TgtC|NumDmg$4|SorcerySpeed$True|SpellDescription$Bloodpyre Elemental deals 4 damage to target creature. Activate this ability only any time you could cast a sorcery.
+A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | Tgt$ TgtC | NumDmg$ 4 | SorcerySpeed$ True | SpellDescription$ Bloodpyre Elemental deals 4 damage to target creature. Activate this ability only any time you could cast a sorcery.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodpyre_elemental.jpg
 End
diff --git a/res/cardsfolder/bloodshot_cyclops.txt b/res/cardsfolder/bloodshot_cyclops.txt
index 4c894b9bfbe..04ca0e56225 100644
--- a/res/cardsfolder/bloodshot_cyclops.txt
+++ b/res/cardsfolder/bloodshot_cyclops.txt
@@ -3,7 +3,7 @@ ManaCost:5 R
 Types:Creature Cyclops Giant
 Text:no text
 PT:4/4
-A:AB$DealDamage|Cost$T Sac<1/Creature>|Tgt$TgtCP|NumDmg$X|SpellDescription$CARDNAME deals damage equal to the sacrificed creature's power to target creature or player.
+A:AB$DealDamage | Cost$ T Sac<1/Creature> | Tgt$ TgtCP | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to the sacrificed creature's power to target creature or player.
 SVar:X:Sacrificed$CardPower
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/bosh_iron_golem.txt b/res/cardsfolder/bosh_iron_golem.txt
index b6d3cdf8e32..fde72f2f8dc 100644
--- a/res/cardsfolder/bosh_iron_golem.txt
+++ b/res/cardsfolder/bosh_iron_golem.txt
@@ -4,7 +4,7 @@ Types:Legendary Artifact Creature Golem
 Text:no text
 PT:6/7
 K:Trample
-A:AB$DealDamage|Cost$3 R Sac<1/Artifact>|Tgt$TgtCP|NumDmg$X|SpellDescription$CARDNAME deals damage equal to the sacrificed artifact's converted mana cost to target creature or player.
+A:AB$DealDamage | Cost$ 3 R Sac<1/Artifact> | Tgt$ TgtCP | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to the sacrificed artifact's converted mana cost to target creature or player.
 SVar:X:Sacrificed$CardManaCost
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/capricious_sorcerer.txt b/res/cardsfolder/capricious_sorcerer.txt
index d0bdb6c4cc9..367888982b0 100644
--- a/res/cardsfolder/capricious_sorcerer.txt
+++ b/res/cardsfolder/capricious_sorcerer.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Wizard
 Text:no text
 PT:1/1
-A:AB$DealDamage|Cost$T|Tgt$TgtCP|NumDmg$1|PlayerTurn$True|ActivatingPhases$Upkeep,Draw,Main1,BeginCombat|SpellDescription$Capricious Sorcerer deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared.
+A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | PlayerTurn$ True | ActivatingPhases$ Upkeep,Draw,Main1,BeginCombat | SpellDescription$ Capricious Sorcerer deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared.
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/po/en-us/card4250.jpg
 End
diff --git a/res/cardsfolder/chainflinger.txt b/res/cardsfolder/chainflinger.txt
index fde8acd61ce..47f4dfc8b07 100644
--- a/res/cardsfolder/chainflinger.txt
+++ b/res/cardsfolder/chainflinger.txt
@@ -3,8 +3,8 @@ ManaCost:3 R
 Types:Creature Beast
 Text:no text
 PT:2/2
-A:AB$DealDamage|Cost$1 R T|Tgt$TgtCP|NumDmg$1|SpellDescription$Chainflinger deals 1 damage to target creature or player.
-A:AB$DealDamage|Cost$2 R T|Tgt$TgtCP|NumDmg$2|Threshold$True|PrecostDesc$Threshold - |SpellDescription$Chainflinger deals 2 damage to target creature or player. Activate this ability only if seven or more cards are in your graveyard.
+A:AB$DealDamage | Cost$ 1 R T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ Chainflinger deals 1 damage to target creature or player.
+A:AB$DealDamage | Cost$ 2 R T | Tgt$ TgtCP | NumDmg$ 2 | Threshold$ True | PrecostDesc$ Threshold - | SpellDescription$ Chainflinger deals 2 damage to target creature or player. Activate this ability only if seven or more cards are in your graveyard.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chainflinger.jpg
 End
diff --git a/res/cardsfolder/chaos_charm.txt b/res/cardsfolder/chaos_charm.txt
index 21093601d59..cd7a22e7947 100644
--- a/res/cardsfolder/chaos_charm.txt
+++ b/res/cardsfolder/chaos_charm.txt
@@ -3,7 +3,7 @@ ManaCost:R
 Types:Instant
 Text:no text
 A:SP$Destroy | Cost$ R | ValidTgts$ Wall | TgtPrompt$ Select target wall | PrecostDesc$ Choose one - | SpellDescription$ Destroy target Wall;
-A:SP$DealDamage|Cost$R|Tgt$TgtC|NumDmg$1|SpellDescription$or Chaos Charm deals 1 damage to target creature;
+A:SP$DealDamage | Cost$ R | Tgt$ TgtC | NumDmg$ 1 | SpellDescription$ or Chaos Charm deals 1 damage to target creature;
 A:SP$Pump | Cost$ R | ValidTgts$ Creature | KW$ Haste | TgtPrompt$ Select target creature | SpellDescription$ or target creature gains haste until end of turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/cinder_elemental.txt b/res/cardsfolder/cinder_elemental.txt
index 380c191c746..f91e11dce35 100644
--- a/res/cardsfolder/cinder_elemental.txt
+++ b/res/cardsfolder/cinder_elemental.txt
@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Creature Elemental
 Text:no text
 PT:2/2
-A:AB$DealDamage | Cost$X R T Sac<1/CARDNAME> | Tgt$TgtCP | NumDmg$X | SpellDescription$Cinder Elemental deals X damage to target creature or player.
+A:AB$DealDamage | Cost$ X R T Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ X | SpellDescription$ Cinder Elemental deals X damage to target creature or player.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/combust.txt b/res/cardsfolder/combust.txt
index fc5861ae69f..5fa3073791f 100644
--- a/res/cardsfolder/combust.txt
+++ b/res/cardsfolder/combust.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Instant
 Text:no text
 K:CARDNAME can't be countered.
-A:SP$DealDamage|Cost$1 R|ValidTgts$Creature.White,Creature.Blue|NumDmg$5|TgtPrompt$Select target white or blue creature.|SpellDescription$CARDNAME deals 5 damage to target white or blue creature.
+A:SP$DealDamage | Cost$ 1 R | ValidTgts$ Creature.White,Creature.Blue | NumDmg$ 5 | TgtPrompt$ Select target white or blue creature. | SpellDescription$ CARDNAME deals 5 damage to target white or blue creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/combust.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/consuming_bonfire.txt b/res/cardsfolder/consuming_bonfire.txt
index 43e6e74daab..7dd52439c27 100644
--- a/res/cardsfolder/consuming_bonfire.txt
+++ b/res/cardsfolder/consuming_bonfire.txt
@@ -2,8 +2,8 @@ Name:Consuming Bonfire
 ManaCost:3 R R
 Types:Tribal Sorcery Elemental
 Text:no text
-A:SP$DealDamage|Cost$3 R R|ValidTgts$Creature.nonElemental|NumDmg$4|PrecostDesc$Choose one - |SpellDescription$CARDNAME deals 4 damage to target non-Elemental creature;
-A:SP$DealDamage|Cost$3 R R|ValidTgts$Creature.Treefolk|NumDmg$7|SpellDescription$or CARDNAME deals 7 damage to target Treefolk creature.
+A:SP$DealDamage | Cost$ 3 R R | ValidTgts$ Creature.nonElemental | NumDmg$ 4 | PrecostDesc$ Choose one - | SpellDescription$ CARDNAME deals 4 damage to target non-Elemental creature;
+A:SP$DealDamage | Cost$ 3 R R | ValidTgts$ Creature.Treefolk | NumDmg$ 7 | SpellDescription$ or CARDNAME deals 7 damage to target Treefolk creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/consuming_bonfire.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/crackling_club.txt b/res/cardsfolder/crackling_club.txt
index 57f8b657afc..8edfe95f126 100644
--- a/res/cardsfolder/crackling_club.txt
+++ b/res/cardsfolder/crackling_club.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPump:+1/+0
-A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | Tgt$C | NumDmg$1 | SpellDescription$Crackling Club deals 1 damage to target creature.
+A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | Tgt$C | NumDmg$1 | SpellDescription$ Crackling Club deals 1 damage to target creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crackling_club.jpg
diff --git a/res/cardsfolder/darigaazs_charm.txt b/res/cardsfolder/darigaazs_charm.txt
index 50682d2e045..338f4f87c45 100644
--- a/res/cardsfolder/darigaazs_charm.txt
+++ b/res/cardsfolder/darigaazs_charm.txt
@@ -3,7 +3,7 @@ ManaCost:B R G
 Types:Instant
 Text:no text
 A:SP$Retrieve | Cost$ B R G | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature | Destination$ Hand | PrecostDesc$ Choose one - | SpellDescription$ Return target creature card from your graveyard to your hand;
-A:SP$DealDamage|Cost$B R G|Tgt$TgtCP|NumDmg$3|SpellDescription$or Darigaaz's Charm deals 3 damage to target creature or player;
+A:SP$DealDamage | Cost$ B R G | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ or Darigaaz's Charm deals 3 damage to target creature or player;
 A:SP$Pump | Cost$ B R G | ValidTgts$ Creature | NumAtt$ +3 | NumDef$ +3 | TgtPrompt$ Select target creature | SpellDescription$ or target creature gets +3/+3 until end of turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/desert.txt b/res/cardsfolder/desert.txt
index 4f324d9e3af..e7d5aade55d 100644
--- a/res/cardsfolder/desert.txt
+++ b/res/cardsfolder/desert.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 K:tap: add 1
-A:AB$DealDamage|Cost$T|ValidTgts$Creature.attacking|TgtPrompt$Select target attacking Creature|NumDmg$1|ActivatingPhases$EndCombat|SpellDescription$Desert deals 1 damage to target attacking creature. Activate this ability only during the end of combat step.
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature.attacking | TgtPrompt$ Select target attacking Creature | NumDmg$ 1 | ActivatingPhases$ EndCombat | SpellDescription$ Desert deals 1 damage to target attacking creature. Activate this ability only during the end of combat step.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/desert.jpg
diff --git a/res/cardsfolder/emberwilde_augur.txt b/res/cardsfolder/emberwilde_augur.txt
index b075ffdeaba..853c20f753c 100644
--- a/res/cardsfolder/emberwilde_augur.txt
+++ b/res/cardsfolder/emberwilde_augur.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Goblin Shaman
 Text:no text
 PT:2/1
-A:AB$DealDamage|Cost$Sac<1/CARDNAME>|NumDmg$3|PlayerTurn$True|ActivatingPhases$Upkeep|SpellDescription$Emberwilde Augur deals 3 damage to target player. Activate this ability only during your upkeep.
+A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | NumDmg$ 3 | PlayerTurn$ True | ActivatingPhases$ Upkeep | SpellDescription$ Emberwilde Augur deals 3 damage to target player. Activate this ability only during your upkeep.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/emberwilde_augur.jpg
 End
diff --git a/res/cardsfolder/fiery_conclusion.txt b/res/cardsfolder/fiery_conclusion.txt
index ab31e9e9137..8397233c88b 100644
--- a/res/cardsfolder/fiery_conclusion.txt
+++ b/res/cardsfolder/fiery_conclusion.txt
@@ -2,7 +2,7 @@ Name:Fiery Conclusion
 ManaCost:1 R
 Types:Instant
 Text:no text
-A:SP$DealDamage|Cost$1 R Sac<1/Creature>|Tgt$TgtC|NumDmg$5|SpellDescription$CARDNAME deals 5 damage to target creature.
+A:SP$DealDamage | Cost$ 1 R Sac<1/Creature> | Tgt$ TgtC | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fiery_conclusion.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/fireblast.txt b/res/cardsfolder/fireblast.txt
index 9683be7aa5d..eec4303a2ea 100644
--- a/res/cardsfolder/fireblast.txt
+++ b/res/cardsfolder/fireblast.txt
@@ -2,7 +2,7 @@ Name:Fireblast
 ManaCost:4 R R
 Types:Instant
 Text:no text
-A:SP$DealDamage|Cost$4 R R|Tgt$TgtCP|NumDmg$4|SpellDescription$CARDNAME deals 4 damage to target creature or player.
+A:SP$DealDamage | Cost$ 4 R R | Tgt$ TgtCP | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature or player.
 SVar:AltCost:Sac<2/Mountain>
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fireblast.jpg
diff --git a/res/cardsfolder/flame_jab.txt b/res/cardsfolder/flame_jab.txt
index 4958d94021f..839fc1c3532 100644
--- a/res/cardsfolder/flame_jab.txt
+++ b/res/cardsfolder/flame_jab.txt
@@ -2,8 +2,8 @@ Name:Flame Jab
 ManaCost:R
 Types:Sorcery
 Text:no text
-A:SP$DealDamage|Cost$R|Tgt$TgtCP|NumDmg$1|SpellDescription$Flame Jab deals 1 damage to target creature or player.
-A:SP$DealDamage|Cost$R Discard<1/Land>|ActivatingZone$Graveyard|PrecostDesc$Retrace - |Tgt$TgtCP|NumDmg$1|SpellDescription$Flame Jab deals 1 damage to target creature or player. You may play this card from your graveyard.
+A:SP$DealDamage | Cost$ R | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ Flame Jab deals 1 damage to target creature or player.
+A:SP$DealDamage | Cost$ R Discard<1/Land> | ActivatingZone$ Graveyard | PrecostDesc$ Retrace - | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ Flame Jab deals 1 damage to target creature or player. You may play this card from your graveyard.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flame_jab.jpg
 End
diff --git a/res/cardsfolder/flare.txt b/res/cardsfolder/flare.txt
index 9cb6887a4c2..af924bbb17c 100644
--- a/res/cardsfolder/flare.txt
+++ b/res/cardsfolder/flare.txt
@@ -2,7 +2,7 @@ Name:Flare
 ManaCost:2 R
 Types:Instant
 Text:no text
-A:SP$DealDamage|Cost$2 R|Tgt$TgtCP|NumDmg$1|SpellDescription$Flare deals 1 damage to target creature or player.
+A:SP$DealDamage | Cost$ 2 R | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ Flare deals 1 damage to target creature or player.
 K:Draw a card at the beginning of the next turn's upkeep.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flare.jpg
diff --git a/res/cardsfolder/fling.txt b/res/cardsfolder/fling.txt
index eaffbdcdb43..c48c4c9a519 100644
--- a/res/cardsfolder/fling.txt
+++ b/res/cardsfolder/fling.txt
@@ -2,9 +2,9 @@ Name:Fling
 ManaCost:1 R
 Types:Instant
 Text:no text
-A:SP$DealDamage|Cost$1 R Sac<1/Creature>|Tgt$TgtCP|NumDmg$X|SpellDescription$CARDNAME deals damage equal to the sacrificed creature's power.
+A:SP$DealDamage | Cost$ 1 R Sac<1/Creature> | Tgt$ TgtCP | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to the sacrificed creature's power.
 SVar:X:Sacrificed$CardPower
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fling.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/ghost_lit_raider.txt b/res/cardsfolder/ghost_lit_raider.txt
index 5173dd91d22..3412237e367 100644
--- a/res/cardsfolder/ghost_lit_raider.txt
+++ b/res/cardsfolder/ghost_lit_raider.txt
@@ -2,9 +2,9 @@ Name:Ghost-Lit Raider
 ManaCost:2 R
 Types:Creature Spirit
 Text:no text
-A:AB$DealDamage|Cost$2 R T|Tgt$TgtC|NumDmg$2|SpellDescription$CARDNAME deals 2 damage to target creature.
-A:AB$DealDamage|Cost$3 R Discard<1/CARDNAME>|Tgt$TgtC|NumDmg$4|ActivatingZone$Hand|SpellDescription$CARDNAME deals 4 damage to target creature.
+A:AB$DealDamage | Cost$ 2 R T | Tgt$ TgtC | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature.
+A:AB$DealDamage | Cost$ 3 R Discard<1/CARDNAME> | Tgt$ TgtC | NumDmg$ 4 | ActivatingZone$ Hand | SpellDescription$ CARDNAME deals 4 damage to target creature.
 PT:2/1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghost_lit_raider.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/goblin_firestarter.txt b/res/cardsfolder/goblin_firestarter.txt
index 198e015017b..5dc010a19e4 100644
--- a/res/cardsfolder/goblin_firestarter.txt
+++ b/res/cardsfolder/goblin_firestarter.txt
@@ -3,7 +3,7 @@ ManaCost:R
 Types:Creature Goblin
 Text:no text
 PT:1/1
-A:AB$DealDamage|Cost$Sac<1/CARDNAME>|Tgt$TgtCP|NumDmg$1|PlayerTurn$True|ActivatingPhases$Upkeep,Draw,Main1,BeginCombat|SpellDescription$Goblin Firestarter deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared.
+A:AB$DealDamage | Cost$ Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 1 | PlayerTurn$ True | ActivatingPhases$ Upkeep,Draw,Main1,BeginCombat | SpellDescription$ Goblin Firestarter deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_firestarter.jpg
 End
diff --git a/res/cardsfolder/goblin_grenade.txt b/res/cardsfolder/goblin_grenade.txt
index db6778b7d28..ba9838096a7 100644
--- a/res/cardsfolder/goblin_grenade.txt
+++ b/res/cardsfolder/goblin_grenade.txt
@@ -2,7 +2,7 @@ Name:Goblin Grenade
 ManaCost:R
 Types:Sorcery
 Text:no text
-A:SP$DealDamage|Cost$R Sac<1/Goblin>|Tgt$TgtCP|NumDmg$5|SpellDescription$CARDNAME deals 5 damage to target creature or player.
+A:SP$DealDamage | Cost$ R Sac<1/Goblin> | Tgt$ TgtCP | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_grenade.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/hammer_of_bogardan.txt b/res/cardsfolder/hammer_of_bogardan.txt
index 35fcea9a4e9..56f776c55a4 100644
--- a/res/cardsfolder/hammer_of_bogardan.txt
+++ b/res/cardsfolder/hammer_of_bogardan.txt
@@ -2,7 +2,7 @@ Name:Hammer of Bogardan
 ManaCost:1 R R
 Types:Sorcery
 Text:no text
-A:SP$DealDamage|Cost$1 R R|Tgt$TgtCP|NumDmg$3|SpellDescription$CARDNAME deals 3 damage to target creature or player.
+A:SP$DealDamage | Cost$ 1 R R | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player.
 A:AB$Retrieve | Cost$ 2 R R R | Destination$ Hand | ActivatingZone$ Graveyard | ActivatingPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Return Hammer of Bogardan from your graveyard to your hand. Activate this ability only during your upkeep.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hammer_of_bogardan.jpg
diff --git a/res/cardsfolder/icatian_javelineers.txt b/res/cardsfolder/icatian_javelineers.txt
index fb7c7c07436..a37e2f4849f 100644
--- a/res/cardsfolder/icatian_javelineers.txt
+++ b/res/cardsfolder/icatian_javelineers.txt
@@ -4,7 +4,7 @@ Types:Creature Human Soldier
 Text:no text
 PT:1/1
 K:etbCounter:JAVELIN:1
-A:AB$DealDamage|Cost$T SubCounter<1/JAVELIN>|Tgt$TgtCP|NumDmg$1|SpellDescription$Icatian Javelineers deals 1 damage to target creature or player.  
+A:AB$DealDamage | Cost$ T SubCounter<1/JAVELIN> | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ Icatian Javelineers deals 1 damage to target creature or player.  
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/icatian_javelineers.jpg
 End
diff --git a/res/cardsfolder/jagged_lightning.txt b/res/cardsfolder/jagged_lightning.txt
index fb3dd7e86be..a5d221fdae0 100644
--- a/res/cardsfolder/jagged_lightning.txt
+++ b/res/cardsfolder/jagged_lightning.txt
@@ -2,7 +2,7 @@ Name:Jagged Lightning
 ManaCost:3 R R
 Types:Sorcery
 Text:no text
-A:SP$DealDamage|Cost$3 R R|TargetMin$2|TargetMax$2|ValidTgts$Creature|TgtPrompt$Select target creature|NumDmg$3|SpellDescription$Jagged Lightning deals 3 damage to each of two target creatures.
+A:SP$DealDamage | Cost$ 3 R R | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | SpellDescription$ Jagged Lightning deals 3 damage to each of two target creatures.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jagged_lightning.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/keldon_megaliths.txt b/res/cardsfolder/keldon_megaliths.txt
index 5565d75327e..d1a8ad28bae 100644
--- a/res/cardsfolder/keldon_megaliths.txt
+++ b/res/cardsfolder/keldon_megaliths.txt
@@ -4,7 +4,7 @@ Types:Land
 Text:no text
 K:CARDNAME enters the battlefield tapped.
 K:tap: add R
-A:AB$DealDamage|Cost$1 R T|Tgt$TgtCP|NumDmg$1|ActivatingCardsInHand$0|PrecostDesc$Hellbent - |SpellDescription$Keldon Megaliths deals 1 damage to target creature or player. Activate this ability only if you have no cards in hand.
+A:AB$DealDamage | Cost$ 1 R T | Tgt$ TgtCP | NumDmg$ 1 | ActivatingCardsInHand$ 0 | PrecostDesc$ Hellbent - | SpellDescription$ Keldon Megaliths deals 1 damage to target creature or player. Activate this ability only if you have no cards in hand.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/keldon_megaliths.jpg
 End
diff --git a/res/cardsfolder/lava_dart.txt b/res/cardsfolder/lava_dart.txt
index 5e24e1da124..ba524a55430 100644
--- a/res/cardsfolder/lava_dart.txt
+++ b/res/cardsfolder/lava_dart.txt
@@ -2,8 +2,8 @@ Name:Lava Dart
 ManaCost:R
 Types:Instant
 Text:no text
-A:SP$DealDamage|Cost$R|Tgt$TgtCP|NumDmg$1|SpellDescription$CARDNAME deals 1 damage to target creature or player.
+A:SP$DealDamage | Cost$ R | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 K:Flashback:Sac<1/Mountain>
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lava_dart.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/magma_rift.txt b/res/cardsfolder/magma_rift.txt
index e206bf92040..a7301e050f1 100644
--- a/res/cardsfolder/magma_rift.txt
+++ b/res/cardsfolder/magma_rift.txt
@@ -2,7 +2,7 @@ Name:Magma Rift
 ManaCost:2 R
 Types:Sorcery
 Text:no text
-A:SP$DealDamage|Cost$2 R Sac<1/Land>|Tgt$TgtC|NumDmg$5|SpellDescription$CARDNAME deals 5 damage to target creature.
+A:SP$DealDamage | Cost$ 2 R Sac<1/Land> | Tgt$ TgtC | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magma_rift.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/parch.txt b/res/cardsfolder/parch.txt
index 4e2d1971694..31b4c99dc9b 100644
--- a/res/cardsfolder/parch.txt
+++ b/res/cardsfolder/parch.txt
@@ -2,8 +2,8 @@ Name:Parch
 ManaCost:1 R
 Types:Instant
 Text:no text
-A:SP$DealDamage|Cost$1 R|NumDmg$2|Tgt$TgtCP|PrecostDesc$Choose one - |SpellDescription$Parch deals 2 damage to target creature or player;
-A:SP$DealDamage|Cost$1 R|NumDmg$4|ValidTgts$Creature.Blue|TgtPrompt$Select target blue creature.|SpellDescription$or Parch deals 4 damage to target blue creature.
+A:SP$DealDamage | Cost$ 1 R | NumDmg$ 2 | Tgt$ TgtCP | PrecostDesc$ Choose one - | SpellDescription$ Parch deals 2 damage to target creature or player;
+A:SP$DealDamage | Cost$ 1 R | NumDmg$ 4 | ValidTgts$ Creature.Blue | TgtPrompt$ Select target blue creature. | SpellDescription$ or Parch deals 4 damage to target blue creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/parch.jpg
 End
diff --git a/res/cardsfolder/prodigal_pyromancer.txt b/res/cardsfolder/prodigal_pyromancer.txt
index 10a48bd288c..549ec2c3f35 100644
--- a/res/cardsfolder/prodigal_pyromancer.txt
+++ b/res/cardsfolder/prodigal_pyromancer.txt
@@ -3,8 +3,10 @@ ManaCost:2 R
 Types:Creature Human Wizard
 Text:no text
 PT:1/1
-# K:abDamageTgtCP T:1
-A:AB$DealDamage|Cost$T|Tgt$TgtCP|NumDmg$1|SpellDescription$Prodigal Pyromancer deals 1 damage to target creature or player.
+A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ Prodigal Pyromancer deals 1 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/plc/en-us/card122338.jpg
 End
+#
+# K:abDamageTgtCP T:1
+#
diff --git a/res/cardsfolder/psychic_purge.txt b/res/cardsfolder/psychic_purge.txt
index 6844ab7bff5..4bbca1157b3 100644
--- a/res/cardsfolder/psychic_purge.txt
+++ b/res/cardsfolder/psychic_purge.txt
@@ -2,7 +2,7 @@ Name:Psychic Purge
 ManaCost:U
 Types:Sorcery
 Text:When a spell or ability an opponent controls causes you to discard Psychic Purge, that player loses 5 life.\r\n
-A:SP$DealDamage|Cost$U|Tgt$TgtCP|NumDmg$1|SpellDescription$CARDNAME deals 1 damage to target creature or player.
+A:SP$DealDamage | Cost$ U | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/psychic_purge.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/reckless_abandon.txt b/res/cardsfolder/reckless_abandon.txt
index 551e75abd2a..826fe63936d 100644
--- a/res/cardsfolder/reckless_abandon.txt
+++ b/res/cardsfolder/reckless_abandon.txt
@@ -2,7 +2,7 @@ Name:Reckless Abandon
 ManaCost:R
 Types:Sorcery
 Text:no text
-A:SP$DealDamage|Cost$R Sac<1/Creature>|Tgt$TgtCP|NumDmg$4|SpellDescription$CARDNAME deals 4 damage to target creature or player.
+A:SP$DealDamage | Cost$ R Sac<1/Creature> | Tgt$ TgtCP | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/reckless_abandon.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/scorching_missile.txt b/res/cardsfolder/scorching_missile.txt
index ed05bc03d29..41591ddae32 100644
--- a/res/cardsfolder/scorching_missile.txt
+++ b/res/cardsfolder/scorching_missile.txt
@@ -2,8 +2,8 @@ Name:Scorching Missile
 ManaCost:3 R
 Types:Sorcery
 Text:no text
-A:SP$DealDamage|Cost$3 R|Tgt$TgtP|NumDmg$4|SpellDescription$CARDNAME deals 4 damage to target player.
+A:SP$DealDamage | Cost$ 3 R | Tgt$ TgtP | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target player.
 K:Flashback:9 R
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scorching_missile.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/shard_volley.txt b/res/cardsfolder/shard_volley.txt
index 902cc5d4a5a..d7116efe8bf 100644
--- a/res/cardsfolder/shard_volley.txt
+++ b/res/cardsfolder/shard_volley.txt
@@ -2,7 +2,7 @@ Name:Shard Volley
 ManaCost:R
 Types:Instant
 Text:no text
-A:SP$DealDamage|Cost$R Sac<1/Land>|Tgt$TgtCP|NumDmg$3|SpellDescription$CARDNAME deals 3 damage to target creature or player.
+A:SP$DealDamage | Cost$ R Sac<1/Land> | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shard_volley.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/shock.txt b/res/cardsfolder/shock.txt
index a5ddc917eb4..a5a92819edb 100644
--- a/res/cardsfolder/shock.txt
+++ b/res/cardsfolder/shock.txt
@@ -2,8 +2,10 @@ Name:Shock
 ManaCost:R
 Types:Instant
 Text:no text
-# K:spDamageTgtCP:2
-A:SP$DealDamage|Cost$R|Tgt$TgtCP|NumDmg$2|SpellDescription$Shock deals 2 damage to target creature or player.
+A:SP$DealDamage | Cost$ R | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ Shock deals 2 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shock.jpg
 End
+#
+# K:spDamageTgtCP:2
+#
diff --git a/res/cardsfolder/shrapnel_blast.txt b/res/cardsfolder/shrapnel_blast.txt
index edf35c440a1..1a7b1ff3c27 100644
--- a/res/cardsfolder/shrapnel_blast.txt
+++ b/res/cardsfolder/shrapnel_blast.txt
@@ -2,7 +2,7 @@ Name:Shrapnel Blast
 ManaCost:1 R
 Types:Instant
 Text:no text
-A:SP$DealDamage|Cost$1 R Sac<1/Artifact>|Tgt$TgtCP|NumDmg$5|SpellDescription$CARDNAME deals 5 damage to target creature or player.
+A:SP$DealDamage | Cost$ 1 R Sac<1/Artifact> | Tgt$ TgtCP | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shrapnel_blast.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/sonic_burst.txt b/res/cardsfolder/sonic_burst.txt
index 8fbd43a43b4..a84e835eb9c 100644
--- a/res/cardsfolder/sonic_burst.txt
+++ b/res/cardsfolder/sonic_burst.txt
@@ -2,7 +2,7 @@ Name:Sonic Burst
 ManaCost:1 R
 Types:Instant
 Text:no text
-A:SP$DealDamage|Cost$1 R Discard<1/Random>|Tgt$TgtCP|NumDmg$4|SpellDescription$CARDNAME deals 4 damage to target creature or player.
+A:SP$DealDamage | Cost$ 1 R Discard<1/Random> | Tgt$ TgtCP | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sonic_burst.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/sonic_seizure.txt b/res/cardsfolder/sonic_seizure.txt
index fdc4939074f..e8c4eb9a79f 100644
--- a/res/cardsfolder/sonic_seizure.txt
+++ b/res/cardsfolder/sonic_seizure.txt
@@ -2,7 +2,7 @@ Name:Sonic Seizure
 ManaCost:R
 Types:Instant
 Text:no text
-A:SP$DealDamage|Cost$R Discard<1/Random>|Tgt$TgtCP|NumDmg$3|SpellDescription$CARDNAME deals 3 damage to target creature or player.
+A:SP$DealDamage | Cost$ R Discard<1/Random> | Tgt$ TgtCP | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target creature or player.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sonic_seizure.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/strafe.txt b/res/cardsfolder/strafe.txt
index 735874741af..1e06f7594b0 100644
--- a/res/cardsfolder/strafe.txt
+++ b/res/cardsfolder/strafe.txt
@@ -2,7 +2,7 @@ Name:Strafe
 ManaCost:R
 Types:Sorcery
 Text:no text
-A:SP$DealDamage|Cost$R|ValidTgts$Creature.nonRed|TgtPrompt$Select target nonred Creature|NumDmg$3|SpellDescription$Strafe deals 3 damage to target nonred creature.
+A:SP$DealDamage | Cost$ R | ValidTgts$ Creature.nonRed | TgtPrompt$ Select target nonred Creature | NumDmg$ 3 | SpellDescription$ Strafe deals 3 damage to target nonred creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/strafe.jpg
 End
diff --git a/res/cardsfolder/sunlance.txt b/res/cardsfolder/sunlance.txt
index 95e3243b149..7a1fd396d1c 100644
--- a/res/cardsfolder/sunlance.txt
+++ b/res/cardsfolder/sunlance.txt
@@ -2,7 +2,7 @@ Name:Sunlance
 ManaCost:W
 Types:Sorcery
 Text:no text
-A:SP$DealDamage|Cost$W|ValidTgts$Creature.nonWhite|TgtPrompt$Select target nonwhite Creature|NumDmg$3|SpellDescription$Sunlance deals 3 damage to target nonwhite creature.
+A:SP$DealDamage | Cost$ W | ValidTgts$ Creature.nonWhite | TgtPrompt$ Select target nonwhite Creature | NumDmg$ 3 | SpellDescription$ Sunlance deals 3 damage to target nonwhite creature.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/plc/en-us/card122355.jpg
 End
diff --git a/res/cardsfolder/swelter.txt b/res/cardsfolder/swelter.txt
index fcb4952edeb..13442d50880 100644
--- a/res/cardsfolder/swelter.txt
+++ b/res/cardsfolder/swelter.txt
@@ -2,7 +2,7 @@ Name:Swelter
 ManaCost:3 R
 Types:Sorcery
 Text:no text
-A:SP$DealDamage|Cost$3 R|TargetMin$2|TargetMax$2|ValidTgts$Creature|TgtPrompt$Select target creature|NumDmg$2|SpellDescription$Swelter deals 2 damage to each of two target creatures.
+A:SP$DealDamage | Cost$ 3 R | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 2 | SpellDescription$ Swelter deals 2 damage to each of two target creatures.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/swelter.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/task_mage_assembly.txt b/res/cardsfolder/task_mage_assembly.txt
index 34a31ec492e..bea4182e091 100644
--- a/res/cardsfolder/task_mage_assembly.txt
+++ b/res/cardsfolder/task_mage_assembly.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Enchantment
 Text:no text
 K:When there are no creatures on the battlefield, sacrifice CARDNAME.
-A:AB$DealDamage|Cost$2|Tgt$TgtC|NumDmg$1|AnyPlayer$True|SorcerySpeed$True|SpellDescription$CARDNAME deals 1 damage to target creature. Any player may activate this ability but only any time he or she could cast a sorcery.
+A:AB$DealDamage | Cost$ 2 | Tgt$ TgtC | NumDmg$ 1 | AnyPlayer$ True | SorcerySpeed$ True | SpellDescription$ CARDNAME deals 1 damage to target creature. Any player may activate this ability but only any time he or she could cast a sorcery.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/task_mage_assembly.jpg
 End
diff --git a/res/cardsfolder/thunderclap.txt b/res/cardsfolder/thunderclap.txt
index 99180e12a42..ca057c779f5 100644
--- a/res/cardsfolder/thunderclap.txt
+++ b/res/cardsfolder/thunderclap.txt
@@ -2,7 +2,7 @@ Name:Thunderclap
 ManaCost:2 R
 Types:Instant
 Text:no text
-A:SP$DealDamage|Cost$2 R|Tgt$TgtC|NumDmg$2|SpellDescription$Thunderclap deals 3 damage to target creature.
+A:SP$DealDamage | Cost$ 2 R | Tgt$ TgtC | NumDmg$ 3 | SpellDescription$ Thunderclap deals 3 damage to target creature.
 SVar:AltCost:Sac<1/Mountain>
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thunderclap.jpg
diff --git a/res/cardsfolder/war_torch_goblin.txt b/res/cardsfolder/war_torch_goblin.txt
index deab4055771..09146ba5404 100644
--- a/res/cardsfolder/war_torch_goblin.txt
+++ b/res/cardsfolder/war_torch_goblin.txt
@@ -3,7 +3,7 @@ ManaCost:R
 Types:Creature Goblin Warrior
 Text:no text
 PT:1/1
-A:AB$DealDamage|Cost$R Sac<1/CARDNAME>:|ValidTgts$Creature.blocking|TgtPrompt$Select target blocking creature|NumDmg$2|SpellDescription$War-Torch Goblin deals 2 damage to target blocking creature.
+A:AB$DealDamage | Cost$ R Sac<1/CARDNAME> | ValidTgts$ Creature.blocking | TgtPrompt$ Select target blocking creature | NumDmg$ 2 | SpellDescription$ War-Torch Goblin deals 2 damage to target blocking creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/war_torch_goblin.jpg
diff --git a/res/cardsfolder/witch_hunter.txt b/res/cardsfolder/witch_hunter.txt
index 61cdc479410..d565b66fbcb 100644
--- a/res/cardsfolder/witch_hunter.txt
+++ b/res/cardsfolder/witch_hunter.txt
@@ -3,8 +3,10 @@ ManaCost:2 W W
 Types:Creature Human Cleric
 Text:no text
 PT:1/1
-#K:abDamageTgtP T:1
-A:AB$DealDamage|Cost$T|NumDmg$1|Tgt$TgtP|SpellDescription$CARDNAME deals 1 damage to target player.
+A:AB$DealDamage | Cost$ T | NumDmg$ 1 | Tgt$ TgtP | SpellDescription$ CARDNAME deals 1 damage to target player.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/witch_hunter.jpg
 End
+#
+#K:abDamageTgtP T:1
+#
diff --git a/res/cardsfolder/wu_longbowman.txt b/res/cardsfolder/wu_longbowman.txt
index 795eef8ccfd..a50e8eeda14 100644
--- a/res/cardsfolder/wu_longbowman.txt
+++ b/res/cardsfolder/wu_longbowman.txt
@@ -3,7 +3,7 @@ ManaCost:2 U
 Types:Creature Human Soldier Archer
 Text:no text
 PT:1/1
-A:AB$DealDamage|Cost$T|Tgt$TgtCP|NumDmg$1|PlayerTurn$True|ActivatingPhases$Upkeep,Draw,Main1,BeginCombat|SpellDescription$Wu Longbowman deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared.
+A:AB$DealDamage | Cost$ T | Tgt$ TgtCP | NumDmg$ 1 | PlayerTurn$ True | ActivatingPhases$ Upkeep,Draw,Main1,BeginCombat | SpellDescription$ Wu Longbowman deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wu_longbowman.jpg
 End