diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index 11eb783bc78..bf7a69a7b6d 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -165,15 +165,10 @@ public class AbilityUtils {
                 if (defined.startsWith("TopThird")) {
                     int third = defined.contains("RoundedDown") ? (int) Math.floor(libSize / 3.0)
                             : (int) Math.ceil(libSize / 3.0);
-                    for (int i = 0; i < third; i++) {
-                        cards.add(lib.get(i));
-                    }
+                    cards = player.getTopXCardsFromLibrary(third);
                 } else if (defined.startsWith("Top_")) {
                     String[] parts = defined.split("_");
-                    int amt = AbilityUtils.calculateAmount(hostCard, parts[1], sa);
-                    for (int i = 0; i < amt; i++) {
-                        cards.add(lib.get(i));
-                    }
+                    cards = player.getTopXCardsFromLibrary(AbilityUtils.calculateAmount(hostCard, parts[1], sa));
                 } else {
                     c = lib.get(defined.startsWith("Top") ? 0 : libSize - 1);
                 }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ManifestEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ManifestEffect.java
index be6ec5ae087..54a0a89797e 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ManifestEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ManifestEffect.java
@@ -12,6 +12,7 @@ import forge.game.card.Card;
 import forge.game.card.CardCollection;
 import forge.game.card.CardCollectionView;
 import forge.game.card.CardLists;
+import forge.game.card.CardZoneTable;
 import forge.game.player.Player;
 import forge.game.spellability.SpellAbility;
 import forge.game.zone.ZoneType;
@@ -65,9 +66,17 @@ public class ManifestEffect extends SpellAbilityEffect {
             }
 
             for (Card c : tgtCards) {
+                CardZoneTable triggerList = new CardZoneTable();
+                ZoneType origin = c.getZone().getZoneType();
                 Card rem = c.manifest(p, sa, moveParams);
-                if (sa.hasParam("RememberManifested") && rem != null && rem.isManifested()) {
-                    source.addRemembered(rem);
+                if (rem != null) {
+                    if (sa.hasParam("RememberManifested") && rem.isManifested()) {
+                        source.addRemembered(rem);
+                    }
+                    // 701.34d. If an effect instructs a player to manifest multiple cards from their library,
+                    // those cards are manifested one at a time.
+                    triggerList.put(origin, ZoneType.Battlefield, rem);
+                    triggerList.triggerChangesZoneAll(game, sa);
                 }
             }
         }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
index 4069a6caf8e..51cc7295474 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
@@ -57,10 +57,9 @@ public class SetStateEffect extends SpellAbilityEffect {
         final boolean optional = sa.hasParam("Optional");
         final CardCollection transformedCards = new CardCollection();
 
-        CardCollection cardsToTransform = new CardCollection();
+        CardCollectionView cardsToTransform;
         if (sa.hasParam("Choices")) {
-            CardCollectionView choices = game.getCardsIn(ZoneType.Battlefield);
-            choices = CardLists.getValidCards(choices, sa.getParam("Choices"), p, host, sa);
+            CardCollectionView choices = CardLists.getValidCards(game.getCardsIn(ZoneType.Battlefield), sa.getParam("Choices"), p, host, sa);
 
             final int validAmount = AbilityUtils.calculateAmount(host, sa.getParamOrDefault("Amount", "1"), sa);
             final int minAmount = sa.hasParam("MinAmount") ? Integer.parseInt(sa.getParam("MinAmount")) : validAmount;
@@ -71,8 +70,8 @@ public class SetStateEffect extends SpellAbilityEffect {
 
             String title = sa.hasParam("ChoiceTitle") ? sa.getParam("ChoiceTitle") :
                     Localizer.getInstance().getMessage("lblChooseaCard") + " ";
-            cardsToTransform.addAll(p.getController().chooseCardsForEffect(choices, sa, title, minAmount, validAmount,
-                    !sa.hasParam("Mandatory"), null));
+            cardsToTransform = p.getController().chooseCardsForEffect(choices, sa, title, minAmount, validAmount,
+                    !sa.hasParam("Mandatory"), null);
         } else {
             cardsToTransform = getTargetCards(sa);
         }
diff --git a/forge-game/src/main/java/forge/game/zone/PlayerZone.java b/forge-game/src/main/java/forge/game/zone/PlayerZone.java
index 53770ab025d..bb2c47ed99f 100644
--- a/forge-game/src/main/java/forge/game/zone/PlayerZone.java
+++ b/forge-game/src/main/java/forge/game/zone/PlayerZone.java
@@ -22,7 +22,6 @@ import com.google.common.collect.Iterables;
 
 import forge.card.CardStateName;
 import forge.game.card.Card;
-import forge.game.card.CardCollectionView;
 import forge.game.card.CardLists;
 import forge.game.keyword.Keyword;
 import forge.game.player.Player;
@@ -124,8 +123,8 @@ public class PlayerZone extends Zone {
         return Lang.getInstance().getPossessedObject(player.toString(), zoneType.toString());
     }
 
-    public CardCollectionView getCardsPlayerCanActivate(Player who) {
-        CardCollectionView cl = getCards(false);
+    public Iterable<Card> getCardsPlayerCanActivate(Player who) {
+        Iterable<Card> cl = getCards(false);
         boolean checkingForOwner = who == player;
 
         if (checkingForOwner && (is(ZoneType.Battlefield) || is(ZoneType.Hand))) {
@@ -133,9 +132,8 @@ public class PlayerZone extends Zone {
         }
 
         // Only check the top card of the library
-        Iterable<Card> cards = cl;
         if (is(ZoneType.Library)) {
-            cards = Iterables.limit(cards, 1);
+            cl = Iterables.limit(cl, 1);
         }
 
         final Predicate<Card> filterPredicate = checkingForOwner ? new OwnCardsActivationFilter() : alienCardsActivationFilter(who);
diff --git a/forge-gui/res/cardsfolder/a/atarka_monument.txt b/forge-gui/res/cardsfolder/a/atarka_monument.txt
index b56c8c35e73..41a7dbcbe34 100644
--- a/forge-gui/res/cardsfolder/a/atarka_monument.txt
+++ b/forge-gui/res/cardsfolder/a/atarka_monument.txt
@@ -2,7 +2,7 @@ Name:Atarka Monument
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo R G | SpellDescription$ Add {R} or {G}.
-A:AB$ Animate | Cost$ 4 R G | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | Colors$ Red,Green | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 red and green Dragon artifact creature with flying until end of turn.
+A:AB$ Animate | Cost$ 4 R G | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | RemoveCreatureTypes$ True | Colors$ Red,Green | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 red and green Dragon artifact creature with flying until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$Red|Green
 Oracle:{T}: Add {R} or {G}.\n{4}{R}{G}: Atarka Monument becomes a 4/4 red and green Dragon artifact creature with flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/azorius_keyrune.txt b/forge-gui/res/cardsfolder/a/azorius_keyrune.txt
index 7a95b324f84..2d99618021d 100644
--- a/forge-gui/res/cardsfolder/a/azorius_keyrune.txt
+++ b/forge-gui/res/cardsfolder/a/azorius_keyrune.txt
@@ -2,7 +2,7 @@ Name:Azorius Keyrune
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo W U | SpellDescription$ Add {W} or {U}.
-A:AB$ Animate | Cost$ W U | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Bird | Colors$ White,Blue | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 2/2 white and blue Bird artifact creature with flying until end of turn.
+A:AB$ Animate | Cost$ W U | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Bird | RemoveCreatureTypes$ True | Colors$ White,Blue | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 2/2 white and blue Bird artifact creature with flying until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$White|Blue
 Oracle:{T}: Add {W} or {U}.\n{W}{U}: Azorius Keyrune becomes a 2/2 white and blue Bird artifact creature with flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/b/blinkmoth_nexus.txt b/forge-gui/res/cardsfolder/b/blinkmoth_nexus.txt
index e68a8d9170c..b8d6cdb709f 100644
--- a/forge-gui/res/cardsfolder/b/blinkmoth_nexus.txt
+++ b/forge-gui/res/cardsfolder/b/blinkmoth_nexus.txt
@@ -2,6 +2,6 @@ Name:Blinkmoth Nexus
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Artifact,Blinkmoth | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 1/1 Blinkmoth artifact creature with flying until end of turn. It's still a land.
+A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Artifact,Blinkmoth | RemoveCreatureTypes$ True | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 1/1 Blinkmoth artifact creature with flying until end of turn. It's still a land.
 A:AB$ Pump | Cost$ 1 T | ValidTgts$ Creature.Blinkmoth | TgtPrompt$ Select target Blinkmoth creature | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ Target Blinkmoth creature gets +1/+1 until end of turn.
 Oracle:{T}: Add {C}.\n{1}: Blinkmoth Nexus becomes a 1/1 Blinkmoth artifact creature with flying until end of turn. It's still a land.\n{1}, {T}: Target Blinkmoth creature gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/b/boros_keyrune.txt b/forge-gui/res/cardsfolder/b/boros_keyrune.txt
index 20c01bf2ed5..118b9a79765 100644
--- a/forge-gui/res/cardsfolder/b/boros_keyrune.txt
+++ b/forge-gui/res/cardsfolder/b/boros_keyrune.txt
@@ -2,7 +2,7 @@ Name:Boros Keyrune
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo R W | SpellDescription$ Add {R} or {W}.
-A:AB$ Animate | Cost$ R W | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Artifact,Creature,Soldier | Colors$ Red,White | Keywords$ Double Strike | SpellDescription$ CARDNAME becomes a 1/1 red and white Soldier artifact creature with double strike until end of turn.
+A:AB$ Animate | Cost$ R W | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Artifact,Creature,Soldier | RemoveCreatureTypes$ True | Colors$ Red,White | Keywords$ Double Strike | SpellDescription$ CARDNAME becomes a 1/1 red and white Soldier artifact creature with double strike until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$Red|White
 Oracle:{T}: Add {R} or {W}.\n{R}{W}: Boros Keyrune becomes a 1/1 red and white Soldier artifact creature with double strike until end of turn. (It deals both first-strike and regular combat damage.)
diff --git a/forge-gui/res/cardsfolder/c/chimeric_coils.txt b/forge-gui/res/cardsfolder/c/chimeric_coils.txt
index a3477f98bb6..f5258912fea 100644
--- a/forge-gui/res/cardsfolder/c/chimeric_coils.txt
+++ b/forge-gui/res/cardsfolder/c/chimeric_coils.txt
@@ -1,7 +1,7 @@
 Name:Chimeric Coils
 ManaCost:1
 Types:Artifact
-A:AB$ Animate | Cost$ X 1 | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Construct | AtEOT$ Sacrifice | Duration$ Permanent | SpellDescription$ CARDNAME becomes an X/X Construct artifact creature. Sacrifice it at the beginning of the next end step.
+A:AB$ Animate | Cost$ X 1 | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Construct | RemoveCreatureTypes$ True | AtEOT$ Sacrifice | Duration$ Permanent | SpellDescription$ CARDNAME becomes an X/X Construct artifact creature. Sacrifice it at the beginning of the next end step.
 SVar:X:Count$xPaid
 AI:RemoveDeck:All
 Oracle:{X}{1}: Chimeric Coils becomes an X/X Construct artifact creature. Sacrifice it at the beginning of the next end step.
diff --git a/forge-gui/res/cardsfolder/c/chimeric_egg.txt b/forge-gui/res/cardsfolder/c/chimeric_egg.txt
index 3d2464e74f5..a884674931a 100644
--- a/forge-gui/res/cardsfolder/c/chimeric_egg.txt
+++ b/forge-gui/res/cardsfolder/c/chimeric_egg.txt
@@ -3,5 +3,5 @@ ManaCost:3
 Types:Artifact
 T:Mode$ SpellCast | ValidCard$ Card.nonArtifact | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent casts a nonartifact spell, put a charge counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ CHARGE | CounterNum$ 1
-A:AB$ Animate | Cost$ SubCounter<3/CHARGE> | Defined$ Self | Power$ 6 | Toughness$ 6 | Types$ Creature,Artifact,Construct | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 6/6 Construct artifact creature with trample until end of turn.
+A:AB$ Animate | Cost$ SubCounter<3/CHARGE> | Defined$ Self | Power$ 6 | Toughness$ 6 | Types$ Creature,Artifact,Construct | RemoveCreatureTypes$ True | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 6/6 Construct artifact creature with trample until end of turn.
 Oracle:Whenever an opponent casts a nonartifact spell, put a charge counter on Chimeric Egg.\nRemove three charge counters from Chimeric Egg: Chimeric Egg becomes a 6/6 Construct artifact creature with trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/chimeric_idol.txt b/forge-gui/res/cardsfolder/c/chimeric_idol.txt
index 4f3895c6e18..212abc9a347 100644
--- a/forge-gui/res/cardsfolder/c/chimeric_idol.txt
+++ b/forge-gui/res/cardsfolder/c/chimeric_idol.txt
@@ -2,6 +2,6 @@ Name:Chimeric Idol
 ManaCost:3
 Types:Artifact
 A:AB$ TapAll | Cost$ 0 | ValidCards$ Land.YouCtrl | SubAbility$ DBAnimate | SpellDescription$ Tap all lands you control. CARDNAME becomes a 3/3 Turtle artifact creature until end of turn.
-SVar:DBAnimate:DB$ Animate | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Artifact,Turtle
+SVar:DBAnimate:DB$ Animate | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Artifact,Turtle | RemoveCreatureTypes$ True
 AI:RemoveDeck:All
 Oracle:{0}: Tap all lands you control. Chimeric Idol becomes a 3/3 Turtle artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/chimeric_mass.txt b/forge-gui/res/cardsfolder/c/chimeric_mass.txt
index 3fc529f9348..86299fb5578 100644
--- a/forge-gui/res/cardsfolder/c/chimeric_mass.txt
+++ b/forge-gui/res/cardsfolder/c/chimeric_mass.txt
@@ -3,7 +3,7 @@ ManaCost:X
 Types:Artifact
 K:etbCounter:CHARGE:X
 SVar:X:Count$xPaid
-A:AB$ Animate | Cost$ 1 | Defined$ Self | Types$ Artifact,Creature,Construct | staticAbilities$ Static | SpellDescription$ Until end of turn, CARDNAME becomes a Construct artifact creature with "This creature's power and toughness are each equal to the number of charge counters on it."
+A:AB$ Animate | Cost$ 1 | Defined$ Self | Types$ Artifact,Creature,Construct | RemoveCreatureTypes$ True | staticAbilities$ Static | SpellDescription$ Until end of turn, CARDNAME becomes a Construct artifact creature with "This creature's power and toughness are each equal to the number of charge counters on it."
 SVar:Static:Mode$ Continuous | EffectZone$ Battlefield | CharacteristicDefining$ True | SetPower$ Y | SetToughness$ Y | Description$ This creature's power and toughness are each equal to the number of charge counters on it.
 SVar:Y:Count$CardCounters.CHARGE
 SVar:NeedsToPlayVar:Z GE4
diff --git a/forge-gui/res/cardsfolder/c/chimeric_sphere.txt b/forge-gui/res/cardsfolder/c/chimeric_sphere.txt
index f7a098240b4..3fb502f6afb 100644
--- a/forge-gui/res/cardsfolder/c/chimeric_sphere.txt
+++ b/forge-gui/res/cardsfolder/c/chimeric_sphere.txt
@@ -1,6 +1,6 @@
 Name:Chimeric Sphere
 ManaCost:3
 Types:Artifact
-A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 2 | Toughness$ 1 | Keywords$ Flying | Types$ Creature,Artifact,Construct | SpellDescription$ Until end of turn, CARDNAME becomes a 2/1 Construct artifact creature with flying.
-A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 3 | Toughness$ 2 | RemoveKeywords$ Flying | Types$ Creature,Artifact,Construct | SpellDescription$ Until end of turn, CARDNAME becomes a 3/2 Construct artifact creature and loses flying.
+A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 2 | Toughness$ 1 | Keywords$ Flying | Types$ Creature,Artifact,Construct | RemoveCreatureTypes$ True | SpellDescription$ Until end of turn, CARDNAME becomes a 2/1 Construct artifact creature with flying.
+A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 3 | Toughness$ 2 | RemoveKeywords$ Flying | Types$ Creature,Artifact,Construct | RemoveCreatureTypes$ True | SpellDescription$ Until end of turn, CARDNAME becomes a 3/2 Construct artifact creature and loses flying.
 Oracle:{2}: Until end of turn, Chimeric Sphere becomes a 2/1 Construct artifact creature with flying.\n{2}: Until end of turn, Chimeric Sphere becomes a 3/2 Construct artifact creature and loses flying.
diff --git a/forge-gui/res/cardsfolder/c/chimeric_staff.txt b/forge-gui/res/cardsfolder/c/chimeric_staff.txt
index bccb69b41ec..2a2511d26ac 100644
--- a/forge-gui/res/cardsfolder/c/chimeric_staff.txt
+++ b/forge-gui/res/cardsfolder/c/chimeric_staff.txt
@@ -1,7 +1,7 @@
 Name:Chimeric Staff
 ManaCost:4
 Types:Artifact
-A:AB$ Animate | Cost$ X | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Construct | SpellDescription$ CARDNAME becomes an X/X Construct artifact creature until end of turn.
+A:AB$ Animate | Cost$ X | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Construct | RemoveCreatureTypes$ True | SpellDescription$ CARDNAME becomes an X/X Construct artifact creature until end of turn.
 SVar:X:Count$xPaid
 AI:RemoveDeck:All
 Oracle:{X}: Chimeric Staff becomes an X/X Construct artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/chronatog_totem.txt b/forge-gui/res/cardsfolder/c/chronatog_totem.txt
index e451f61e91d..5349e944a44 100644
--- a/forge-gui/res/cardsfolder/c/chronatog_totem.txt
+++ b/forge-gui/res/cardsfolder/c/chronatog_totem.txt
@@ -2,7 +2,7 @@ Name:Chronatog Totem
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
-A:AB$ Animate | Cost$ 1 U | Defined$ Self | Power$ 1 | Toughness$ 2 | Types$ Creature,Artifact,Atog | Colors$ Blue | SpellDescription$ CARDNAME becomes a 1/2 blue Atog artifact creature until end of turn.
+A:AB$ Animate | Cost$ 1 U | Defined$ Self | Power$ 1 | Toughness$ 2 | Types$ Creature,Artifact,Atog | RemoveCreatureTypes$ True | Colors$ Blue | SpellDescription$ CARDNAME becomes a 1/2 blue Atog artifact creature until end of turn.
 A:AB$ Pump | Cost$ 0 | Defined$ Self | NumAtt$ +3 | NumDef$ +3 | IsPresent$ Card.Self+Creature | ActivationLimit$ 1 | SubAbility$ SkipTurn | SpellDescription$ CARDNAME gets +3/+3 until end of turn. You skip your next turn. Activate only once each turn and only if CARDNAME is a creature.
 SVar:SkipTurn:DB$ SkipTurn | NumTurns$ 1 | Defined$ You
 Oracle:{T}: Add {U}.\n{1}{U}: Chronatog Totem becomes a 1/2 blue Atog artifact creature until end of turn.\n{0}: Chronatog Totem gets +3/+3 until end of turn. You skip your next turn. Activate only once each turn and only if Chronatog Totem is a creature.
diff --git a/forge-gui/res/cardsfolder/d/darksteel_brute.txt b/forge-gui/res/cardsfolder/d/darksteel_brute.txt
index 2596d48cc87..afd4654af75 100644
--- a/forge-gui/res/cardsfolder/d/darksteel_brute.txt
+++ b/forge-gui/res/cardsfolder/d/darksteel_brute.txt
@@ -2,5 +2,5 @@ Name:Darksteel Brute
 ManaCost:2
 Types:Artifact
 K:Indestructible
-A:AB$ Animate | Cost$ 3 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Artifact,Beast | SpellDescription$ CARDNAME becomes a 2/2 Beast artifact creature until end of turn.
+A:AB$ Animate | Cost$ 3 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Artifact,Beast | RemoveCreatureTypes$ True | SpellDescription$ CARDNAME becomes a 2/2 Beast artifact creature until end of turn.
 Oracle:Indestructible (Damage and effects that say "destroy" don't destroy this artifact.)\n{3}: Darksteel Brute becomes a 2/2 Beast artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/d/dimir_keyrune.txt b/forge-gui/res/cardsfolder/d/dimir_keyrune.txt
index 9db5a4b6657..cfe08a46515 100644
--- a/forge-gui/res/cardsfolder/d/dimir_keyrune.txt
+++ b/forge-gui/res/cardsfolder/d/dimir_keyrune.txt
@@ -2,7 +2,7 @@ Name:Dimir Keyrune
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo U B | SpellDescription$ Add {U} or {B}.
-A:AB$ Animate | Cost$ U B | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Horror | Colors$ Blue,Black | SubAbility$ DBUnblockable | SpellDescription$ CARDNAME becomes a 2/2 blue and black Horror artifact creature until end of turn and can't be blocked this turn.
+A:AB$ Animate | Cost$ U B | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Horror | RemoveCreatureTypes$ True | Colors$ Blue,Black | SubAbility$ DBUnblockable | SpellDescription$ CARDNAME becomes a 2/2 blue and black Horror artifact creature until end of turn and can't be blocked this turn.
 SVar:DBUnblockable:DB$ Effect | ExileOnMoved$ Battlefield | RememberObjects$ Self | StaticAbilities$ Unblockable
 SVar:Unblockable:Mode$ CantBlockBy | ValidAttacker$ Card.IsRemembered | Description$ This creature can't be blocked this turn.
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/d/dire_mimic.txt b/forge-gui/res/cardsfolder/d/dire_mimic.txt
index 7e72ea942db..d25a94d0717 100644
--- a/forge-gui/res/cardsfolder/d/dire_mimic.txt
+++ b/forge-gui/res/cardsfolder/d/dire_mimic.txt
@@ -3,6 +3,6 @@ ManaCost:2
 Types:Artifact Treasure
 K:Flash
 A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
-A:AB$ Animate | Cost$ 3 | Types$ Shapeshifter,Artifact,Creature | Power$ 5 | Toughness$ 5 | StackDescription$ SpellDescription | SpellDescription$ CARDNAME becomes a Shapeshifter artifact creature with base power and toughness 5/5 until end of turn.
+A:AB$ Animate | Cost$ 3 | Types$ Shapeshifter,Artifact,Creature | RemoveCreatureTypes$ True | Power$ 5 | Toughness$ 5 | StackDescription$ SpellDescription | SpellDescription$ CARDNAME becomes a Shapeshifter artifact creature with base power and toughness 5/5 until end of turn.
 DeckHas:Ability$Sacrifice & Type$Shapeshifter
 Oracle:Flash\n{T}, Sacrifice Dire Mimic: Add one mana of any color.\n{3}: Dire Mimic becomes a Shapeshifter artifact creature with base power and toughness 5/5 until end of turn.
diff --git a/forge-gui/res/cardsfolder/d/dread_statuary.txt b/forge-gui/res/cardsfolder/d/dread_statuary.txt
index 1229c3fdbe5..9435fa847b9 100644
--- a/forge-gui/res/cardsfolder/d/dread_statuary.txt
+++ b/forge-gui/res/cardsfolder/d/dread_statuary.txt
@@ -2,5 +2,5 @@ Name:Dread Statuary
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Animate | Cost$ 4 | Defined$ Self | Power$ 4 | Toughness$ 2 | Types$ Creature,Artifact,Golem | SpellDescription$ CARDNAME becomes a 4/2 Golem artifact creature until end of turn. It's still a land.
+A:AB$ Animate | Cost$ 4 | Defined$ Self | Power$ 4 | Toughness$ 2 | Types$ Creature,Artifact,Golem | RemoveCreatureTypes$ True | SpellDescription$ CARDNAME becomes a 4/2 Golem artifact creature until end of turn. It's still a land.
 Oracle:{T}: Add {C}.\n{4}: Dread Statuary becomes a 4/2 Golem artifact creature until end of turn. It's still a land.
diff --git a/forge-gui/res/cardsfolder/d/dromoka_monument.txt b/forge-gui/res/cardsfolder/d/dromoka_monument.txt
index 8f43cc4033d..36e65ffffb5 100644
--- a/forge-gui/res/cardsfolder/d/dromoka_monument.txt
+++ b/forge-gui/res/cardsfolder/d/dromoka_monument.txt
@@ -2,7 +2,7 @@ Name:Dromoka Monument
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo G W | SpellDescription$ Add {G} or {W}.
-A:AB$ Animate | Cost$ 4 G W | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | Colors$ Green,White | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 green and white Dragon artifact creature with flying until end of turn.
+A:AB$ Animate | Cost$ 4 G W | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | RemoveCreatureTypes$ True | Colors$ Green,White | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 green and white Dragon artifact creature with flying until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$Green|White
 Oracle:{T}: Add {G} or {W}.\n{4}{G}{W}: Dromoka Monument becomes a 4/4 green and white Dragon artifact creature with flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/e/eye_of_malcator.txt b/forge-gui/res/cardsfolder/e/eye_of_malcator.txt
index 8ecf415218e..04ef57b93e7 100644
--- a/forge-gui/res/cardsfolder/e/eye_of_malcator.txt
+++ b/forge-gui/res/cardsfolder/e/eye_of_malcator.txt
@@ -4,6 +4,6 @@ Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigScry | TriggerDescription$ When CARDNAME enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom and the rest on top in any order.)
 SVar:TrigScry:DB$ Scry | ScryNum$ 2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ Whenever another artifact enters the battlefield under your control, CARDNAME becomes a 4/4 Phyrexian Eye artifact creature until end of turn.
-SVar:TrigAnimate:DB$ Animate | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Phyrexian,Eye
+SVar:TrigAnimate:DB$ Animate | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Phyrexian,Eye | RemoveCreatureTypes$ True
 DeckHas:Type$Eye|Phryexian
 Oracle:When Eye of Malcator enters the battlefield, scry 2. (Look at the top two cards of your library, then put any number of them on the bottom and the rest on top in any order.)\nWhenever another artifact enters the battlefield under your control, Eye of Malcator becomes a 4/4 Phyrexian Eye artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/f/fblthp_the_lost.txt b/forge-gui/res/cardsfolder/f/fblthp_the_lost.txt
index f6e945a9c0b..efd7874de7c 100644
--- a/forge-gui/res/cardsfolder/f/fblthp_the_lost.txt
+++ b/forge-gui/res/cardsfolder/f/fblthp_the_lost.txt
@@ -7,6 +7,6 @@ SVar:DBDraw:DB$ Draw | NumCards$ DrawNum
 SVar:DrawNum:SVar$LibNum1/LimitMax.2
 SVar:LibNum1:Count$wasCastFromYourLibrary.2.1/Plus.LibNum2
 SVar:LibNum2:TriggeredCardLKI$Valid Card.inZoneLibrary
-T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigShuffle | TriggerDescription$ When CARDNAME becomes the target of a spell, shuffle CARDNAME into its owner's library.
+T:Mode$ BecomesTarget | ValidTarget$ Card.Self | ValidSource$ Spell | TriggerZones$ Battlefield | Execute$ TrigShuffle | TriggerDescription$ When NICKNAME becomes the target of a spell, shuffle NICKNAME into its owner's library.
 SVar:TrigShuffle:DB$ ChangeZone | Origin$ Battlefield | Destination$ Library | Shuffle$ True | Defined$ Self
 Oracle:When Fblthp, the Lost enters the battlefield, draw a card. If it entered from your library or was cast from your library, draw two cards instead.\nWhen Fblthp becomes the target of a spell, shuffle Fblthp into its owner's library.
diff --git a/forge-gui/res/cardsfolder/f/foriysian_totem.txt b/forge-gui/res/cardsfolder/f/foriysian_totem.txt
index 5f8e279fc31..f732d5444b4 100644
--- a/forge-gui/res/cardsfolder/f/foriysian_totem.txt
+++ b/forge-gui/res/cardsfolder/f/foriysian_totem.txt
@@ -2,7 +2,7 @@ Name:Foriysian Totem
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}.
-A:AB$ Animate | Cost$ 4 R | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Giant | Colors$ Red | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 4/4 red Giant artifact creature with trample until end of turn.
+A:AB$ Animate | Cost$ 4 R | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Giant | RemoveCreatureTypes$ True | Colors$ Red | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 4/4 red Giant artifact creature with trample until end of turn.
 S:Mode$ Continuous | Affected$ Creature.Self | CanBlockAmount$ 1 | Description$ As long as CARDNAME is a creature, it can block an additional creature each combat.
 DeckNeeds:Color$Red
 #TODO: The AI won't block multiple creatures yet, it seems. Can be improved.
diff --git a/forge-gui/res/cardsfolder/f/fountain_of_ichor.txt b/forge-gui/res/cardsfolder/f/fountain_of_ichor.txt
index 36d44c9f583..701ec41e072 100644
--- a/forge-gui/res/cardsfolder/f/fountain_of_ichor.txt
+++ b/forge-gui/res/cardsfolder/f/fountain_of_ichor.txt
@@ -2,6 +2,6 @@ Name:Fountain of Ichor
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
-A:AB$ Animate | Cost$ 3 | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Artifact,Dinosaur | SpellDescription$ CARDNAME becomes a 3/3 Dinosaur artifact creature until end of turn.
+A:AB$ Animate | Cost$ 3 | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Artifact,Dinosaur | RemoveCreatureTypes$ True | SpellDescription$ CARDNAME becomes a 3/3 Dinosaur artifact creature until end of turn.
 AI:RemoveDeck:Random
 Oracle:{T}: Add one mana of any color.\n{3}: Fountain of Ichor becomes a 3/3 Dinosaur artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/f/frostwalk_bastion.txt b/forge-gui/res/cardsfolder/f/frostwalk_bastion.txt
index 0988e787344..60b26c18523 100644
--- a/forge-gui/res/cardsfolder/f/frostwalk_bastion.txt
+++ b/forge-gui/res/cardsfolder/f/frostwalk_bastion.txt
@@ -2,7 +2,7 @@ Name:Frostwalk Bastion
 ManaCost:no cost
 Types:Snow Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Animate | Cost$ 1 S | Defined$ Self | Power$ 2 | Toughness$ 3 | Types$ Creature,Artifact,Construct | SpellDescription$ Until end of turn, CARDNAME becomes a 2/3 Construct artifact creature. It's still a land. ({S} can be paid with one mana from a snow source.)
+A:AB$ Animate | Cost$ 1 S | Defined$ Self | Power$ 2 | Toughness$ 3 | Types$ Creature,Artifact,Construct | RemoveCreatureTypes$ True | SpellDescription$ Until end of turn, CARDNAME becomes a 2/3 Construct artifact creature. It's still a land. ({S} can be paid with one mana from a snow source.)
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | Defined$ TriggeredTarget | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ TriggeredTarget | KW$ HIDDEN This card doesn't untap during your next untap step. | Duration$ Permanent | IsCurse$ True
diff --git a/forge-gui/res/cardsfolder/g/glint_hawk_idol.txt b/forge-gui/res/cardsfolder/g/glint_hawk_idol.txt
index 2109454d3cf..dce0bef7019 100644
--- a/forge-gui/res/cardsfolder/g/glint_hawk_idol.txt
+++ b/forge-gui/res/cardsfolder/g/glint_hawk_idol.txt
@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigAnimate | TriggerDescription$ Whenever another artifact enters the battlefield under your control, you may have CARDNAME become a 2/2 Bird artifact creature with flying until end of turn.
 SVar:TrigAnimate:DB$ Animate | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Bird | Keywords$ Flying
-A:AB$ Animate | Cost$ W | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Bird | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 2/2 Bird artifact creature with flying until end of turn.
+A:AB$ Animate | Cost$ W | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Bird | RemoveCreatureTypes$ True | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 2/2 Bird artifact creature with flying until end of turn.
 SVar:BuffedBy:Artifact
 AI:RemoveDeck:Random
 DeckNeeds:Color$White
diff --git a/forge-gui/res/cardsfolder/g/golgari_keyrune.txt b/forge-gui/res/cardsfolder/g/golgari_keyrune.txt
index 5d149b835db..466de3bea70 100644
--- a/forge-gui/res/cardsfolder/g/golgari_keyrune.txt
+++ b/forge-gui/res/cardsfolder/g/golgari_keyrune.txt
@@ -2,7 +2,7 @@ Name:Golgari Keyrune
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo B G | SpellDescription$ Add {B} or {G}.
-A:AB$ Animate | Cost$ B G | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Insect | Colors$ Black,Green | Keywords$ Deathtouch | SpellDescription$ CARDNAME becomes a 2/2 black and green Insect artifact creature with deathtouch until end of turn.
+A:AB$ Animate | Cost$ B G | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Insect | RemoveCreatureTypes$ True | Colors$ Black,Green | Keywords$ Deathtouch | SpellDescription$ CARDNAME becomes a 2/2 black and green Insect artifact creature with deathtouch until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$Black|Green
 Oracle:{T}: Add {B} or {G}.\n{B}{G}: Golgari Keyrune becomes a 2/2 black and green Insect artifact creature with deathtouch until end of turn.
diff --git a/forge-gui/res/cardsfolder/g/gruul_keyrune.txt b/forge-gui/res/cardsfolder/g/gruul_keyrune.txt
index 10252189a8d..333a45fe255 100644
--- a/forge-gui/res/cardsfolder/g/gruul_keyrune.txt
+++ b/forge-gui/res/cardsfolder/g/gruul_keyrune.txt
@@ -2,7 +2,7 @@ Name:Gruul Keyrune
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo R G | SpellDescription$ Add {R} or {G}.
-A:AB$ Animate | Cost$ R G | Defined$ Self | Power$ 3 | Toughness$ 2 | Types$ Artifact,Creature,Beast | Colors$ Red,Green | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 3/2 red and green Beast artifact creature with trample until end of turn.
+A:AB$ Animate | Cost$ R G | Defined$ Self | Power$ 3 | Toughness$ 2 | Types$ Artifact,Creature,Beast | RemoveCreatureTypes$ True | Colors$ Red,Green | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 3/2 red and green Beast artifact creature with trample until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$Red|Green
 Oracle:{T}: Add {R} or {G}.\n{R}{G}: Gruul Keyrune becomes a 3/2 red and green Beast artifact creature with trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/g/gruul_war_plow.txt b/forge-gui/res/cardsfolder/g/gruul_war_plow.txt
index c5a232b96f5..c568fda386b 100644
--- a/forge-gui/res/cardsfolder/g/gruul_war_plow.txt
+++ b/forge-gui/res/cardsfolder/g/gruul_war_plow.txt
@@ -2,5 +2,5 @@ Name:Gruul War Plow
 ManaCost:4
 Types:Artifact
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddKeyword$ Trample | Description$ Creatures you control have trample.
-A:AB$ Animate | Cost$ 1 R G | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Artifact,Juggernaut | SpellDescription$ CARDNAME becomes a 4/4 Juggernaut artifact creature until end of turn.
+A:AB$ Animate | Cost$ 1 R G | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Artifact,Juggernaut | RemoveCreatureTypes$ True | SpellDescription$ CARDNAME becomes a 4/4 Juggernaut artifact creature until end of turn.
 Oracle:Creatures you control have trample.\n{1}{R}{G}: Gruul War Plow becomes a 4/4 Juggernaut artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/g/guardian_idol.txt b/forge-gui/res/cardsfolder/g/guardian_idol.txt
index ae84951df3b..455eaa6c76d 100644
--- a/forge-gui/res/cardsfolder/g/guardian_idol.txt
+++ b/forge-gui/res/cardsfolder/g/guardian_idol.txt
@@ -3,5 +3,5 @@ ManaCost:2
 Types:Artifact
 K:CARDNAME enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Golem | SpellDescription$ CARDNAME becomes a 2/2 Golem artifact creature until end of turn.
+A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Golem | RemoveCreatureTypes$ True | SpellDescription$ CARDNAME becomes a 2/2 Golem artifact creature until end of turn.
 Oracle:Guardian Idol enters the battlefield tapped.\n{T}: Add {C}.\n{2}: Guardian Idol becomes a 2/2 Golem artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/h/haunted_plate_mail.txt b/forge-gui/res/cardsfolder/h/haunted_plate_mail.txt
index 95d6eb15f08..786ed373fb0 100644
--- a/forge-gui/res/cardsfolder/h/haunted_plate_mail.txt
+++ b/forge-gui/res/cardsfolder/h/haunted_plate_mail.txt
@@ -3,5 +3,5 @@ ManaCost:4
 Types:Artifact Equipment
 K:Equip:4
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 4 | AddToughness$ 4 | Description$ Equipped creature gets +4/+4.
-A:AB$ Animate | Cost$ 0 | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Artifact,Spirit | RemoveTypes$ Equipment | IsPresent$ Creature.YouCtrl | PresentCompare$ EQ0 | SpellDescription$ Until end of turn, CARDNAME becomes a 4/4 Spirit artifact creature that's no longer an Equipment. Activate only if you control no creatures.
+A:AB$ Animate | Cost$ 0 | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Artifact,Spirit | RemoveCreatureTypes$ True | RemoveTypes$ Equipment | IsPresent$ Creature.YouCtrl | PresentCompare$ EQ0 | SpellDescription$ Until end of turn, CARDNAME becomes a 4/4 Spirit artifact creature that's no longer an Equipment. Activate only if you control no creatures.
 Oracle:Equipped creature gets +4/+4.\n{0}: Until end of turn, Haunted Plate Mail becomes a 4/4 Spirit artifact creature that's no longer an Equipment. Activate only if you control no creatures.\nEquip {4} ({4}: Attach to target creature you control. Equip only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/i/inkmoth_nexus.txt b/forge-gui/res/cardsfolder/i/inkmoth_nexus.txt
index 0c66646d893..924bf8102f2 100644
--- a/forge-gui/res/cardsfolder/i/inkmoth_nexus.txt
+++ b/forge-gui/res/cardsfolder/i/inkmoth_nexus.txt
@@ -2,5 +2,5 @@ Name:Inkmoth Nexus
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Artifact,Phyrexian,Blinkmoth | Keywords$ Flying & Infect | SpellDescription$ CARDNAME becomes a 1/1 Phyrexian Blinkmoth artifact creature with flying and infect until end of turn. It's still a land. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
+A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Artifact,Phyrexian,Blinkmoth | RemoveCreatureTypes$ True | Keywords$ Flying & Infect | SpellDescription$ CARDNAME becomes a 1/1 Phyrexian Blinkmoth artifact creature with flying and infect until end of turn. It's still a land. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
 Oracle:{T}: Add {C}.\n{1}: Inkmoth Nexus becomes a 1/1 Phyrexian Blinkmoth artifact creature with flying and infect until end of turn. It's still a land. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
diff --git a/forge-gui/res/cardsfolder/i/izzet_keyrune.txt b/forge-gui/res/cardsfolder/i/izzet_keyrune.txt
index 749d61d852f..7ee9f999962 100644
--- a/forge-gui/res/cardsfolder/i/izzet_keyrune.txt
+++ b/forge-gui/res/cardsfolder/i/izzet_keyrune.txt
@@ -2,7 +2,7 @@ Name:Izzet Keyrune
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo U R | SpellDescription$ Add {U} or {R}.
-A:AB$ Animate | Cost$ U R | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Artifact,Creature,Elemental | Colors$ Blue,Red | SpellDescription$ Until end of turn, CARDNAME becomes a 2/1 blue and red Elemental artifact creature.
+A:AB$ Animate | Cost$ U R | Defined$ Self | Power$ 2 | Toughness$ 1 | Types$ Artifact,Creature,Elemental | RemoveCreatureTypes$ True | Colors$ Blue,Red | SpellDescription$ Until end of turn, CARDNAME becomes a 2/1 blue and red Elemental artifact creature.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigLoot | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card. If you do, discard a card.
 SVar:TrigLoot:AB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1 | Cost$ Draw<1/You>
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/j/jade_idol.txt b/forge-gui/res/cardsfolder/j/jade_idol.txt
index cfecddbe495..c1d3f095e76 100644
--- a/forge-gui/res/cardsfolder/j/jade_idol.txt
+++ b/forge-gui/res/cardsfolder/j/jade_idol.txt
@@ -2,7 +2,7 @@ Name:Jade Idol
 ManaCost:4
 Types:Artifact
 T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME becomes a 4/4 Spirit artifact creature until end of turn.
-SVar:TrigAnimate:DB$ Animate | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Artifact,Spirit
+SVar:TrigAnimate:DB$ Animate | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Artifact,Spirit | RemoveCreatureTypes$ True
 SVar:BuffedBy:Arcane,Spirit
 AI:RemoveDeck:Random
 DeckHints:Type$Spirit|Arcane
diff --git a/forge-gui/res/cardsfolder/j/jade_statue.txt b/forge-gui/res/cardsfolder/j/jade_statue.txt
index e58e255912e..40b5f277090 100644
--- a/forge-gui/res/cardsfolder/j/jade_statue.txt
+++ b/forge-gui/res/cardsfolder/j/jade_statue.txt
@@ -1,6 +1,6 @@
 Name:Jade Statue
 ManaCost:4
 Types:Artifact
-A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 3 | Toughness$ 6 | Types$ Creature,Artifact,Golem | Duration$ UntilEndOfCombat | ActivationPhases$ BeginCombat->EndCombat | SpellDescription$ CARDNAME becomes a 3/6 Golem artifact creature until end of combat. Activate only during combat.
+A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 3 | Toughness$ 6 | Types$ Creature,Artifact,Golem | RemoveCreatureTypes$ True | Duration$ UntilEndOfCombat | ActivationPhases$ BeginCombat->EndCombat | SpellDescription$ CARDNAME becomes a 3/6 Golem artifact creature until end of combat. Activate only during combat.
 DeckHas:Type$Golem|Creature
 Oracle:{2}: Jade Statue becomes a 3/6 Golem artifact creature until end of combat. Activate only during combat.
diff --git a/forge-gui/res/cardsfolder/k/kolaghan_monument.txt b/forge-gui/res/cardsfolder/k/kolaghan_monument.txt
index 83dd776a693..2e48ba62e8c 100644
--- a/forge-gui/res/cardsfolder/k/kolaghan_monument.txt
+++ b/forge-gui/res/cardsfolder/k/kolaghan_monument.txt
@@ -2,7 +2,7 @@ Name:Kolaghan Monument
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo B R | SpellDescription$ Add {B} or {R}.
-A:AB$ Animate | Cost$ 4 B R | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | Colors$ Black,Red | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 black and red Dragon artifact creature with flying until end of turn.
+A:AB$ Animate | Cost$ 4 B R | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | RemoveCreatureTypes$ True | Colors$ Black,Red | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 black and red Dragon artifact creature with flying until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$Black|Red
 Oracle:{T}: Add {B} or {R}.\n{4}{B}{R}: Kolaghan Monument becomes a 4/4 black and red Dragon artifact creature with flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/l/levitating_statue.txt b/forge-gui/res/cardsfolder/l/levitating_statue.txt
index 656745695cd..620e9024e5e 100644
--- a/forge-gui/res/cardsfolder/l/levitating_statue.txt
+++ b/forge-gui/res/cardsfolder/l/levitating_statue.txt
@@ -4,7 +4,7 @@ Types:Artifact
 K:Flying
 T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a noncreature spell, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
-A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Artifact,Construct | SpellDescription$ CARDNAME becomes a 1/1 Construct artifact creature until end of turn.
+A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 1 | Toughness$ 1 | Types$ Creature,Artifact,Construct | RemoveCreatureTypes$ True | SpellDescription$ CARDNAME becomes a 1/1 Construct artifact creature until end of turn.
 DeckHas:Ability$Counters & Type$Construct
 DeckHints:Type$Artifact|Instant|Sorcery|Enchantment
 Oracle:Flying\nWhenever you cast a noncreature spell, put a +1/+1 counter on Levitating Statue.\n{2}: Levitating Statue becomes a 1/1 Construct artifact creature until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/m/majestic_metamorphosis.txt b/forge-gui/res/cardsfolder/m/majestic_metamorphosis.txt
index 4e46e399ec1..02a2702b303 100644
--- a/forge-gui/res/cardsfolder/m/majestic_metamorphosis.txt
+++ b/forge-gui/res/cardsfolder/m/majestic_metamorphosis.txt
@@ -1,7 +1,7 @@
 Name:Majestic Metamorphosis
 ManaCost:2 U
 Types:Instant
-A:SP$ Animate | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | Power$ 4 | Toughness$ 4 | Types$ Angel,Artifact,Creature | Keywords$ Flying | SubAbility$ DBDraw | SpellDescription$ Until end of turn, target artifact or creature becomes a 4/4 Angel artifact creature and gains flying. Draw a card.
+A:SP$ Animate | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature | Power$ 4 | Toughness$ 4 | Types$ Angel,Artifact,Creature | RemoveCreatureTypes$ True | Keywords$ Flying | SubAbility$ DBDraw | SpellDescription$ Until end of turn, target artifact or creature becomes a 4/4 Angel artifact creature and gains flying. Draw a card.
 SVar:DBDraw:DB$ Draw | NumCards$ 1
 DeckHas:Type$Angel
 DeckNeeds:Type$Artifact|Creature
diff --git a/forge-gui/res/cardsfolder/m/mimic.txt b/forge-gui/res/cardsfolder/m/mimic.txt
index 4707e2e027a..4758327d388 100644
--- a/forge-gui/res/cardsfolder/m/mimic.txt
+++ b/forge-gui/res/cardsfolder/m/mimic.txt
@@ -2,6 +2,6 @@ Name:Mimic
 ManaCost:2
 Types:Artifact Treasure
 A:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color.
-A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Artifact,Creature,Shapeshifter | SpellDescription$ CARDNAME becomes a Shapeshifter artifact creature with base power and toughness 3/3 until end of turn.
+A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Artifact,Creature,Shapeshifter | RemoveCreatureTypes$ True | SpellDescription$ CARDNAME becomes a Shapeshifter artifact creature with base power and toughness 3/3 until end of turn.
 AI:RemoveDeck:Random
 Oracle:{T}, Sacrifice Mimic: Add one mana of any color.\n{2}: Mimic becomes a Shapeshifter artifact creature with base power and toughness 3/3 until end of turn.
diff --git a/forge-gui/res/cardsfolder/m/monument_to_perfection.txt b/forge-gui/res/cardsfolder/m/monument_to_perfection.txt
index 5eda4d14777..cd7b6d30519 100644
--- a/forge-gui/res/cardsfolder/m/monument_to_perfection.txt
+++ b/forge-gui/res/cardsfolder/m/monument_to_perfection.txt
@@ -2,7 +2,7 @@ Name:Monument to Perfection
 ManaCost:2
 Types:Artifact
 A:AB$ ChangeZone | Cost$ 3 T | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic,Land.Locus,Land.Sphere | ChangeTypeDesc$ basic, Sphere, or Locus land card | SpellDescription$ Search your library for a basic, Sphere, or Locus land card, reveal it, put it into your hand, then shuffle.
-A:AB$ Animate | Cost$ 3 | CheckSVar$ CountAll | SVarCompare$ GE9 | Power$ 9 | Toughness$ 9 | Types$ Artifact,Creature,Phyrexian,Construct | RemoveAllAbilities$ True | Defined$ Self | Keywords$ Indestructible & Toxic:9 | Duration$ Permanent | SpellDescription$ CARDNAME becomes a 9/9 Phyrexian Construct artifact creature, loses all abilities, and gains indestructible and toxic 9. Activate only if there are nine or more lands with different names among the basic, Sphere, and Locus lands you control.
+A:AB$ Animate | Cost$ 3 | CheckSVar$ CountAll | SVarCompare$ GE9 | Power$ 9 | Toughness$ 9 | Types$ Artifact,Creature,Phyrexian,Construct | RemoveCreatureTypes$ True | RemoveAllAbilities$ True | Defined$ Self | Keywords$ Indestructible & Toxic:9 | Duration$ Permanent | SpellDescription$ CARDNAME becomes a 9/9 Phyrexian Construct artifact creature, loses all abilities, and gains indestructible and toxic 9. Activate only if there are nine or more lands with different names among the basic, Sphere, and Locus lands you control.
 SVar:CountAll:Count$DifferentCardNames_Land.YouCtrl+inZoneBattlefield+Basic,Land.YouCtrl+inZoneBattlefield+Sphere,Land.YouCtrl+inZoneBattlefield+Locus
 DeckNeeds:Type$Locus|Sphere
 DeckHas:Type$Phyrexian|Construct|Artifact
diff --git a/forge-gui/res/cardsfolder/o/ojutai_monument.txt b/forge-gui/res/cardsfolder/o/ojutai_monument.txt
index 549802368b9..52af2034442 100644
--- a/forge-gui/res/cardsfolder/o/ojutai_monument.txt
+++ b/forge-gui/res/cardsfolder/o/ojutai_monument.txt
@@ -2,7 +2,7 @@ Name:Ojutai Monument
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo W U | SpellDescription$ Add {W} or {U}.
-A:AB$ Animate | Cost$ 4 W U | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | Colors$ White,Blue | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 white and blue Dragon artifact creature with flying until end of turn.
+A:AB$ Animate | Cost$ 4 W U | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | RemoveCreatureTypes$ True | Colors$ White,Blue | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 white and blue Dragon artifact creature with flying until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$White|Blue
 Oracle:{T}: Add {W} or {U}.\n{4}{W}{U}: Ojutai Monument becomes a 4/4 white and blue Dragon artifact creature with flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/o/orzhov_keyrune.txt b/forge-gui/res/cardsfolder/o/orzhov_keyrune.txt
index 4edfe3e9e6d..c0627dc62db 100644
--- a/forge-gui/res/cardsfolder/o/orzhov_keyrune.txt
+++ b/forge-gui/res/cardsfolder/o/orzhov_keyrune.txt
@@ -2,7 +2,7 @@ Name:Orzhov Keyrune
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo W B | SpellDescription$ Add {W} or {B}.
-A:AB$ Animate | Cost$ W B | Defined$ Self | Power$ 1 | Toughness$ 4 | Types$ Artifact,Creature,Thrull | Colors$ White,Black | Keywords$ Lifelink | SpellDescription$ CARDNAME becomes a 1/4 white and black Thrull artifact creature with lifelink until end of turn.
+A:AB$ Animate | Cost$ W B | Defined$ Self | Power$ 1 | Toughness$ 4 | Types$ Artifact,Creature,Thrull | RemoveCreatureTypes$ True | Colors$ White,Black | Keywords$ Lifelink | SpellDescription$ CARDNAME becomes a 1/4 white and black Thrull artifact creature with lifelink until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$White|Black
 Oracle:{T}: Add {W} or {B}.\n{W}{B}: Orzhov Keyrune becomes a 1/4 white and black Thrull artifact creature with lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_totem.txt b/forge-gui/res/cardsfolder/p/phyrexian_totem.txt
index 705077ba967..9ceca3bbd23 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_totem.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_totem.txt
@@ -2,7 +2,7 @@ Name:Phyrexian Totem
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ B | Amount$ 1 | SpellDescription$ Add {B}.
-A:AB$ Animate | Cost$ 2 B | Defined$ Self | Power$ 5 | Toughness$ 5 | Types$ Creature,Artifact,Phyrexian,Horror | Colors$ Black | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 5/5 black Phyrexian Horror artifact creature with trample until end of turn.
+A:AB$ Animate | Cost$ 2 B | Defined$ Self | Power$ 5 | Toughness$ 5 | Types$ Creature,Artifact,Phyrexian,Horror | RemoveCreatureTypes$ True | Colors$ Black | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 5/5 black Phyrexian Horror artifact creature with trample until end of turn.
 T:Mode$ DamageDoneOnce | ValidTarget$ Creature.Self | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME is dealt damage, if it's a creature, sacrifice that many permanents.
 SVar:TrigSac:DB$ Sacrifice | SacValid$ Permanent | Amount$ X
 SVar:X:TriggerCount$DamageAmount
diff --git a/forge-gui/res/cardsfolder/r/rakdos_keyrune.txt b/forge-gui/res/cardsfolder/r/rakdos_keyrune.txt
index 45e4b5f7338..ad81baf422e 100644
--- a/forge-gui/res/cardsfolder/r/rakdos_keyrune.txt
+++ b/forge-gui/res/cardsfolder/r/rakdos_keyrune.txt
@@ -2,7 +2,7 @@ Name:Rakdos Keyrune
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo B R | SpellDescription$ Add {B} or {R}.
-A:AB$ Animate | Cost$ B R | Defined$ Self | Power$ 3 | Toughness$ 1 | Types$ Artifact,Creature,Devil | Colors$ Black,Red | Keywords$ First Strike | SpellDescription$ CARDNAME becomes a 3/1 black and red Devil artifact creature with first strike until end of turn.
+A:AB$ Animate | Cost$ B R | Defined$ Self | Power$ 3 | Toughness$ 1 | Types$ Artifact,Creature,Devil | RemoveCreatureTypes$ True | Colors$ Black,Red | Keywords$ First Strike | SpellDescription$ CARDNAME becomes a 3/1 black and red Devil artifact creature with first strike until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$Black|Red
 Oracle:{T}: Add {B} or {R}.\n{B}{R}: Rakdos Keyrune becomes a 3/1 black and red Devil artifact creature with first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/selesnya_keyrune.txt b/forge-gui/res/cardsfolder/s/selesnya_keyrune.txt
index cefaf017792..025999a1c9a 100644
--- a/forge-gui/res/cardsfolder/s/selesnya_keyrune.txt
+++ b/forge-gui/res/cardsfolder/s/selesnya_keyrune.txt
@@ -2,7 +2,7 @@ Name:Selesnya Keyrune
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo G W | SpellDescription$ Add {G} or {W}.
-A:AB$ Animate | Cost$ G W | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Artifact,Creature,Wolf | Colors$ Green,White | SpellDescription$ CARDNAME becomes a 3/3 green and white Wolf artifact creature until end of turn.
+A:AB$ Animate | Cost$ G W | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Artifact,Creature,Wolf | RemoveCreatureTypes$ True | Colors$ Green,White | SpellDescription$ CARDNAME becomes a 3/3 green and white Wolf artifact creature until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$Green|White
 Oracle:{T}: Add {G} or {W}.\n{G}{W}: Selesnya Keyrune becomes a 3/3 green and white Wolf artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/silumgar_monument.txt b/forge-gui/res/cardsfolder/s/silumgar_monument.txt
index 6ad6f7bf690..5fd93a446a3 100644
--- a/forge-gui/res/cardsfolder/s/silumgar_monument.txt
+++ b/forge-gui/res/cardsfolder/s/silumgar_monument.txt
@@ -2,7 +2,7 @@ Name:Silumgar Monument
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo U B | SpellDescription$ Add {U} or {B}.
-A:AB$ Animate | Cost$ 4 U B | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | Colors$ Blue,Black | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 blue and black Dragon artifact creature with flying until end of turn.
+A:AB$ Animate | Cost$ 4 U B | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Artifact,Creature,Dragon | RemoveCreatureTypes$ True | Colors$ Blue,Black | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 4/4 blue and black Dragon artifact creature with flying until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$Blue|Black
 Oracle:{T}: Add {U} or {B}.\n{4}{U}{B}: Silumgar Monument becomes a 4/4 blue and black Dragon artifact creature with flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/s/simic_keyrune.txt b/forge-gui/res/cardsfolder/s/simic_keyrune.txt
index 08a6cd942f3..6570d6b3d16 100644
--- a/forge-gui/res/cardsfolder/s/simic_keyrune.txt
+++ b/forge-gui/res/cardsfolder/s/simic_keyrune.txt
@@ -2,7 +2,7 @@ Name:Simic Keyrune
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ Combo G U | SpellDescription$ Add {G} or {U}.
-A:AB$ Animate | Cost$ G U | Defined$ Self | Power$ 2 | Toughness$ 3 | Types$ Artifact,Creature,Crab | Colors$ Green,Blue | Keywords$ Hexproof | SpellDescription$ CARDNAME becomes a 2/3 green and blue Crab artifact creature with hexproof until end of turn.
+A:AB$ Animate | Cost$ G U | Defined$ Self | Power$ 2 | Toughness$ 3 | Types$ Artifact,Creature,Crab | RemoveCreatureTypes$ True | Colors$ Green,Blue | Keywords$ Hexproof | SpellDescription$ CARDNAME becomes a 2/3 green and blue Crab artifact creature with hexproof until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$Green|Blue
 Oracle:{T}: Add {G} or {U}.\n{G}{U}: Simic Keyrune becomes a 2/3 green and blue Crab artifact creature with hexproof until end of turn. (It can't be the target of spells or abilities your opponents control.)
diff --git a/forge-gui/res/cardsfolder/s/slumbering_tora.txt b/forge-gui/res/cardsfolder/s/slumbering_tora.txt
index 64059c105eb..d6e504b34c4 100644
--- a/forge-gui/res/cardsfolder/s/slumbering_tora.txt
+++ b/forge-gui/res/cardsfolder/s/slumbering_tora.txt
@@ -1,7 +1,7 @@
 Name:Slumbering Tora
 ManaCost:3
 Types:Artifact
-A:AB$ Animate | Cost$ 2 Discard<1/Spirit;Arcane/spirit or arcane card> | CostDesc$ {2}, Discard a Spirit or Arcane card: | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Cat | SpellDescription$ CARDNAME becomes an X/X Cat artifact creature until end of turn, where X is the discarded card's mana value.
+A:AB$ Animate | Cost$ 2 Discard<1/Spirit;Arcane/spirit or arcane card> | CostDesc$ {2}, Discard a Spirit or Arcane card: | Defined$ Self | Power$ X | Toughness$ X | Types$ Creature,Artifact,Cat | RemoveCreatureTypes$ True | SpellDescription$ CARDNAME becomes an X/X Cat artifact creature until end of turn, where X is the discarded card's mana value.
 SVar:X:Discarded$CardManaCost
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/s/stalking_stones.txt b/forge-gui/res/cardsfolder/s/stalking_stones.txt
index dae8a611a3d..519b6dfd355 100644
--- a/forge-gui/res/cardsfolder/s/stalking_stones.txt
+++ b/forge-gui/res/cardsfolder/s/stalking_stones.txt
@@ -2,5 +2,5 @@ Name:Stalking Stones
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Animate | Cost$ 6 | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Artifact,Elemental | Duration$ Permanent | SpellDescription$ CARDNAME becomes a 3/3 Elemental artifact creature that's still a land. (This effect lasts indefinitely.)
+A:AB$ Animate | Cost$ 6 | Defined$ Self | Power$ 3 | Toughness$ 3 | Types$ Creature,Artifact,Elemental | RemoveCreatureTypes$ True | Duration$ Permanent | SpellDescription$ CARDNAME becomes a 3/3 Elemental artifact creature that's still a land. (This effect lasts indefinitely.)
 Oracle:{T}: Add {C}.\n{6}: Stalking Stones becomes a 3/3 Elemental artifact creature that's still a land. (This effect lasts indefinitely.)
diff --git a/forge-gui/res/cardsfolder/s/stuffed_bear.txt b/forge-gui/res/cardsfolder/s/stuffed_bear.txt
index 03fe3741b5a..18ade638fa5 100644
--- a/forge-gui/res/cardsfolder/s/stuffed_bear.txt
+++ b/forge-gui/res/cardsfolder/s/stuffed_bear.txt
@@ -1,5 +1,5 @@
 Name:Stuffed Bear
 ManaCost:2
 Types:Artifact
-A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Artifact,Bear | Colors$ Green | SpellDescription$ CARDNAME becomes a 4/4 green Bear artifact creature until end of turn.
+A:AB$ Animate | Cost$ 2 | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Artifact,Bear | RemoveCreatureTypes$ True | Colors$ Green | SpellDescription$ CARDNAME becomes a 4/4 green Bear artifact creature until end of turn.
 Oracle:{2}: Stuffed Bear becomes a 4/4 green Bear artifact creature until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/thunder_totem.txt b/forge-gui/res/cardsfolder/t/thunder_totem.txt
index 0b80a4c4ace..82f2a008114 100644
--- a/forge-gui/res/cardsfolder/t/thunder_totem.txt
+++ b/forge-gui/res/cardsfolder/t/thunder_totem.txt
@@ -2,7 +2,7 @@ Name:Thunder Totem
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ W | Amount$ 1 | SpellDescription$ Add {W}.
-A:AB$ Animate | Cost$ 1 W W | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Artifact,Spirit | Colors$ White | Keywords$ Flying & First Strike | SpellDescription$ CARDNAME becomes a 2/2 white Spirit artifact creature with flying and first strike until end of turn.
+A:AB$ Animate | Cost$ 1 W W | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,Artifact,Spirit | RemoveCreatureTypes$ True | Colors$ White | Keywords$ Flying & First Strike | SpellDescription$ CARDNAME becomes a 2/2 white Spirit artifact creature with flying and first strike until end of turn.
 AI:RemoveDeck:Random
 DeckNeeds:Color$White
 Oracle:{T}: Add {W}.\n{1}{W}{W}: Thunder Totem becomes a 2/2 white Spirit artifact creature with flying and first strike until end of turn.
diff --git a/forge-gui/res/cardsfolder/w/weatherseed_totem.txt b/forge-gui/res/cardsfolder/w/weatherseed_totem.txt
index a07c607ecdd..d4fad486bdd 100644
--- a/forge-gui/res/cardsfolder/w/weatherseed_totem.txt
+++ b/forge-gui/res/cardsfolder/w/weatherseed_totem.txt
@@ -2,7 +2,7 @@ Name:Weatherseed Totem
 ManaCost:3
 Types:Artifact
 A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}.
-A:AB$ Animate | Cost$ 2 G G G | Defined$ Self | Power$ 5 | Toughness$ 3 | Types$ Creature,Artifact,Treefolk | Colors$ Green | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 5/3 green Treefolk artifact creature with trample until end of turn.
+A:AB$ Animate | Cost$ 2 G G G | Defined$ Self | Power$ 5 | Toughness$ 3 | Types$ Creature,Artifact,Treefolk | RemoveCreatureTypes$ True | Colors$ Green | Keywords$ Trample | SpellDescription$ CARDNAME becomes a 5/3 green Treefolk artifact creature with trample until end of turn.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self+Creature | Execute$ TrigChange | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, if it was a creature, return this card to its owner's hand.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ TriggeredNewCardLKICopy
 Oracle:{T}: Add {G}.\n{2}{G}{G}{G}: Weatherseed Totem becomes a 5/3 green Treefolk artifact creature with trample until end of turn.\nWhen Weatherseed Totem is put into a graveyard from the battlefield, if it was a creature, return this card to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/w/workshop_elders.txt b/forge-gui/res/cardsfolder/w/workshop_elders.txt
index 68e251c06d3..7995a1c94e4 100644
--- a/forge-gui/res/cardsfolder/w/workshop_elders.txt
+++ b/forge-gui/res/cardsfolder/w/workshop_elders.txt
@@ -5,7 +5,7 @@ PT:4/4
 S:Mode$ Continuous | Affected$ Creature.Artifact+YouCtrl | AddKeyword$ Flying | Description$ Artifact creatures you control have flying.
 SVar:PlayMain1:TRUE
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigAnimate | TriggerDescription$ At the beginning of combat on your turn, you may have target noncreature artifact you control becomes a 0/0 artifact creature. If you do, put four +1/+1 counters on it.
-SVar:TrigAnimate:DB$ Animate | ValidTgts$ Artifact.nonCreature+YouCtrl | TgtPrompt$ Select noncreature artifact | Power$ 0 | Toughness$ 0 | Types$ Artifact,Creature | RemoveCardTypes$ True | Duration$ Permanent | SubAbility$ DBPutCounter
+SVar:TrigAnimate:DB$ Animate | ValidTgts$ Artifact.nonCreature+YouCtrl | TgtPrompt$ Select noncreature artifact | Power$ 0 | Toughness$ 0 | Types$ Artifact,Creature | Duration$ Permanent | SubAbility$ DBPutCounter
 SVar:DBPutCounter:DB$ PutCounter | Defined$ Targeted | CounterType$ P1P1 | CounterNum$ 4
 DeckHas:Ability$Counters
 Oracle:Artifact creatures you control have flying.\nAt the beginning of combat on your turn, you may have target noncreature artifact you control become a 0/0 artifact creature. If you do, put four +1/+1 counters on it.
diff --git a/forge-gui/res/cardsfolder/x/xanthic_statue.txt b/forge-gui/res/cardsfolder/x/xanthic_statue.txt
index af2deacbaa4..7ab0c50e1be 100644
--- a/forge-gui/res/cardsfolder/x/xanthic_statue.txt
+++ b/forge-gui/res/cardsfolder/x/xanthic_statue.txt
@@ -1,5 +1,5 @@
 Name:Xanthic Statue
 ManaCost:8
 Types:Artifact
-A:AB$ Animate | Cost$ 5 | Defined$ Self | Power$ 8 | Toughness$ 8 | Types$ Creature,Artifact,Golem | Keywords$ Trample | SpellDescription$ Until end of turn, CARDNAME becomes an 8/8 Golem artifact creature with trample.
+A:AB$ Animate | Cost$ 5 | Defined$ Self | Power$ 8 | Toughness$ 8 | Types$ Creature,Artifact,Golem | RemoveCreatureTypes$ True | Keywords$ Trample | SpellDescription$ Until end of turn, CARDNAME becomes an 8/8 Golem artifact creature with trample.
 Oracle:{5}: Until end of turn, Xanthic Statue becomes an 8/8 Golem artifact creature with trample.