diff --git a/res/cardsfolder/knight_of_stromgald.txt b/res/cardsfolder/knight_of_stromgald.txt
index 3ec239b7e7e..989072a7891 100644
--- a/res/cardsfolder/knight_of_stromgald.txt
+++ b/res/cardsfolder/knight_of_stromgald.txt
@@ -4,10 +4,10 @@ Types:Creature Human Knight
 Text:no text
 PT:2/1
 K:Protection from white
-K:abPump B:First Strike
-K:abPump B B:+1/+0
+A:AB$Pump | Cost$ B | KW$ First Strike | SpellDescription$ Knight of Stromgald gains first strike until end of turn.
+A:AB$Pump | Cost$ B B | NumAtt$ +1 | SpellDescription$ Knight of Stromgald gets +1/+0 until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/knight_of_stromgald.jpg
 SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/33.jpg
 SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/26.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/kranioceros.txt b/res/cardsfolder/kranioceros.txt
index 359e7616152..2c11dd865c9 100644
--- a/res/cardsfolder/kranioceros.txt
+++ b/res/cardsfolder/kranioceros.txt
@@ -3,8 +3,8 @@ ManaCost:4 R
 Types:Creature Beast
 Text:no text
 PT:5/2
-K:abPump 1 W:+0/+3
+A:AB$Pump | Cost$ 1 W | NumDef$ +3 | SpellDescription$ Kranioceros gets +0/+3 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kranioceros.jpg
 SetInfo:CFX|Common|http://magiccards.info/scans/en/cfx/67.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/leaping_lizard.txt b/res/cardsfolder/leaping_lizard.txt
index 1a89817784b..e1cbc63c0b4 100644
--- a/res/cardsfolder/leaping_lizard.txt
+++ b/res/cardsfolder/leaping_lizard.txt
@@ -3,8 +3,8 @@ ManaCost:1 G G
 Types:Creature Lizard
 Text:no text
 PT:2/3
-K:abPump 1 G:-0/-1/Flying
+A:AB$Pump | Cost$ 1 G | NumDef$ -1 | KW$ Flying | SpellDescription$ Leaping Lizard gains flying and gets -0/-1 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/leaping_lizard.jpg
 SetInfo:HML|Uncommon|http://magiccards.info/scans/en/hl/63.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/lightning_dragon.txt b/res/cardsfolder/lightning_dragon.txt
index a241113261c..421738f9434 100644
--- a/res/cardsfolder/lightning_dragon.txt
+++ b/res/cardsfolder/lightning_dragon.txt
@@ -5,8 +5,8 @@ Text:no text
 PT:4/4
 K:Flying
 K:Echo:2 R R
-K:abPump R:+1/+0
+A:AB$Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ Lightning Dragon gets +1/+0 until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lightning_dragon.jpg
 SetInfo:USG|Rare|http://magiccards.info/scans/en/us/202.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/lionheart_maverick.txt b/res/cardsfolder/lionheart_maverick.txt
index c4fd2f0251c..6a0ba0ca9c2 100644
--- a/res/cardsfolder/lionheart_maverick.txt
+++ b/res/cardsfolder/lionheart_maverick.txt
@@ -4,8 +4,8 @@ Types:Creature Human Knight
 Text:no text
 PT:1/1
 K:Vigilance
-K:abPump 4 W:+1/+2
+A:AB$Pump | Cost$ 4 W | NumAtt$ +1 | NumDef$ +2 | SpellDescription$ Lionheart Maverick gets +1/+2 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lionheart_maverick.jpg
 SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/11.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/lithatog.txt b/res/cardsfolder/lithatog.txt
index ae43e0158fa..8c8aca70d19 100644
--- a/res/cardsfolder/lithatog.txt
+++ b/res/cardsfolder/lithatog.txt
@@ -3,9 +3,9 @@ ManaCost:1 R G
 Types:Creature Atog
 Text:no text
 PT:1/2
-K:abPump Sac<1/Artifact>:+1/+1
-K:abPump Sac<1/Land>:+1/+1
+A:AB$Pump | Cost$ Sac<1/Artifact> | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Lithatog gets +1/+1 until end of turn.
+A:AB$Pump | Cost$ Sac<1/Land> | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Lithatog gets +1/+1 until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lithatog.jpg
 SetInfo:ODY|Uncommon|http://magiccards.info/scans/en/od/289.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/llanowar_cavalry.txt b/res/cardsfolder/llanowar_cavalry.txt
index 167953586a8..3f85c38c982 100644
--- a/res/cardsfolder/llanowar_cavalry.txt
+++ b/res/cardsfolder/llanowar_cavalry.txt
@@ -3,8 +3,8 @@ ManaCost:2 G
 Types:Creature Human Soldier
 Text:no text
 PT:1/4
-K:abPump W:Vigilance
+A:AB$Pump | Cost$ W | KW$ Vigilance | SpellDescription$ Llanowar Cavalry gains vigilance until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/llanowar_cavalry.jpg
 SetInfo:INV|Common|http://magiccards.info/scans/en/in/195.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/loch_korrigan.txt b/res/cardsfolder/loch_korrigan.txt
index 2912d72a462..d850321a143 100644
--- a/res/cardsfolder/loch_korrigan.txt
+++ b/res/cardsfolder/loch_korrigan.txt
@@ -3,8 +3,8 @@ ManaCost:3 B
 Types:Creature Spirit
 Text:no text
 PT:1/1
-K:abPump UB:+1/+1
+A:AB$Pump | Cost$ UB | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Loch Korrigan gets +1/+1 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/loch_korrigan.jpg
 SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/71.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/lodestone_myr.txt b/res/cardsfolder/lodestone_myr.txt
index 9dffc21bd3a..1576a17d0ff 100644
--- a/res/cardsfolder/lodestone_myr.txt
+++ b/res/cardsfolder/lodestone_myr.txt
@@ -4,8 +4,8 @@ Types:Artifact Creature Myr
 Text:no text
 PT:2/2
 K:Trample
-K:abPump tapXType<1/Artifact>:+1/+1
+A:AB$Pump | Cost$ tapXType<1/Artifact> | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Lodestone Myr gets +1/+1 until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lodestone_myr.jpg
 SetInfo:MRD|Rare|http://magiccards.info/scans/en/mi/200.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/looming_shade.txt b/res/cardsfolder/looming_shade.txt
index f37995bfd53..63caed3e477 100644
--- a/res/cardsfolder/looming_shade.txt
+++ b/res/cardsfolder/looming_shade.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Shade
 Text:no text
 PT:1/1
-K:abPump B:+1/+1
+A:AB$Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Looming Shade gets +1/+1 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/looming_shade.jpg
 SetInfo:8ED|Common|http://magiccards.info/scans/en/8e/140.jpg
@@ -12,4 +12,4 @@ SetInfo:7ED|Common|http://magiccards.info/scans/en/7e/145.jpg
 SetInfo:9ED|Common|http://magiccards.info/scans/en/9e/142.jpg
 SetInfo:10E|Common|http://magiccards.info/scans/en/10e/153.jpg
 SetInfo:M10|Common|http://magiccards.info/scans/en/m10/103.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/loxodon_stalwart.txt b/res/cardsfolder/loxodon_stalwart.txt
index af764dd0401..6a7c12056c3 100644
--- a/res/cardsfolder/loxodon_stalwart.txt
+++ b/res/cardsfolder/loxodon_stalwart.txt
@@ -4,8 +4,8 @@ Types:Creature Elephant Soldier
 Text:no text
 PT:3/3
 K:Vigilance
-K:abPump W:+0/+1
+A:AB$Pump | Cost$ W | NumDef$ +1 | SpellDescription$ Loxodon Stalwart gets +0/+1 until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/loxodon_stalwart.jpg
 SetInfo:5DN|Uncommon|http://magiccards.info/scans/en/5dn/11.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/malachite_golem.txt b/res/cardsfolder/malachite_golem.txt
index ebfa5d37641..b2526eb0600 100644
--- a/res/cardsfolder/malachite_golem.txt
+++ b/res/cardsfolder/malachite_golem.txt
@@ -3,8 +3,8 @@ ManaCost:6
 Types:Artifact Creature Golem
 Text:no text
 PT:5/3
-K:abPump 1 G:Trample
+A:AB$Pump | Cost$ 1 G | KW$ Trample | SpellDescription$ Malachite Golem gains trample until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/malachite_golem.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/202.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/manta_riders.txt b/res/cardsfolder/manta_riders.txt
index 6848a01db04..a6d74330d81 100644
--- a/res/cardsfolder/manta_riders.txt
+++ b/res/cardsfolder/manta_riders.txt
@@ -3,8 +3,8 @@ ManaCost:U
 Types:Creature Merfolk
 Text:no text
 PT:1/1
-K:abPump U:Flying
+A:AB$Pump | Cost$ U | KW$ Flying | SpellDescription$ Manta Riders gains flying until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/manta_riders.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/74.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/mantis_engine.txt b/res/cardsfolder/mantis_engine.txt
index 00829d48518..1786a470499 100644
--- a/res/cardsfolder/mantis_engine.txt
+++ b/res/cardsfolder/mantis_engine.txt
@@ -3,10 +3,10 @@ ManaCost:5
 Types:Artifact Creature Insect
 Text:no text
 PT:3/3
-K:abPump 2:Flying
-K:abPump 2:First Strike
+A:AB$Pump | Cost$ 2 | KW$ Flying | SpellDescription$ Mantis Engine gains flying until end of turn.
+A:AB$Pump | Cost$ 2 | KW$ First Strike | SpellDescription$ Mantis Engine gains first strike until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mantis_engine.jpg
 SetInfo:UDS|Uncommon|http://magiccards.info/scans/en/ud/133.jpg
 SetInfo:10E|Uncommon|http://magiccards.info/scans/en/10e/333.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/marsh_lurker.txt b/res/cardsfolder/marsh_lurker.txt
index b959ff8d547..b2ca3ce501e 100644
--- a/res/cardsfolder/marsh_lurker.txt
+++ b/res/cardsfolder/marsh_lurker.txt
@@ -3,8 +3,8 @@ ManaCost:3 B
 Types:Creature Beast
 Text:no text
 PT:3/2
-K:abPump Sac<1/Swamp>:Fear
+A:AB$Pump | Cost$ Sac<1/Swamp> | KW$ Fear | SpellDescription$ Marsh Lurker gains fear until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/marsh_lurker.jpg
 SetInfo:TMP|Common|http://magiccards.info/scans/en/tp/38.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/megatog.txt b/res/cardsfolder/megatog.txt
index 8b830038883..03ef808b3dc 100644
--- a/res/cardsfolder/megatog.txt
+++ b/res/cardsfolder/megatog.txt
@@ -3,8 +3,8 @@ ManaCost:4 R R
 Types:Creature Atog
 Text:no text
 PT:3/4
-K:abPump Sac<1/Artifact>:+3/+3
+A:AB$Pump | Cost$ Sac<1/Artifact> | NumAtt$ +3 | NumDef$ +3 | KW$ Trample | SpellDescription$ Megatog gets +3/+3 and gains trample until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/megatog.jpg
 SetInfo:MRD|Rare|http://magiccards.info/scans/en/mi/100.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/merrow_wavebreakers.txt b/res/cardsfolder/merrow_wavebreakers.txt
index e2fb568708d..7c5b8f3908a 100644
--- a/res/cardsfolder/merrow_wavebreakers.txt
+++ b/res/cardsfolder/merrow_wavebreakers.txt
@@ -3,9 +3,9 @@ ManaCost:4 U
 Types:Creature Merfolk Soldier
 Text:no text
 PT:3/3
-K:abPump 1 U Untap:Flying
+A:AB$Pump | Cost$ 1 U Untap | KW$ Flying | SpellDescription$ Merrow Wavebreakers gains flying until end of turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/merrow_wavebreakers.jpg
 SetInfo:SHM|Common|http://magiccards.info/scans/en/shm/44.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/mesa_falcon.txt b/res/cardsfolder/mesa_falcon.txt
index d1ccac38e30..9708f1282d0 100644
--- a/res/cardsfolder/mesa_falcon.txt
+++ b/res/cardsfolder/mesa_falcon.txt
@@ -4,10 +4,10 @@ Types:Creature Bird
 Text:no text
 PT:1/1
 K:Flying
-K:abPump 1 W:+0/+1
+A:AB$Pump | Cost$ 1 W | NumDef$ +1 | SpellDescription$ Mesa Falcon gets +0/+1 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mesa_falcon.jpg
 SetInfo:HML|Common|http://magiccards.info/scans/en/hl/112.jpg
 SetInfo:5ED|Common|http://magiccards.info/scans/en/5e/322.jpg
 SetInfo:6ED|Common|http://magiccards.info/scans/en/6e/31.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/minotaur_illusionist.txt b/res/cardsfolder/minotaur_illusionist.txt
index 1e3c565809a..fc239a07907 100644
--- a/res/cardsfolder/minotaur_illusionist.txt
+++ b/res/cardsfolder/minotaur_illusionist.txt
@@ -3,12 +3,10 @@ ManaCost:3 U R
 Types:Creature Minotaur Wizard
 Text:no text
 PT:3/4
-#K:abPump 1 U:Shroud
-#K:abDamageTgtC 1 R Sac<1/CARDNAME>:X:Minotaur Illusionist deals damage equal to its power to target creature.
-A:AB$Pump | Cost$ 1 U | KW$ Shroud | SpellDescription$ CARDNAME has Shroud until end of turn.
-A:AB$DealDamage | Cost$ 1 R Sac<1/CARDNAME> | Tgt$ TgtC | NumDmg$ X | SpellDescription$ CARDNAME deals damage equal to its power to target creature.
+A:AB$Pump | Cost$ 1 U | KW$ Shroud | SpellDescription$ Minotaur Illusionist gains shroud until end of turn.
+K:abDamageTgtC 1 R Sac<1/CARDNAME>:X:Minotaur Illusionist deals damage equal to its power to target creature.
 SVar:X:Count$CardPower
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/minotaur_illusionist.jpg
 SetInfo:APC|Uncommon|http://magiccards.info/scans/en/ap/111.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/molten_ravager.txt b/res/cardsfolder/molten_ravager.txt
index a8a2c73f6ec..a9243d732f2 100644
--- a/res/cardsfolder/molten_ravager.txt
+++ b/res/cardsfolder/molten_ravager.txt
@@ -3,8 +3,8 @@ ManaCost:2 R
 Types:Creature Elemental
 Text:no text
 PT:0/4
-K:abPump R:+1/+0
+A:AB$Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ Molten Ravager gets +1/+0 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/molten_ravager.jpg
 SetInfo:ZEN|Common|http://magiccards.info/scans/en/zen/138.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/moonglove_changeling.txt b/res/cardsfolder/moonglove_changeling.txt
index 79cd0d13b62..b5d08c320b0 100644
--- a/res/cardsfolder/moonglove_changeling.txt
+++ b/res/cardsfolder/moonglove_changeling.txt
@@ -4,8 +4,8 @@ Types:Creature Shapeshifter
 Text:no text
 PT:2/2
 K:Changeling
-K:abPump B:Deathtouch
+A:AB$Pump | Cost$ B | KW$ Deathtouch | SpellDescription$ Moonglove Changeling gains deathtouch until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/moonglove_changeling.jpg
 SetInfo:MOR|Common|http://magiccards.info/scans/en/mt/67.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/moonwing_moth.txt b/res/cardsfolder/moonwing_moth.txt
index 66d2255ddd3..7a48878de03 100644
--- a/res/cardsfolder/moonwing_moth.txt
+++ b/res/cardsfolder/moonwing_moth.txt
@@ -4,8 +4,8 @@ Types:Creature Insect
 Text:no text
 PT:2/1
 K:Flying
-K:abPump W:+0/+1
+A:AB$Pump | Cost$ W | NumDef$ +1 | SpellDescription$ Moonwing Moth gets +0/+1 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/moonwing_moth.jpg
 SetInfo:SOK|Common|http://magiccards.info/scans/en/sok/20.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/morphling.txt b/res/cardsfolder/morphling.txt
index 7a048f38488..e6859ba8290 100644
--- a/res/cardsfolder/morphling.txt
+++ b/res/cardsfolder/morphling.txt
@@ -4,11 +4,11 @@ Types:Creature Shapeshifter
 Text:no text
 PT:3/3
 K:Untap:U
-K:abPump U:Flying
-K:abPump U:Shroud
-K:abPump 1:+1/-1
-K:abPump 1:-1/+1
+A:AB$Pump | Cost$ U | KW$ Flying | SpellDescription$ Morphling gains flying until end of turn.
+A:AB$Pump | Cost$ U | KW$ Shroud | SpellDescription$ Morphling gains shroud until end of turn.
+A:AB$Pump | Cost$ 1 | NumAtt$ +1 | NumDef$ -1 | SpellDescription$ Morphling gets +1/-1 until end of turn.
+A:AB$Pump | Cost$ 1 | NumAtt$ -1 | NumDef$ +1 | SpellDescription$ Morphling gets -1/+1 until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/morphling.jpg
 SetInfo:USG|Rare|http://magiccards.info/scans/en/us/85.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/nantuko_shade.txt b/res/cardsfolder/nantuko_shade.txt
index 801aa07288d..3dc952f53ce 100644
--- a/res/cardsfolder/nantuko_shade.txt
+++ b/res/cardsfolder/nantuko_shade.txt
@@ -3,9 +3,9 @@ ManaCost:B B
 Types:Creature Insect Shade
 Text:no text
 PT:2/1
-K:abPump B:+1/+1
+A:AB$Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Nantuko Shade gets +1/+1 until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/tor/en-us/card35053.jpg
 SetInfo:M11|Rare|http://magiccards.info/scans/en/m11/106.jpg
 SetInfo:TOR|Rare|http://magiccards.info/scans/en/tr/74.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/nightwing_shade.txt b/res/cardsfolder/nightwing_shade.txt
index 21d81b30029..4d3741616e0 100644
--- a/res/cardsfolder/nightwing_shade.txt
+++ b/res/cardsfolder/nightwing_shade.txt
@@ -4,8 +4,8 @@ Types:Creature Shade
 Text:no text
 PT:2/2
 K:Flying
-K:abPump 1 B:+1/+1
+A:AB$Pump | Cost$ 1 B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Nightwing Shade gets +1/+1 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightwing_shade.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/109.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/nirkana_revenant.txt b/res/cardsfolder/nirkana_revenant.txt
index 7835b781438..73deca2a573 100644
--- a/res/cardsfolder/nirkana_revenant.txt
+++ b/res/cardsfolder/nirkana_revenant.txt
@@ -3,8 +3,8 @@ ManaCost:4 B B
 Types:Creature Vampire Shade
 Text:Whenever you tap a Swamp for mana, add 1 black mana to your mana pool (in addition to the mana the land produces).
 PT:4/4
-K:abPump B:+1/+1
+A:AB$Pump | Cost$ B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Nirkana Revenant gets +1/+1 until end of turn.
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nirkana_revenant.jpg
 SetInfo:ROE|Mythic|http://magiccards.info/scans/en/roe/120.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/noble_panther.txt b/res/cardsfolder/noble_panther.txt
index 1cfd287b726..f46a4394a79 100644
--- a/res/cardsfolder/noble_panther.txt
+++ b/res/cardsfolder/noble_panther.txt
@@ -3,8 +3,8 @@ ManaCost:1 G W
 Types:Creature Cat
 Text:no text
 PT:3/3
-K:abPump 1:First Strike
+A:AB$Pump | Cost$ 1 | KW$ First Strike | SpellDescription$ Noble Panther gains first strike until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noble_panther.jpg
 SetInfo:INV|Rare|http://magiccards.info/scans/en/in/257.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/order_of_leitbur.txt b/res/cardsfolder/order_of_leitbur.txt
index a48f0c60671..5bddd22bffe 100644
--- a/res/cardsfolder/order_of_leitbur.txt
+++ b/res/cardsfolder/order_of_leitbur.txt
@@ -4,9 +4,9 @@ Types:Creature Human Cleric Knight
 Text:no text
 PT:2/1
 K:Protection from black
-K:abPump W:First Strike
-K:abPump W W:+1/+0
+A:AB$Pump | Cost$ W | KW$ First Strike | SpellDescription$ Order of Leitbur gains first strike until end of turn.
+A:AB$Pump | Cost$ W W | NumAtt$ +1 | SpellDescription$ Order of Leitbur gets +1/+0 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/order_of_leitbur.jpg
 SetInfo:FEM|Common|http://magiccards.info/scans/en/fe/163.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/order_of_the_ebon_hand.txt b/res/cardsfolder/order_of_the_ebon_hand.txt
index d58be686621..67edf69acb2 100644
--- a/res/cardsfolder/order_of_the_ebon_hand.txt
+++ b/res/cardsfolder/order_of_the_ebon_hand.txt
@@ -4,9 +4,9 @@ Types:Creature Cleric Knight
 Text:no text
 PT:2/1
 K:Protection from white
-K:abPump B:First Strike
-K:abPump B B:+1/+0
+A:AB$Pump | Cost$ B | KW$ First Strike | SpellDescription$ Order of the Ebon Hand gains first strike until end of turn.
+A:AB$Pump | Cost$ B B | NumAtt$ +1 | SpellDescription$ Order of the Ebon Hand gets +1/+0 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/order_of_the_ebon_hand.jpg
 SetInfo:FEM|Common|http://magiccards.info/scans/en/fe/25.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/order_of_the_white_shield.txt b/res/cardsfolder/order_of_the_white_shield.txt
index 6bf081bab18..682de811615 100644
--- a/res/cardsfolder/order_of_the_white_shield.txt
+++ b/res/cardsfolder/order_of_the_white_shield.txt
@@ -4,10 +4,10 @@ Types:Creature Human Knight
 Text:no text
 PT:2/1
 K:Protection from black
-K:abPump W:First Strike
-K:abPump W W:+1/+0
+A:AB$Pump | Cost$ W | KW$ First Strike | SpellDescription$ Order of the White Shield gains first strike until end of turn.
+A:AB$Pump | Cost$ W W | NumAtt$ +1 | SpellDescription$ Order of the White Shield gets +1/+0 until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/order_of_the_white_shield.jpg
 SetInfo:5ED|Uncommon|http://magiccards.info/scans/en/5e/325.jpg
 SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/270.jpg
-End
\ No newline at end of file
+End