diff --git a/res/cardsfolder/a/amoeboid_changeling.txt b/res/cardsfolder/a/amoeboid_changeling.txt
index 841fda79d5b..88672808229 100644
--- a/res/cardsfolder/a/amoeboid_changeling.txt
+++ b/res/cardsfolder/a/amoeboid_changeling.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Creature Shapeshifter
 Text:no text
 PT:1/1
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 A:AB$ Pump | Cost$ T |ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Changeling | SpellDescription$ Target creature gains all creature types until end of turn.
 A:AB$ Animate | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Types$ Creature | RemoveCreatureTypes$ True| IsCurse$ True | SpellDescription$ Target creature loses all creature types until end of turn.
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/a/avian_changeling.txt b/res/cardsfolder/a/avian_changeling.txt
index f0d11e5fc39..de7c028e4aa 100644
--- a/res/cardsfolder/a/avian_changeling.txt
+++ b/res/cardsfolder/a/avian_changeling.txt
@@ -4,7 +4,7 @@ Types:Creature Shapeshifter
 Text:no text
 PT:2/2
 K:Flying
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/lrw/en/card145813.jpg
 SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/4.jpg
diff --git a/res/cardsfolder/b/blades_of_velis_vel.txt b/res/cardsfolder/b/blades_of_velis_vel.txt
index 870fc86fd41..26a837d01a8 100644
--- a/res/cardsfolder/b/blades_of_velis_vel.txt
+++ b/res/cardsfolder/b/blades_of_velis_vel.txt
@@ -2,7 +2,7 @@ Name:Blades of Velis Vel
 ManaCost:1 R
 Types:Tribal Instant Shapeshifter
 Text:no text
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 A:SP$ Pump | Cost$ 1 R | TargetMin$ 0 | TargetMax$ 2 | NumAtt$ +2 | KW$ Changeling | ValidTgts$ Creature | TgtPrompt$ Select target Creature | SpellDescription$ Up to two target creatures each get +2/+0 and gain all creature types until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blades_of_velis_vel.jpg
diff --git a/res/cardsfolder/c/chameleon_colossus.txt b/res/cardsfolder/c/chameleon_colossus.txt
index 262c42cb119..ba137e28515 100644
--- a/res/cardsfolder/c/chameleon_colossus.txt
+++ b/res/cardsfolder/c/chameleon_colossus.txt
@@ -3,7 +3,7 @@ ManaCost:2 G G
 Types:Creature Shapeshifter
 Text:no text
 PT:4/4
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 K:Protection from black
 A:AB$ Pump | Cost$ 2 G G | NumAtt$ +X | NumDef$ +X | SpellDescription$ CARDNAME gets +X/+X until end of turn, where X is its power.
 SVar:X:Count$CardPower
diff --git a/res/cardsfolder/c/changeling_berserker.txt b/res/cardsfolder/c/changeling_berserker.txt
index 603106ea018..76cf6525c2a 100644
--- a/res/cardsfolder/c/changeling_berserker.txt
+++ b/res/cardsfolder/c/changeling_berserker.txt
@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Creature Shapeshifter
 Text:no text
 PT:5/3
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 K:Haste
 K:Champion:Creature
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/c/changeling_hero.txt b/res/cardsfolder/c/changeling_hero.txt
index 0833aa6169b..693e105edac 100644
--- a/res/cardsfolder/c/changeling_hero.txt
+++ b/res/cardsfolder/c/changeling_hero.txt
@@ -3,7 +3,7 @@ ManaCost:4 W
 Types:Creature Shapeshifter
 Text:no text
 PT:4/4
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 K:Lifelink
 K:Champion:Creature
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/c/changeling_sentinel.txt b/res/cardsfolder/c/changeling_sentinel.txt
index b8a3230b88a..64f19b14b56 100644
--- a/res/cardsfolder/c/changeling_sentinel.txt
+++ b/res/cardsfolder/c/changeling_sentinel.txt
@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Creature Shapeshifter
 Text:no text
 PT:3/2
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 K:Vigilance
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/changeling_sentinel.jpg
diff --git a/res/cardsfolder/c/changeling_titan.txt b/res/cardsfolder/c/changeling_titan.txt
index fda7a41ea46..f2e965065eb 100644
--- a/res/cardsfolder/c/changeling_titan.txt
+++ b/res/cardsfolder/c/changeling_titan.txt
@@ -3,7 +3,7 @@ ManaCost:4 G
 Types:Creature Shapeshifter
 Text:no text
 PT:7/7
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 K:Champion:Creature
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/c/crib_swap.txt b/res/cardsfolder/c/crib_swap.txt
index 824f15295f9..af47a7c80a9 100644
--- a/res/cardsfolder/c/crib_swap.txt
+++ b/res/cardsfolder/c/crib_swap.txt
@@ -2,7 +2,7 @@ Name:Crib Swap
 ManaCost:2 W
 Types:Tribal Instant Shapeshifter
 Text:no text
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 A:SP$ ChangeZone | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | IsCurse$ True | SubAbility$ SVar=DBToken | SpellDescription$ Exile target creature. Its controller puts a 1/1 colorless Shapeshifter creature token with changeling onto the battlefield.
 SVar:DBToken:DB$Token | TokenImage$ C 1 1 Shapeshifter | TokenColors$ Colorless | TokenAmount$ 1 | TokenName$ Changeling | TokenTypes$ Creature,Shapeshifter | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Changeling | TokenOwner$ TargetedController
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/e/ego_erasure.txt b/res/cardsfolder/e/ego_erasure.txt
index dea42b8262e..6ac9574c0a9 100644
--- a/res/cardsfolder/e/ego_erasure.txt
+++ b/res/cardsfolder/e/ego_erasure.txt
@@ -2,7 +2,7 @@ Name:Ego Erasure
 ManaCost:2 U
 Types:Tribal Instant Shapeshifter
 Text:no text
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 A:SP$ PumpAll | Cost$ 2 U | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Creature | NumAtt$ -2 | NumDef$ -0 | IsCurse$ True | SubAbility$ SVar=DBAnimateAll |SpellDescription$ Creatures target player controls get -2/-0 and lose all creature types until end of turn.
 SVar:DBAnimateAll:DB$ AnimateAll | Cost$ 0 | Defined$ Targeted | ValidCards$ Creature | Types$ Creature | RemoveCreatureTypes$ True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/f/fire_belly_changeling.txt b/res/cardsfolder/f/fire_belly_changeling.txt
index 56f5d8b7f39..758a0a2b3e5 100644
--- a/res/cardsfolder/f/fire_belly_changeling.txt
+++ b/res/cardsfolder/f/fire_belly_changeling.txt
@@ -3,7 +3,7 @@ ManaCost:1 R
 Types:Creature Shapeshifter
 Text:Play this ability no more than twice each turn.
 PT:1/1
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 A:AB$ Pump | Cost$ R | NumAtt$ +1 | ActivationLimit$ 2 | SpellDescription$ CARDNAME gets +1/+0 until end of turn. Activate this ability no more than twice each turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fire_belly_changeling.jpg
diff --git a/res/cardsfolder/g/game_trail_changeling.txt b/res/cardsfolder/g/game_trail_changeling.txt
index dfdfe9b4f27..110ee6ac29e 100644
--- a/res/cardsfolder/g/game_trail_changeling.txt
+++ b/res/cardsfolder/g/game_trail_changeling.txt
@@ -3,7 +3,7 @@ ManaCost:3 G G
 Types:Creature Shapeshifter
 Text:no text
 PT:4/4
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 K:Trample
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/game_trail_changeling.jpg
diff --git a/res/cardsfolder/g/ghostly_changeling.txt b/res/cardsfolder/g/ghostly_changeling.txt
index bb9aed81084..9587f8d51f8 100644
--- a/res/cardsfolder/g/ghostly_changeling.txt
+++ b/res/cardsfolder/g/ghostly_changeling.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Shapeshifter
 Text:no text
 PT:2/2
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 A:AB$ Pump | Cost$ 1 B | NumAtt$ +1 | NumDef$ +1 | SpellDescription$ CARDNAME gets +1/+1 until end of turn.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghostly_changeling.jpg
diff --git a/res/cardsfolder/m/mirror_entity.txt b/res/cardsfolder/m/mirror_entity.txt
index d3a1c8d3e54..6023519130e 100644
--- a/res/cardsfolder/m/mirror_entity.txt
+++ b/res/cardsfolder/m/mirror_entity.txt
@@ -3,8 +3,8 @@ ManaCost:2 W
 Types:Creature Shapeshifter
 Text:no text
 PT:1/1
-K:Changeling
-A:AB$ AnimateAll | Cost$ X | Power$ X | Toughness$ X | Keywords$ Changeling | ValidCards$ Creature.YouCtrl | SpellDescription$ Creatures you control become X/X and gain all creature types until end of turn.
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
+A:AB$ AnimateAll | Cost$ X | Power$ X | Toughness$ X | Types$ AllCreatureTypes | ValidCards$ Creature.YouCtrl | SpellDescription$ Creatures you control become X/X and gain all creature types until end of turn.
 SVar:X:Count$xPaid
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mirror_entity.jpg
diff --git a/res/cardsfolder/m/mistform_ultimus.txt b/res/cardsfolder/m/mistform_ultimus.txt
index 23cb5373c6d..43d42dfbdbc 100644
--- a/res/cardsfolder/m/mistform_ultimus.txt
+++ b/res/cardsfolder/m/mistform_ultimus.txt
@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Legendary Creature Illusion
 Text:no text
 PT:3/3
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ CARDNAME is every creature type (even if this card isn't on the battlefield).
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mistform_ultimus.jpg
 SetInfo:LGN|Rare|http://magiccards.info/scans/en/le/47.jpg
diff --git a/res/cardsfolder/m/moonglove_changeling.txt b/res/cardsfolder/m/moonglove_changeling.txt
index efc007d1092..9696d786262 100644
--- a/res/cardsfolder/m/moonglove_changeling.txt
+++ b/res/cardsfolder/m/moonglove_changeling.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Shapeshifter
 Text:no text
 PT:2/2
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 A:AB$ Pump | Cost$ B | KW$ Deathtouch | SpellDescription$ CARDNAME gains deathtouch until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/moonglove_changeling.jpg
diff --git a/res/cardsfolder/m/mothdust_changeling.txt b/res/cardsfolder/m/mothdust_changeling.txt
index e7560a6d22f..4734c1849f9 100644
--- a/res/cardsfolder/m/mothdust_changeling.txt
+++ b/res/cardsfolder/m/mothdust_changeling.txt
@@ -3,7 +3,7 @@ ManaCost:U
 Types:Creature Shapeshifter
 Text:no text
 PT:1/1
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 A:AB$ Pump | Cost$ tapXType<1/Creature.untapped+YouCtrl> | KW$ Flying | CostDesc$ Tap an untapped creature you control: | SpellDescription$ CARDNAME gains flying until end of turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
diff --git a/res/cardsfolder/m/mutavault.txt b/res/cardsfolder/m/mutavault.txt
index 96cc0aad4a0..28ffc46ade9 100644
--- a/res/cardsfolder/m/mutavault.txt
+++ b/res/cardsfolder/m/mutavault.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 Text:no text
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
-A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature | Keywords$ Changeling | SpellDescription$ CARDNAME becomes a 2/2 creature with all creature types until end of turn. It's still a land.
+A:AB$ Animate | Cost$ 1 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Creature,AllCreatureTypes | SpellDescription$ CARDNAME becomes a 2/2 creature with all creature types until end of turn. It's still a land.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mutavault.jpg
 SetInfo:MOR|Rare|http://magiccards.info/scans/en/mt/148.jpg
diff --git a/res/cardsfolder/n/nameless_inversion.txt b/res/cardsfolder/n/nameless_inversion.txt
index 497645651d4..2f21db59da9 100644
--- a/res/cardsfolder/n/nameless_inversion.txt
+++ b/res/cardsfolder/n/nameless_inversion.txt
@@ -4,7 +4,7 @@ Types:Tribal Instant Shapeshifter
 Text:no text
 A:SP$ Pump | Cost$ 1 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ -3 | IsCurse$ True | SubAbility$ SVar=DBAnimate |SpellDescription$ Target creature gets +3/-3 and loses all creature types until end of turn.
 SVar:DBAnimate:DB$ Animate | Cost$ 0 | Defined$ Targeted | Types$ Creature | RemoveCreatureTypes$ True
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nameless_inversion.jpg
 SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/128.jpg
diff --git a/res/cardsfolder/r/runed_stalactite.txt b/res/cardsfolder/r/runed_stalactite.txt
index 84f8dab6ab0..170f77e9c87 100644
--- a/res/cardsfolder/r/runed_stalactite.txt
+++ b/res/cardsfolder/r/runed_stalactite.txt
@@ -1,8 +1,9 @@
 Name:Runed Stalactite
 ManaCost:1
 Types:Artifact Equipment
-Text:Equipped creature gets +1/+1 and is every creature type.
-K:eqPump 2:+1/+1/HIDDEN Changeling
+Text:no text
+S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddType$ AllCreatureTypes | Description$ Equipped creature gets +1/+1 and is every creature type.
+K:eqPump 2:+0/+0
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/runed_stalactite.jpg
 SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/260.jpg
diff --git a/res/cardsfolder/s/skeletal_changeling.txt b/res/cardsfolder/s/skeletal_changeling.txt
index abfe03e3aab..8b9a3b12464 100644
--- a/res/cardsfolder/s/skeletal_changeling.txt
+++ b/res/cardsfolder/s/skeletal_changeling.txt
@@ -3,7 +3,7 @@ ManaCost:1 B
 Types:Creature Shapeshifter
 Text:no text
 PT:1/1
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 A:AB$ Regenerate | Cost$ 1 B | SpellDescription$ Regenerate CARDNAME.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/skeletal_changeling.jpg
diff --git a/res/cardsfolder/t/taurean_mauler.txt b/res/cardsfolder/t/taurean_mauler.txt
index 0d935b3f881..fc3fc2f089a 100644
--- a/res/cardsfolder/t/taurean_mauler.txt
+++ b/res/cardsfolder/t/taurean_mauler.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Creature Shapeshifter
 Text:no text
 PT:2/2
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 T:Mode$ SpellCast | ValidCard$ Card.YouDontCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent casts a spell, you may put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/t/turtleshell_changeling.txt b/res/cardsfolder/t/turtleshell_changeling.txt
index b107acdb11f..4e527ad41c7 100644
--- a/res/cardsfolder/t/turtleshell_changeling.txt
+++ b/res/cardsfolder/t/turtleshell_changeling.txt
@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Creature Shapeshifter
 Text:no text
 PT:1/4
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 A:AB$ Pump | Cost$ 1 U | KW$ HIDDEN CARDNAME's power and toughness are switched | SpellDescription$ Switch CARDNAME's power and toughness until end of turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/w/war_spike_changeling.txt b/res/cardsfolder/w/war_spike_changeling.txt
index 10b6253697a..d1ce1556a0c 100644
--- a/res/cardsfolder/w/war_spike_changeling.txt
+++ b/res/cardsfolder/w/war_spike_changeling.txt
@@ -3,7 +3,7 @@ ManaCost:3 R
 Types:Creature Shapeshifter
 Text:no text
 PT:3/3
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 A:AB$ Pump | Cost$ R | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/war_spike_changeling.jpg
diff --git a/res/cardsfolder/w/wings_of_velis_vel.txt b/res/cardsfolder/w/wings_of_velis_vel.txt
index b406545e961..1ece191695d 100644
--- a/res/cardsfolder/w/wings_of_velis_vel.txt
+++ b/res/cardsfolder/w/wings_of_velis_vel.txt
@@ -2,8 +2,8 @@ Name:Wings of Velis Vel
 ManaCost:1 U
 Types:Tribal Instant Shapeshifter
 Text:no text
-K:Changeling
-A:SP$ Animate | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Power$ 4 | Toughness$ 4 | Keywords$ Flying & HIDDEN Changeling| SpellDescription$ Target creature becomes 4/4, gains all creature types, and gains flying until end of turn.
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
+A:SP$ Animate | Cost$ 1 U | ValidTgts$ Creature | TgtPrompt$ Select target creature | Power$ 4 | Toughness$ 4 | Keywords$ Flying | Types$ AllCreatureTypes | SpellDescription$ Target creature becomes 4/4, gains all creature types, and gains flying until end of turn.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wings_of_velis_vel.jpg
diff --git a/res/cardsfolder/w/woodland_changeling.txt b/res/cardsfolder/w/woodland_changeling.txt
index 8b732e1e661..67445b53915 100644
--- a/res/cardsfolder/w/woodland_changeling.txt
+++ b/res/cardsfolder/w/woodland_changeling.txt
@@ -3,7 +3,7 @@ ManaCost:1 G
 Types:Creature Shapeshifter
 Text:no text
 PT:2/2
-K:Changeling
+S:Mode$ Continuous | Affected$ Card.Self | CharacteristicDefining$ True | AddType$ AllCreatureTypes | Description$ Changeling (This card is every creature type at all times.)
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/woodland_changeling.jpg
 SetInfo:LRW|Common|http://magiccards.info/scans/en/lw/242.jpg
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index 5d194f7f544..3dbcd112252 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -1631,8 +1631,7 @@ public class Card extends GameEntity implements Comparable<Card> {
 
             // Changeling + CARDNAME can't be countered. + Cascade + Multikicker
             for (int i = 0; i < kw.size(); i++) {
-                if ((kw.get(i).contains("Changeling") && !sb.toString().contains("Changeling"))
-                        || (kw.get(i).contains("CARDNAME can't be countered.") && !sb.toString().contains("CARDNAME can't be countered."))
+                if ((kw.get(i).contains("CARDNAME can't be countered.") && !sb.toString().contains("CARDNAME can't be countered."))
                         || (kw.get(i).contains("Cascade") && !sb.toString().contains("Cascade"))
                         || (kw.get(i).contains("Multikicker") && !sb.toString().contains("Multikicker"))) {
                     sb.append(kw.get(i)).append("\r\n");
@@ -3133,7 +3132,9 @@ public class Card extends GameEntity implements Comparable<Card> {
 
 	    	for (Card_Type ct : types) {
 	    		ArrayList<String> removeTypes = new ArrayList<String>();
-	    		removeTypes.addAll(ct.getRemoveType());
+	    		if(ct.getRemoveType() != null) {
+	    		    removeTypes.addAll(ct.getRemoveType());
+	    		}
 	    		//remove old types
 	    		for (int i = 0; i < newType.size(); i++) {
 	    			String t = newType.get(i);
@@ -3143,7 +3144,7 @@ public class Card extends GameEntity implements Comparable<Card> {
 	    				removeTypes.add(t);
 	    			if (ct.isRemoveSubTypes() && CardUtil.isASubType(t))
 	    				removeTypes.add(t);
-	    			if (ct.isRemoveCreatureTypes() && CardUtil.isACreatureType(t))
+	    			if (ct.isRemoveCreatureTypes() && (CardUtil.isACreatureType(t) || t.equals("AllCreatureTypes")))
 	    				removeTypes.add(t);
 	    		}
 	    		newType.removeAll(removeTypes);
@@ -4648,7 +4649,7 @@ public class Card extends GameEntity implements Comparable<Card> {
 
         if (typeContains(cardType)
                 || ((isCreature() || isTribal())
-                && CardUtil.isACreatureType(cardType) && hasKeyword("Changeling"))) return true;
+                && CardUtil.isACreatureType(cardType) && typeContains("AllCreatureTypes"))) return true;
         return false;
     }
 
diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java
index 5564f6e0a6f..726d02b343d 100644
--- a/src/main/java/forge/GameActionUtil.java
+++ b/src/main/java/forge/GameActionUtil.java
@@ -2052,9 +2052,7 @@ public class GameActionUtil {
                                         && !type.get(x).getType().get(x2).equals("Legendary")
                                         && !type.get(x).getType().get(x2).equals("Artifact"))
                                 {
-                                    if (crd.isType(type.get(x).getType().get(x2))
-                                            || crd.hasKeyword("Changeling")
-                                            || type.get(x).hasKeyword("Changeling"))
+                                    if (crd.isType(type.get(x).getType().get(x2)))
                                     {
                                         alreadyAdded.add(type.get(x));
                                         crd.addSemiPermanentAttackBoost(1);
diff --git a/src/main/java/forge/GuiDisplayUtil.java b/src/main/java/forge/GuiDisplayUtil.java
index c59062b15c5..e2cc3211779 100644
--- a/src/main/java/forge/GuiDisplayUtil.java
+++ b/src/main/java/forge/GuiDisplayUtil.java
@@ -149,17 +149,22 @@ public final class GuiDisplayUtil implements NewConstants {
         ArrayList<String> superTypes = new ArrayList<String>();
         ArrayList<String> cardTypes = new ArrayList<String>();
         ArrayList<String> subTypes = new ArrayList<String>();
+        boolean allCreatureTypes = list.contains("AllCreatureTypes");
+        
         for (String t : list) {
+            if(allCreatureTypes && t.equals("AllCreatureTypes")) {
+                continue;
+            } 
             if (CardUtil.isASuperType(t) && !superTypes.contains(t)) {
                 superTypes.add(t);
             }
             if (CardUtil.isACardType(t) && !cardTypes.contains(t)) {
                 cardTypes.add(t);
             }
-            if (CardUtil.isASubType(t) && !subTypes.contains(t)) {
+            if (CardUtil.isASubType(t) && !subTypes.contains(t)
+                    && (!allCreatureTypes || !CardUtil.isACreatureType(t))) {
                 subTypes.add(t);
             }
-
         }
 
         for (String type : superTypes) {
@@ -168,9 +173,12 @@ public final class GuiDisplayUtil implements NewConstants {
         for (String type : cardTypes) {
             sb.append(type).append(" ");
         }
-        if (!subTypes.isEmpty()) {
+        if (!subTypes.isEmpty() || allCreatureTypes) {
             sb.append("- ");
         }
+        if (allCreatureTypes) {
+            sb.append("All creature types ");
+        }
         for (String type : subTypes) {
             sb.append(type).append(" ");
         }
diff --git a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java
index 69e61895f62..7b3da143cea 100644
--- a/src/main/java/forge/card/cardFactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardFactory/CardFactoryUtil.java
@@ -453,9 +453,6 @@ public class CardFactoryUtil {
         }
         value += c.getKeywordMagnitude("Rampage");
         value += c.getKeywordMagnitude("Annihilator") * 50;
-        if (c.hasKeyword("Changeling")) {
-            value += 5;
-        }
         if (c.hasKeyword("Whenever a creature dealt damage by CARDNAME this turn is put into a graveyard, put a +1/+1 counter on CARDNAME.")
                 && power > 0)
             value += 2;
diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java
index 214f129cb22..5513ed6f76e 100644
--- a/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java
+++ b/src/main/java/forge/card/cardFactory/CardFactory_Creatures.java
@@ -1958,7 +1958,7 @@ public class CardFactory_Creatures {
                     kithkin = kithkin.filter(new CardListFilter() {
 
                         public boolean addCard(Card c) {
-                            return (c.isType("Kithkin") || c.hasKeyword("Changeling"))
+                            return (c.isType("Kithkin"))
                                     && !c.equals(card);
                         }
 
diff --git a/src/main/java/forge/card/staticAbility/StaticAbility.java b/src/main/java/forge/card/staticAbility/StaticAbility.java
index bd2b2de1e30..9c49ebc5762 100644
--- a/src/main/java/forge/card/staticAbility/StaticAbility.java
+++ b/src/main/java/forge/card/staticAbility/StaticAbility.java
@@ -73,24 +73,25 @@ public class StaticAbility {
     
     // In which layer should the ability be applied (for continuous effects only)
     public int getLayer() {
+        
+        if(mapParams.containsKey("AddType") || mapParams.containsKey("RemoveType") || mapParams.containsKey("RemoveCardType")
+                || mapParams.containsKey("RemoveSubType") || mapParams.containsKey("RemoveSuperType"))
+            return 4;
+        
+        if(mapParams.containsKey("AddColor") || mapParams.containsKey("RemoveColor") || mapParams.containsKey("SetColor"))
+            return 5;
+        
+        if(mapParams.containsKey("AddKeyword") || mapParams.containsKey("AddAbility")
+                || mapParams.containsKey("AddTrigger"))
+            return 6;
+        
     	if(mapParams.containsKey("CharacteristicDefining"))
     		return 7;
     	
     	if(mapParams.containsKey("AddPower") || mapParams.containsKey("AddToughness")  
     			|| mapParams.containsKey("SetPower") || mapParams.containsKey("SetToughness"))
     		return 8; // This is the collection of 7b and 7c
-    	
-    	if(mapParams.containsKey("AddKeyword") || mapParams.containsKey("AddAbility")
-    			|| mapParams.containsKey("AddTrigger"))
-    		return 6;
-    	
-    	if(mapParams.containsKey("AddColor") || mapParams.containsKey("RemoveColor") || mapParams.containsKey("SetColor"))
-    		return 5;
-    	
-    	if(mapParams.containsKey("AddType") || mapParams.containsKey("RemoveType") || mapParams.containsKey("RemoveCardType")
-    			|| mapParams.containsKey("RemoveSubType") || mapParams.containsKey("RemoveSuperType"))
-    		return 4;
-    	
+
     	// Layer 1, 2 & 3 are not supported
     	
     	return 0;