diff --git a/res/cardsfolder/frostwind_invoker.txt b/res/cardsfolder/frostwind_invoker.txt
index a629b9a04e7..20cab6b000e 100644
--- a/res/cardsfolder/frostwind_invoker.txt
+++ b/res/cardsfolder/frostwind_invoker.txt
@@ -4,7 +4,7 @@ Types:Creature Merfolk Wizard
 Text:no text
 PT:3/3
 K:Flying
-K:abAllPump 8:YouCtrl:Flying:Creatures you control gain flying until end of turn.:Frostwind Invoker - creatures gain flying until EOT
+A:AB$PumpAll|Cost$8|ValidCards$Creature.YouCtrl|KW$Flying|SpellDescription$Creatures you control gain flying until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/frostwind_invoker.jpg
 SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/68.jpg
diff --git a/res/cardsfolder/goblin_lookout.txt b/res/cardsfolder/goblin_lookout.txt
index 439732854ac..84e38eb658c 100644
--- a/res/cardsfolder/goblin_lookout.txt
+++ b/res/cardsfolder/goblin_lookout.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Goblin
 Text:no text
 PT:1/2
-K:abAllPump T Sac<1/Goblin>:All/Goblin:+2/+0:Goblin creatures get +2/+0 until end of turn.:Goblin Lookout - Goblin creatures get +2/+0 until EOT
+A:AB$PumpAll|Cost$T Sac<1/Goblin>|ValidCards$Creature.Goblin|NumAtt$+2|SpellDescription$Goblin creatures get +2/+0 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_lookout.jpg
 SetInfo:LGN|Common|http://magiccards.info/scans/en/le/101.jpg
diff --git a/res/cardsfolder/goblin_soothsayer.txt b/res/cardsfolder/goblin_soothsayer.txt
index f0e7984e106..a8dd51b7543 100644
--- a/res/cardsfolder/goblin_soothsayer.txt
+++ b/res/cardsfolder/goblin_soothsayer.txt
@@ -3,7 +3,7 @@ ManaCost:R
 Types:Creature Goblin Shaman
 Text:no text
 PT:1/1
-K:abAllPump R T Sac<1/Goblin>:All/Red:+1/+1:Red creatures get +1/+1 until end of turn.:Goblin Soothsayer - Red creatures get +1/+1 until EOT
+A:AB$PumpAll|Cost$R T Sac<1/Goblin>|ValidCards$Creature.Red|NumAtt$+1|NumDef$+1|SpellDescription$Red creatures get +1/+1 until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_soothsayer.jpg
 SetInfo:MIR|Uncommon|http://magiccards.info/scans/en/mr/179.jpg
diff --git a/res/cardsfolder/iizuka_the_ruthless.txt b/res/cardsfolder/iizuka_the_ruthless.txt
index 56c746ccd13..7ec2ac7efbe 100644
--- a/res/cardsfolder/iizuka_the_ruthless.txt
+++ b/res/cardsfolder/iizuka_the_ruthless.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Human Samurai
 Text:no text
 PT:3/3
 K:Bushido 2
-K:abAllPump T Sac<1/Samurai>:YouCtrl/Samurai:Double Strike:Samurai creatures you control gain double strike until end of turn.:Iizuka the Ruthless - Samurai creatures you control gain double strike until EOT
+A:AB$PumpAll|Cost$2 R Sac<1/Samurai>|ValidCards$Creature.Samurai+YouCtrl|KW$Double Strike|SpellDescription$Samurai creatures you control gain double strike until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/iizuka_the_ruthless.jpg
 SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/104.jpg
diff --git a/res/cardsfolder/lavafume_invoker.txt b/res/cardsfolder/lavafume_invoker.txt
index 33cfcc2c4c7..ed27ea3267b 100644
--- a/res/cardsfolder/lavafume_invoker.txt
+++ b/res/cardsfolder/lavafume_invoker.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Creature Goblin Shaman
 Text:no text
 PT:2/2
-K:abAllPump 8:YouCtrl:+3/+0:Creatures you control get +3/+0 until end of turn.:Lavafume Invoker - creatures get +3/+0 until EOT
+A:AB$PumpAll|Cost$8|ValidCards$Creature.YouCtrl|NumAtt$+3|SpellDescription$Creatures you control get +3/+0 until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lavafume_invoker.jpg
 SetInfo:ROE|Common|http://magiccards.info/scans/en/roe/155.jpg
diff --git a/res/cardsfolder/skyshaper.txt b/res/cardsfolder/skyshaper.txt
index aa04e2ba358..7e31dca0f22 100644
--- a/res/cardsfolder/skyshaper.txt
+++ b/res/cardsfolder/skyshaper.txt
@@ -2,7 +2,7 @@ Name:Skyshaper
 ManaCost:2
 Types:Artifact
 Text:no text
-K:abAllPump Sac<1/CARDNAME>:YouCtrl:Flying:Creatures you control gain flying until end of turn.:Skyshaper - Creatures gain flying until EOT
+A:AB$PumpAll|Cost$Sac<1/CARDNAME>|ValidCards$Creature.YouCtrl|KW$Flying|SpellDescription$Creatures you control gain flying until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skyshaper.jpg
 SetInfo:EXO|Uncommon|http://magiccards.info/scans/en/ex/137.jpg
diff --git a/res/cardsfolder/stormcallers_boon.txt b/res/cardsfolder/stormcallers_boon.txt
index 5ec234b5683..ff1cad4b680 100644
--- a/res/cardsfolder/stormcallers_boon.txt
+++ b/res/cardsfolder/stormcallers_boon.txt
@@ -2,8 +2,8 @@ Name:Stormcaller's Boon
 ManaCost:2 W U
 Types:Enchantment
 Text:no text
-K:abAllPump Sac<1/CARDNAME>:YouCtrl:Flying:Creatures you control gain flying until end of turn.:Stormcaller's Boon - Creatures gain flying until EOT
 K:Cascade
+A:AB$PumpAll|Cost$Sac<1/CARDNAME>|ValidCards$Creature.YouCtrl|KW$Flying|SpellDescription$Creatures you control gain flying until end of turn.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stormcallers_boon.jpg
diff --git a/res/cardsfolder/sunscape_master.txt b/res/cardsfolder/sunscape_master.txt
index aaba1b0672e..a17f9745e40 100644
--- a/res/cardsfolder/sunscape_master.txt
+++ b/res/cardsfolder/sunscape_master.txt
@@ -4,7 +4,7 @@ Types:Creature Human Wizard
 Text:no text
 PT:2/2
 A:AB$ChangeZone | Cost$ U U T | ValidTgts$ Creature | TgtPrompt$ Select target Creature | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return target creature to its owner's hand.
-K:abAllPump G G T:YouCtrl:+2/+2:Creatures you control get +2/+2 until end of turn.:Sunscape Master - creatures get +2/+2 until EOT.
+A:AB$PumpAll|Cost$G G T|ValidCards$Creature.YouCtrl|NumAtt$+2|NumDef$+2|SpellDescription$Creatures you control get +2/+2 until end of turn.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sunscape_master.jpg
 SetInfo:INV|Rare|http://magiccards.info/scans/en/in/42.jpg
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 4b891dadfb8..5d36ea1df5c 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -1141,6 +1141,7 @@ public class CardFactory implements NewConstants {
              }
          }//spAllPump
         
+        /* Cards converted to AB$PumpAll
         while (hasKeyword(card, "abAllPump") != -1)
         {
         	int n = hasKeyword(card, "abAllPump");
@@ -1403,7 +1404,7 @@ public class CardFactory implements NewConstants {
                 card.addSpellAbility(abAllPump);
         	}
         }
-        
+        */
         /* Cards converted to AB$Pump
         while(hasKeyword(card, "abPump") != -1) {
             int n = hasKeyword(card, "abPump");