diff --git a/res/cardsfolder/nightcreep.txt b/res/cardsfolder/nightcreep.txt
index 704c94cdd85..1028e1b2e23 100644
--- a/res/cardsfolder/nightcreep.txt
+++ b/res/cardsfolder/nightcreep.txt
@@ -2,9 +2,8 @@ Name:Nightcreep
 ManaCost:B B
 Types:Instant
 Text:no text
-A:SP$ Effect | Cost$ B B | Name$ Nightcreep Effect | Keywords$ KWAnimateAll,KWAnimateSwamp | SpellDescription$ Until end of turn, all creatures become black and all lands become Swamps.
-SVar:KWAnimateAll:stAnimateAll:Creature:no change/no change:no types:Black,Overwrite:No Abilities:No condition:Until end of turn, all creatures become black and all lands become Swamps.
-SVar:KWAnimateSwamp:stAnimateAll:Land:no change/no change/Overwrite:Land,Swamp,RemoveSubTypes:no colors:Overwrite:No Condition:no text
+A:SP$ AnimateAll | Cost$ B B | ValidCards$ Creature | Colors$ Black | OverwriteColors$ True | SubAbility$ AnimateSwamp | SpellDescription$ Until end of turn, all creatures become black and all lands become Swamps.
+SVar:AnimateSwamp:DB$AnimateAll | ValidCards$ Land | Types$ Swamp | OverwriteTypes$ True | KeepSupertypes$ True | KeepCardTypes$ True
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nightcreep.jpg