diff --git a/res/cardsfolder/jabaris_banner.txt b/res/cardsfolder/jabaris_banner.txt
index 3fa2258625a..ca3c3df4aac 100644
--- a/res/cardsfolder/jabaris_banner.txt
+++ b/res/cardsfolder/jabaris_banner.txt
@@ -2,8 +2,8 @@ Name:Jabari's Banner
 ManaCost:2
 Types:Artifact
 Text:no text
-K:abPumpTgtC 1 T:Flanking
+A:AB$Pump | Cost$ 1 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flanking | SpellDescription$ Target creature gains flanking until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jabaris_banner.jpg
 SetInfo:WTH|Uncommon|http://magiccards.info/scans/en/wl/150.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/narcissism.txt b/res/cardsfolder/narcissism.txt
index d132dbfd4ee..b8917e571f1 100644
--- a/res/cardsfolder/narcissism.txt
+++ b/res/cardsfolder/narcissism.txt
@@ -2,9 +2,9 @@ Name:Narcissism
 ManaCost:2 G
 Types:Enchantment
 Text:no text
-K:abPumpTgtC G Discard<1/Any>:+2/+2
-K:abPumpTgtC G Sac<1/CARDNAME>:+2/+2
+A:AB$Pump | Cost$ G Discard<1/Any> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
+A:AB$Pump | Cost$ G Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Target creature gets +2/+2 until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/narcissism.jpg
 SetInfo:TOR|Uncommon|http://magiccards.info/scans/en/tr/134.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/need_for_speed.txt b/res/cardsfolder/need_for_speed.txt
index 5aacdf4a6e2..02299a27141 100644
--- a/res/cardsfolder/need_for_speed.txt
+++ b/res/cardsfolder/need_for_speed.txt
@@ -2,8 +2,8 @@ Name:Need for Speed
 ManaCost:R
 Types:Enchantment
 Text:no text
-K:abPumpTgtC Sac<1/Land>:Haste
+A:AB$Pump | Cost$ Sac<1/Land> | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Haste | SpellDescription$ Target creature gains haste until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/need_for_speed.jpg
 SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/209.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/noble_steeds.txt b/res/cardsfolder/noble_steeds.txt
index 272e0b1b9b3..dfa7286db97 100644
--- a/res/cardsfolder/noble_steeds.txt
+++ b/res/cardsfolder/noble_steeds.txt
@@ -2,8 +2,8 @@ Name:Noble Steeds
 ManaCost:2 W
 Types:Enchantment
 Text:no text
-K:abPumpTgtC 1 W:First Strike
+A:AB$Pump | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ First Strike | SpellDescription$ Target creature gains first strike until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/noble_steeds.jpg
 SetInfo:ALL|Common|http://magiccards.info/scans/en/ai/140.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/power_matrix.txt b/res/cardsfolder/power_matrix.txt
index 3086dabb579..3866927b90c 100644
--- a/res/cardsfolder/power_matrix.txt
+++ b/res/cardsfolder/power_matrix.txt
@@ -2,8 +2,8 @@ Name:Power Matrix
 ManaCost:4
 Types:Artifact
 Text:no text
-K:abPumpTgtC T:+1/+1/Flying & First Strike & Trample
+A:AB$Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying & First Strike & Trample | SpellDescription$ Target creature gets +1/+1 and gains flying, first strike, and trample until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/power_matrix.jpg
 SetInfo:MMQ|Rare|http://magiccards.info/scans/en/mm/309.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/scale_of_chiss_goria.txt b/res/cardsfolder/scale_of_chiss_goria.txt
index 187c498ad43..d072928961e 100644
--- a/res/cardsfolder/scale_of_chiss_goria.txt
+++ b/res/cardsfolder/scale_of_chiss_goria.txt
@@ -3,9 +3,9 @@ ManaCost:3
 Types:Artifact
 Text:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
 K:Flash
-K:abPumpTgtC T:+0/+1
+A:AB$Pump | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDef$ +1 | SpellDescription$ Target creature gets +0/+1 until end of turn.
 K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scale_of_chiss_goria.jpg
 SetInfo:MRD|Common|http://magiccards.info/scans/en/mi/236.jpg
-End
\ No newline at end of file
+End
diff --git a/res/cardsfolder/seal_of_strength.txt b/res/cardsfolder/seal_of_strength.txt
index 0f3dee60f29..9ce64e0e7ee 100644
--- a/res/cardsfolder/seal_of_strength.txt
+++ b/res/cardsfolder/seal_of_strength.txt
@@ -2,8 +2,8 @@ Name:Seal of Strength
 ManaCost:G
 Types:Enchantment
 Text:no text
-K:abPumpTgtC 0 Sac<1/CARDNAME>:+3/+3
+A:AB$Pump | Cost$ 0 Sac<1/CARDNAME> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | SpellDescription$ Target creature gets +3/+3 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/seal_of_strength.jpg
 SetInfo:NMS|Common|http://magiccards.info/scans/en/ne/115.jpg
-End
\ No newline at end of file
+End