diff --git a/forge-core/src/main/java/forge/card/CardType.java b/forge-core/src/main/java/forge/card/CardType.java
index a4553741cc6..ce6ca332de6 100644
--- a/forge-core/src/main/java/forge/card/CardType.java
+++ b/forge-core/src/main/java/forge/card/CardType.java
@@ -54,9 +54,9 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
     public enum CoreType {
         Artifact(true, "artifacts"),
         Conspiracy(false, "conspiracies"),
+        Enchantment(true, "enchantments"),
         Creature(true, "creatures"),
         Dungeon(false, "dungeons"),
-        Enchantment(true, "enchantments"),
         Instant(false, "instants"),
         Land(true, "lands"),
         Phenomenon(false, "phenomenons"),
diff --git a/forge-gui/res/cardsfolder/v/vigor_mortis.txt b/forge-gui/res/cardsfolder/v/vigor_mortis.txt
index a6d87fb1f05..046fe159a7a 100644
--- a/forge-gui/res/cardsfolder/v/vigor_mortis.txt
+++ b/forge-gui/res/cardsfolder/v/vigor_mortis.txt
@@ -1,9 +1,8 @@
 Name:Vigor Mortis
 ManaCost:2 B B
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 2 B B | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | Origin$ Graveyard | Destination$ Battlefield | RememberTargets$ True | SubAbility$ DBCounter | SpellDescription$ Return target creature card from your graveyard to the battlefield. If {G} was spent to cast this spell, that creature enters the battlefield with an additional +1/+1 counter on it.
-SVar:DBCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 1 | Static$ True | ConditionManaSpent$ G | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:SP$ ChangeZone | Cost$ 2 B B | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBCounter | ConditionManaNotSpent$ G | SpellDescription$ Return target creature card from your graveyard to the battlefield. If {G} was spent to cast this spell, that creature enters the battlefield with an additional +1/+1 counter on it.
+SVar:DBCounter:DB$ ChangeZone | Defined$ Targeted | Origin$ Graveyard | Destination$ Battlefield | WithCountersType$ P1P1 | ConditionManaSpent$ G | StackDescription$ None
 SVar:ManaNeededToAvoidNegativeEffect:green
 AI:RemoveDeck:Random
 DeckNeeds:Color$Green