diff --git a/res/cardsfolder/boartusk_liege.txt b/res/cardsfolder/boartusk_liege.txt
index 1ca00d3a198..f9d4bf5f9b0 100644
--- a/res/cardsfolder/boartusk_liege.txt
+++ b/res/cardsfolder/boartusk_liege.txt
@@ -4,8 +4,8 @@ Types:Creature Goblin Knight
 Text:no text
 PT:3/4
 K:Trample
-K:StaticEffect:Play:Permanents you Control:PTBonus/1/1:Color.red!NotSelf:Other red creatures you control get +1/+1.
-K:StaticEffect:Play:Permanents you Control:PTBonus/1/1:Color.green!NotSelf:Other green creatures you control get +1/+1.
+K:stPumpAll:Creature.Red+Other+YouCtrl:1/1:No Condition:Other red creatures you control get +1/+1.
+K:stPumpAll:Creature.Green+Other+YouCtrl:1/1:No Condition:Other green creatures you control get +1/+1.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boartusk_liege.jpg
diff --git a/res/cardsfolder/corrosive_mentor.txt b/res/cardsfolder/corrosive_mentor.txt
index 815986a25f9..bf1a899bd9b 100644
--- a/res/cardsfolder/corrosive_mentor.txt
+++ b/res/cardsfolder/corrosive_mentor.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Elemental Rogue
 Text:no text
 PT:1/3
-K:StaticEffect:Play:Permanents you Control:Keyword/Wither:Type.Creature!Color.black:Black creatures you control have wither. (They deal damage to creatures in the form of -1/-1 counters.)
+K:stPumpAll:Creature.Black+YouCtrl:0/0/Wither:No Condition:Black creatures you control have wither. (They deal damage to creatures in the form of -1/-1 counters.)
 SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/corrosive_mentor.jpg
diff --git a/res/cardsfolder/creakwood_liege.txt b/res/cardsfolder/creakwood_liege.txt
index ebabb4e560c..e83f5994165 100644
--- a/res/cardsfolder/creakwood_liege.txt
+++ b/res/cardsfolder/creakwood_liege.txt
@@ -3,8 +3,8 @@ ManaCost:1 BG BG BG
 Types:Creature Horror
 Text:At the beginning of your upkeep, you may put a 1/1 black and green Worm creature token onto the battlefield.
 PT:2/2
-K:StaticEffect:Play:Permanents you Control:PTBonus/1/1:Color.green!NotSelf:Other green creatures you control get +1/+1.
-K:StaticEffect:Play:Permanents you Control:PTBonus/1/1:Color.black!NotSelf:Other black creatures you control get +1/+1.
+K:stPumpAll:Creature.Green+Other+YouCtrl:1/1:No Condition:Other green creatures you control get +1/+1.
+K:stPumpAll:Creature.Black+Other+YouCtrl:1/1:No Condition:Other black creatures you control get +1/+1.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/creakwood_liege.jpg
diff --git a/res/cardsfolder/cumber_stone.txt b/res/cardsfolder/cumber_stone.txt
index 3b1befe1e3b..54b43eb7acb 100644
--- a/res/cardsfolder/cumber_stone.txt
+++ b/res/cardsfolder/cumber_stone.txt
@@ -2,7 +2,7 @@ Name:Cumber Stone
 ManaCost:3 U
 Types:Artifact
 Text:no text
-K:StaticEffect:Play:Permanents your Opponents Control:PTBonus/-1/0:Type.Creature:Creatures your opponents control get -1/-0.
+K:stPumpAll:Creature.YouDontCtrl:-1/-1:No Condition:Creatures your opponents control get -1/-0.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cumber_stone.jpg
diff --git a/res/cardsfolder/day_of_destiny.txt b/res/cardsfolder/day_of_destiny.txt
index 490326b1ffd..c09dc0c7d47 100644
--- a/res/cardsfolder/day_of_destiny.txt
+++ b/res/cardsfolder/day_of_destiny.txt
@@ -2,7 +2,7 @@ Name:Day of Destiny
 ManaCost:3 W
 Types:Legendary Enchantment
 Text:no text
-K:StaticEffect:Play:Permanents you Control:PTBonus/2/2:Type.Creature!Type.Legendary:Legendary creatures you control get +2/+2.
+K:stPumpAll:Creature.Legendary+YouCtrl:2/2:No Condition:Legendary creatures you control get +2/+2.
 SVar:RemAIDeck:True
 SVar:PlayMain1:TRUE
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/deepchannel_mentor.txt b/res/cardsfolder/deepchannel_mentor.txt
index 0001bc83ec6..3005cb16704 100644
--- a/res/cardsfolder/deepchannel_mentor.txt
+++ b/res/cardsfolder/deepchannel_mentor.txt
@@ -3,7 +3,7 @@ ManaCost:5 U
 Types:Creature Merfolk Rogue
 Text:no text
 PT:2/2
-K:StaticEffect:Play:Permanents you Control:Keyword/Unblockable:Type.Creature!Color.blue:Blue creatures you control are unblockable.
+K:stPumpAll:Creature.Blue+YouCtrl:0/0/Unblockable:No Condition:Blue creatures you control are unblockable.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deepchannel_mentor.jpg
diff --git a/res/cardsfolder/dread_of_night.txt b/res/cardsfolder/dread_of_night.txt
index 962a65a7e37..fdd14f93eb1 100644
--- a/res/cardsfolder/dread_of_night.txt
+++ b/res/cardsfolder/dread_of_night.txt
@@ -2,7 +2,7 @@ Name:Dread of Night
 ManaCost:B
 Types:Enchantment
 Text:no text
-K:StaticEffect:Play:All Permanents:PTBonus/-1/-1:Color.white:White creatures get -1/-1.
+K:stPumpAll:Creature.White:-1/-1:No Condition:White creatures get -1/-1.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dread_of_night.jpg
diff --git a/res/cardsfolder/fires_of_yavimaya.txt b/res/cardsfolder/fires_of_yavimaya.txt
index 3ea48cbab77..08697c17315 100644
--- a/res/cardsfolder/fires_of_yavimaya.txt
+++ b/res/cardsfolder/fires_of_yavimaya.txt
@@ -1,8 +1,7 @@
 Name:Fires of Yavimaya
 ManaCost:1 R G
 Types:Enchantment
-Text:no text
-K:StaticEffect:Play:Permanents you Control:Keyword/Haste:Type.Creature:Creatures you control have haste.
+Text:no text0/0/Haste:No Condition:Creatures you control have haste.
 K:abPumpTgtC Sac<1/CARDNAME>:+2/+2
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fires_of_yavimaya.jpg
diff --git a/res/cardsfolder/flowstone_surge.txt b/res/cardsfolder/flowstone_surge.txt
index d6bb0ae3592..3d1543398bd 100644
--- a/res/cardsfolder/flowstone_surge.txt
+++ b/res/cardsfolder/flowstone_surge.txt
@@ -2,7 +2,7 @@ Name:Flowstone Surge
 ManaCost:1 R
 Types:Enchantment
 Text:no text
-K:StaticEffect:Play:Permanents you Control:PTBonus/1/-1:Type.Creature:Creatures you control get +1/-1.
+K:stPumpAll:Creature.YouCtrl:1/-1:No Condition:Creatures you control get +1/-1.
 SVar:RemAIDeck:True
 SVar:PlayMain1:TRUE
 SVar:Rarity:Uncommon