diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 0ae3470f4..db365755f 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -574,17 +574,6 @@ mana={5}
 type=Artifact
 [/card]
 [card]
-name=Alabaster Dragon
-auto=@movedTo(this|mygraveyard) from(myBattlefield):moveTo(ownerlibrary) all(this) && shuffle
-#This do not work in WTH 0.10
-text=Flying -- When Alabaster Dragon is put into a graveyard from the battlefield, shuffle Alabaster Dragon into its owner's library.
-mana={4}{W}{W}
-type=Creature
-subtype=Dragon
-power=4
-toughness=4
-[/card]
-[card]
 name=Alabaster Leech
 text=White spells you cast cost {W} more to cast.
 mana={W}
@@ -954,15 +943,6 @@ power=2
 toughness=2
 [/card]
 [card]
-name=Angel of Fury
-text=Flying -- When Angel of Fury is put into your graveyard from the battlefield, you may shuffle it into your library.
-mana={4}{W}{W}
-type=Creature
-subtype=Angel
-power=3
-toughness=5
-[/card]
-[card]
 name=Angel of Salvation
 text=Flash; convoke (Each creature you tap while casting this spell reduces its cost by {1} or by one mana of that creature's color.) -- Flying -- When Angel of Salvation enters the battlefield, prevent the next 5 damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose.
 mana={6}{W}{W}
@@ -2260,16 +2240,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Avenging Angel
-auto=@movedTo(this|graveyard) from(inplay):may moveto(ownerlibrary)
-text=Flying -- When Avenging Angel is put into a graveyard from the battlefield, you may put Avenging Angel on top of its owner's library.
-mana={3}{W}{W}
-type=Creature
-subtype=Angel
-power=3
-toughness=3
-[/card]
-[card]
 name=Avenging Druid
 text=Whenever Avenging Druid deals damage to an opponent, you may reveal cards from the top of your library until you reveal a land card. If you do, put that card onto the battlefield and put all other cards revealed this way into your graveyard.
 mana={2}{G}
@@ -8041,16 +8011,6 @@ power=4
 toughness=2
 [/card]
 [card]
-name=Cyclopean Mummy
-auto=@movedTo(this|graveyard) from(inplay):moveto(exile)
-text=When Cyclopean Mummy is put into a graveyard from the battlefield, exile Cyclopean Mummy.
-mana={1}{B}
-type=Creature
-subtype=Zombie
-power=2
-toughness=1
-[/card]
-[card]
 name=Cyclopean Snare
 auto={3}{T}:tap target(creature) && moveto(ownerhand)
 text={3}, {T}: Tap target creature, then return Cyclopean Snare to its owner's hand.
@@ -16367,15 +16327,6 @@ power=3
 toughness=2
 [/card]
 [card]
-name=Guan Yu, Sainted Warrior
-text=Horsemanship (This creature can't be blocked except by creatures with horsemanship.) -- When Guan Yu, Sainted Warrior is put into your graveyard from the battlefield, you may shuffle Guan Yu into your library.
-mana={3}{W}{W}
-type=Legendary Creature
-subtype=Human Soldier Warrior
-power=3
-toughness=5
-[/card]
-[card]
 name=Guard Dogs
 text={2}{W}, {T}: Choose a permanent you control. Prevent all combat damage target creature would deal this turn if it shares a color with that permanent.
 mana={3}{W}
@@ -25713,17 +25664,6 @@ power=3
 toughness=2
 [/card]
 [card]
-name=Narcomoeba
-abilities=flying
-auto=@movedTo(this|mygraveyard) from(mylibrary):may moveto(myinplay)  ## "this" only works for inplay area in wTH 0.8.1
-text=Flying -- When Narcomoeba is put into your graveyard from your library, you may put it onto the battlefield.
-mana={1}{U}
-type=Creature
-subtype=Illusion
-power=1
-toughness=1
-[/card]
-[card]
 name=Nath's Elite
 text=All creatures able to block Nath's Elite do so. -- When Nath's Elite enters the battlefield, clash with an opponent. If you win, put a +1/+1 counter on Nath's Elite. (Each clashing player reveals the top card of his or her library, then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.)
 mana={4}{G}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 5dc9c53c9..91d586166 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -657,6 +657,17 @@ power=5
 toughness=6
 [/card]
 [card]
+name=Alabaster Dragon
+auto=flying
+autograveyard=@movedTo(this|mygraveyard) from(myBattlefield):moveTo(ownerlibrary) && shuffle
+text=Flying -- When Alabaster Dragon is put into a graveyard from the battlefield, shuffle Alabaster Dragon into its owner's library.
+mana={4}{W}{W}
+type=Creature
+subtype=Dragon
+power=4
+toughness=4
+[/card]
+[card]
 name=Alaborn Grenadier
 abilities=vigilance
 text=Vigilance
@@ -1127,6 +1138,17 @@ power=5
 toughness=5
 [/card]
 [card]
+name=Angel of Fury
+abilities=flying
+autograveyard=@movedTo(this|mygraveyard) from(myBattlefield):moveTo(ownerlibrary) && shuffle
+text=Flying -- When Angel of Fury is put into your graveyard from the battlefield, you may shuffle it into your library.
+mana={4}{W}{W}
+type=Creature
+subtype=Angel
+power=3
+toughness=5
+[/card]
+[card]
 name=Angel of Light
 abilities=flying,vigilance
 text=Flying, vigilance
@@ -2171,6 +2193,17 @@ mana={1}
 type=Artifact
 [/card]
 [card]
+name=Avenging Angel
+auto=flying
+autograveyard=@movedTo(this|mygraveyard) from(myBattlefield):moveTo(mylibrary)
+text=Flying -- When Avenging Angel is put into a graveyard from the battlefield, shuffle Avenging Angel into its owner's library.
+mana={3}{W}{W}
+type=Creature
+subtype=Angel
+power=3
+toughness=3
+[/card]
+[card]
 name=Aven Archer
 abilities=flying
 auto={2}{W}{T}:damage:2 target(creature[attacking;blocking])
@@ -4898,7 +4931,7 @@ toughness=3
 [card]
 name=Brilliant Halo
 target=creature
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 auto=1/2
 text=Enchant creature -- Enchanted creature gets +1/+2. -- When Brilliant Halo is put into a graveyard from the battlefield, return Brilliant Halo to its owner's hand.
 mana={1}{W}
@@ -6124,7 +6157,7 @@ toughness=3
 [card]
 name=Cessation
 target=creature
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 auto=cantattack
 text=Enchant creature -- Enchanted creature can't attack. -- When Cessation is put into a graveyard from the battlefield, return Cessation to its owner's hand.
 mana={2}{W}
@@ -7445,6 +7478,17 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Corpse Connoisseur
+auto={S}:Add{G}
+autograveyard=@movedTo(this|mygraveyard) from(battlefield):moveTo(exile)
+text=
+mana={G}
+type=Creature
+subtype=oo Zombie Wizard
+power=3
+toughness=3
+[/card]
+[card]
 name=Corrosive Mentor
 auto=lord(creature[black]|myBattlefield) wither
 text=Black creatures you control have wither. (They deal damage to creatures in the form of -1/-1 counters.)
@@ -8200,6 +8244,16 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Cyclopean Mummy
+auto=@movedTo(this|graveyard) from(battlefield):moveto(exile)
+text=When Cyclopean Mummy is put into a graveyard from the battlefield, exile Cyclopean Mummy.
+mana={1}{B}
+type=Creature
+subtype=Zombie
+power=2
+toughness=1
+[/card]
+[card]
 name=Cylian Elf
 mana={1}{G}
 type=Creature
@@ -9406,7 +9460,7 @@ type=Sorcery
 [card]
 name=Despondency
 target=creature
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 auto=-2/0
 text=Enchant creature -- Enchanted creature gets -2/-0. -- When Despondency is put into a graveyard from the battlefield, return Despondency to its owner's hand.
 mana={1}{B}
@@ -11744,7 +11798,7 @@ toughness=5
 [/card]
 [card]
 name=Endless Cockroaches
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 text=When Endless Cockroaches is put into a graveyard from the battlefield, return Endless Cockroaches to its owner's hand.
 mana={1}{B}{B}
 type=Creature
@@ -12520,7 +12574,7 @@ toughness=3
 [card]
 name=Fallen Ideal
 target=creature
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 auto=flying
 auto={S(creature|myBattlefield)}:2/1
 text=Enchant creature -- Enchanted creature has flying and "Sacrifice a creature: This creature gets +2/+1 until end of turn." -- When Fallen Ideal is put into a graveyard from the battlefield, return Fallen Ideal to its owner's hand.
@@ -13067,7 +13121,7 @@ toughness=2
 [card]
 name=Fiery Mantle
 target=creature
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 auto={R}:1/0
 text=Enchant creature -- {R}: Enchanted creature gets +1/+0 until end of turn. -- When Fiery Mantle is put into a graveyard from the battlefield, return Fiery Mantle to its owner's hand.
 mana={1}{R}
@@ -14080,7 +14134,7 @@ type=Instant
 [card]
 name=Fortitude
 target=creature
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 auto={S(forest|myBattlefield)}:regenerate
 text=Enchant creature -- Sacrifice a Forest: Regenerate enchanted creature. -- When Fortitude is put into a graveyard from the battlefield, return Fortitude to its owner's hand.
 mana={1}{G}
@@ -16745,6 +16799,17 @@ mana={4}
 type=Artifact
 [/card]
 [card]
+name=Guan Yu, Sainted Warrior
+abilities=horsemanship
+autograveyard=@movedTo(this|mygraveyard) from(myBattlefield):moveTo(ownerlibrary) && shuffle
+text=Horsemanship (This creature can't be blocked except by creatures with horsemanship.) -- When Guan Yu, Sainted Warrior is put into your graveyard from the battlefield, you may shuffle Guan Yu into your library.
+mana={3}{W}{W}
+type=Legendary Creature
+subtype=Human Soldier Warrior
+power=3
+toughness=5
+[/card]
+[card]
 name=Guan Yu's 1,000-Li March
 auto=destroy all(creature[tapped])
 text=Destroy all tapped creatures.
@@ -21689,7 +21754,7 @@ type=Instant
 [card]
 name=Launch
 target=creature
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 auto=flying
 text=Enchant creature -- Enchanted creature has flying. -- When Launch is put into a graveyard from the battlefield, return Launch to its owner's hand.
 mana={1}{U}
@@ -25611,6 +25676,17 @@ mana={2}{G}
 type=Enchantment
 [/card]
 [card]
+name=Narcomoeba
+abilities=flying
+autograveyard=@movedTo(this|mygraveyard) from(mylibrary):moveTo(myBattlefield)
+text=Flying -- When Narcomoeba is put into your graveyard from your library, you may put it onto the battlefield.
+mana={1}{U}
+type=Creature
+subtype=Illusion
+power=1
+toughness=1
+[/card]
+[card]
 name=Narrow Escape
 target=*|myBattlefield
 auto=moveTo(ownerhand)
@@ -29868,7 +29944,7 @@ type=Sorcery
 [card]
 name=Rancor
 target=creature
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 auto=2/0
 auto=trample
 text=Enchant creature -- Enchanted creature gets +2/+0 and has trample. -- When Rancor is put into a graveyard from the battlefield, return Rancor to its owner's hand.
@@ -33941,7 +34017,7 @@ type=Land
 [card]
 name=Shivan Phoenix
 abilities=flying
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 text=Flying -- When Shivan Phoenix is put into a graveyard from the battlefield, return Shivan Phoenix to its owner's hand.
 mana={4}{R}{R}
 type=Creature
@@ -35191,7 +35267,7 @@ toughness=3
 [card]
 name=Sleeper's Guile
 target=creature
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 auto=fear
 text=Enchant creature -- Enchanted creature has fear. (It can't be blocked except by artifact creatures and/or black creatures.) -- When Sleeper's Guile is put into a graveyard from the battlefield, return Sleeper's Guile to its owner's hand.
 mana={2}{B}
@@ -35401,7 +35477,7 @@ toughness=2
 [card]
 name=Sluggishness
 target=creature
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 auto=cantblock
 text=Enchant creature -- Enchanted creature can't block. -- When Sluggishness is put into a graveyard from the battlefield, return Sluggishness to its owner's hand.
 mana={1}{R}
@@ -36487,7 +36563,7 @@ subtype=Aura
 [card]
 name=Spirit Loop
 target=creature|myBattlefield
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 auto=lifelink
 text=Enchant creature you control -- Whenever enchanted creature deals damage, you gain that much life. -- When Spirit Loop is put into a graveyard from the battlefield, return Spirit Loop to its owner's hand.
 mana={1}{W}
@@ -36711,7 +36787,7 @@ toughness=3
 name=Spreading Algae
 target=swamp
 auto=@tapped(mytgt):destroy
-auto=@movedTo(this|mygraveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 text=Enchant Swamp -- When enchanted land becomes tapped, destroy it. -- When Spreading Algae is put into a graveyard from the battlefield, return Spreading Algae to its owner's hand.
 mana={G}
 type=Enchantment
@@ -41486,7 +41562,7 @@ type=Enchantment
 [/card]
 [card]
 name=Undying Beast
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(mylibrary) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(mylibrary)
 text=When Undying Beast is put into a graveyard from the battlefield, put Undying Beast on top of its owner's library.
 mana={3}{B}
 type=Creature
@@ -41497,7 +41573,7 @@ toughness=2
 [card]
 name=Undying Rage
 target=creature
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 auto=2/2
 auto=cantblock
 text=Enchant creature -- Enchanted creature gets +2/+2 and can't block. -- When Undying Rage is put into a graveyard from the battlefield, return Undying Rage to its owner's hand.
@@ -44103,7 +44179,7 @@ toughness=1
 [card]
 name=Weatherseed Treefolk
 abilities=trample
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myhand) notatarget(this|mygraveyard)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
 text=Trample -- When Weatherseed Treefolk is put into a graveyard from the battlefield, return Weatherseed Treefolk to its owner's hand.
 mana={2}{G}{G}{G}
 type=Creature
@@ -45867,7 +45943,7 @@ toughness=2
 [/card]
 [card]
 name=Zodiac Dragon
-auto=@movedTo(this|mygraveyard) from(mybattlefield):may moveTo(ownerhand)
+autograveyard=@movedTo(this|graveyard) from(battlefield):may moveTo(myhand)
 text=When Zodiac Dragon is put into your graveyard from the battlefield, you may return it to your hand.
 mana={7}{R}{R}
 type=Creature