diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 0f7ff1828..08294665f 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -57,13 +57,6 @@ mana={X}{1}{B}
 type=Sorcery
 [/card]
 [card]
-name=Abduction
-text=Enchant creature -- When Abduction enters the battlefield, untap enchanted creature. -- You control enchanted creature. -- When enchanted creature is put into a graveyard, return that card to the battlefield under its owner's control.
-mana={2}{U}{U}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=Abeyance
 text=Until end of turn, target player can't cast instant or sorcery spells, and that player can't activate abilities that aren't mana abilities. -- Draw a card.
 mana={1}{W}
@@ -3965,13 +3958,6 @@ mana={1}{B}{R}
 type=Enchantment
 [/card]
 [card]
-name=Corrupted Zendikon
-text=Enchant land -- Enchanted land is a 3/3 black Ooze creature. It's still a land. -- When enchanted land is put into a graveyard, return that card to its owner's hand.
-mana={1}{B}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=Corrupting Licid
 text={B}, {T}: Corrupting Licid loses this ability and becomes an Aura enchantment with enchant creature. Attach it to target creature. You may pay {B} to end this effect. -- Enchanted creature has fear. (It can't be blocked except by artifact creatures and/or black creatures.)
 mana={2}{B}
@@ -4275,13 +4261,6 @@ mana={5}
 type=Artifact
 [/card]
 [card]
-name=Crusher Zendikon
-text=Enchant land -- Enchanted land is a 4/2 red Beast creature with trample. It's still a land. -- When enchanted land is put into a graveyard, return that card to its owner's hand.
-mana={2}{R}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=Crush Underfoot
 text=Choose a Giant creature you control. It deals damage equal to its power to target creature.
 mana={1}{R}
@@ -6963,13 +6942,6 @@ mana={1}{W}
 type=Sorcery
 [/card]
 [card]
-name=False Demise
-text=Enchant creature -- When enchanted creature is put into a graveyard, return that card to the battlefield under your control.
-mana={2}{U}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=False Memories
 text=Put the top seven cards of your library into your graveyard. At the beginning of the next end step, exile seven cards from your graveyard.
 mana={1}{U}
@@ -7593,13 +7565,6 @@ mana={2}{G}
 type=Enchantment
 [/card]
 [card]
-name=Fool's Demise
-text=Enchant creature -- When enchanted creature is put into a graveyard, return that card to the battlefield under your control. -- When Fool's Demise is put into a graveyard from the battlefield, return Fool's Demise to its owner's hand.
-mana={4}{U}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=Footbottom Feast
 text=Put any number of target creature cards from your graveyard on top of your library. -- Draw a card.
 mana={2}{B}
@@ -9307,13 +9272,6 @@ power=3
 toughness=4
 [/card]
 [card]
-name=Guardian Zendikon
-text=Enchant land -- Enchanted land is a 2/6 white Wall creature with defender. It's still a land. -- When enchanted land is put into a graveyard, return that card to its owner's hand.
-mana={2}{W}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=Guardian of Vitu-Ghazi
 text=Convoke (Each creature you tap while casting this spell reduces its cost by {1} or by one mana of that creature's color.) -- Vigilance
 mana={6}{G}{W}
@@ -20537,13 +20495,6 @@ mana={1}{B}
 type=Instant
 [/card]
 [card]
-name=Shade's Form
-text=Enchant creature -- Enchanted creature has "{B}: This creature gets +1/+1 until end of turn." -- When enchanted creature is put into a graveyard, return that card to the battlefield under your control.
-mana={1}{B}{B}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=Shadow of Doubt
 text=({(u/b)} can be paid with either {U} or {B}.) -- Players can't search libraries this turn. -- Draw a card.
 mana={UB}{UB}
@@ -22328,16 +22279,6 @@ power=2
 toughness=1
 [/card]
 [card]
-name=Squee's Embrace
-target=creature
-auto=2/2
-auto=@movedTo(this|graveyard) from(battlefield):moveTo(myBattlefield) notatarget(mytgt)
-text=Enchant creature -- Enchanted creature gets +2/+2. -- When enchanted creature is put into a graveyard, return that card to its owner's hand.
-mana={R}{W}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=Squee's Revenge
 text=Choose a number. Flip a coin that many times or until you lose a flip, whichever comes first. If you win all the flips, draw two cards for each flip.
 mana={1}{U}{R}
@@ -24988,13 +24929,6 @@ mana={3}{W}
 type=Enchantment
 [/card]
 [card]
-name=Vastwood Zendikon
-text=Enchant land -- Enchanted land is a 6/4 green Elemental creature. It's still a land. -- When enchanted land is put into a graveyard, return that card to its owner's hand.
-mana={4}{G}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=Vectis Dominator
 text={T}: Tap target creature unless its controller pays 2 life.
 mana={1}{W}{B}
@@ -26176,13 +26110,6 @@ power=3
 toughness=2
 [/card]
 [card]
-name=Wind Zendikon
-text=Enchant land -- Enchanted land is a 2/2 blue Elemental creature with flying. It's still a land. -- When enchanted land is put into a graveyard, return that card to its owner's hand.
-mana={U}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=Windborn Muse
 abilities=flying
 auto=lord(creature|opponentinplay) cantattack
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 3bb765805..b69a248a5 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -195,6 +195,17 @@ power=1
 toughness=3
 [/card]
 [card]
+name=Abduction
+target=creature
+alias=1194
+auto=untap
+auto=@movedTo(mytgt|graveyard) from(battlefield):all(trigger[to]) moveTo(opponentbattlefield)
+text=Enchant creature -- When Abduction enters the battlefield, untap enchanted creature. -- You control enchanted creature. -- When enchanted creature is put into a graveyard, return that card to the battlefield under its owner's control.
+mana={2}{U}{U}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Abjure
 target=*|stack
 auto=fizzle
@@ -12589,6 +12600,16 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Corrupted Zendikon
+target=land
+auto=becomes(Creature Ooze,3/3,black)
+auto=@movedTo(mytgt|graveyard) from(battlefield):all(trigger[to]) moveTo(ownerhand)
+text=Enchant land -- Enchanted land is a 3/3 black Ooze creature. It's still a land. -- When enchanted land is put into a graveyard, return that card to its owner's hand.
+mana={1}{B}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Cosi's Ravager
 auto=@movedTo(land|myBattlefield):may damage:1 target(player)
 text=Landfall - Whenever a land enters the battlefield under your control, you may have Cosi's Ravager deal 1 damage to target player.
@@ -20772,6 +20793,15 @@ mana={3}{W}
 type=Sorcery
 [/card]
 [card]
+name=False Demise
+target=creature
+auto=@movedTo(mytgt|graveyard) from(battlefield):all(trigger[to]) moveTo(mybattlefield)
+text=Enchant creature -- When enchanted creature is put into a graveyard, return that card to the battlefield under your control.
+mana={2}{U}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=False Mourning
 target=creature|mygraveyard
 auto=moveTo(mylibrary)
@@ -23063,6 +23093,16 @@ mana={4}
 type=Artifact
 [/card]
 [card]
+name=Fool's Demise
+target=creature
+auto=@movedTo(mytgt|graveyard) from(battlefield):all(trigger[to]) moveTo(mybattlefield)
+autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(myhand)
+text=Enchant creature -- When enchanted creature is put into a graveyard, return that card to the battlefield under your control. -- When Fool's Demise is put into a graveyard from the battlefield, return Fool's Demise to its owner's hand.
+mana={4}{U}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Fool's Tome
 auto=aslongas(*|myhand) {2}{T}:draw:1 <1
 text={2}, {T}: Draw a card. Activate this ability only if you have no cards in hand.
@@ -27754,6 +27794,16 @@ power=2
 toughness=3
 [/card]
 [card]
+name=Guardian Zendikon
+target=land
+auto=becomes(Creature Wall,2/6,defender,white)
+auto=@movedTo(mytgt|graveyard) from(battlefield):all(trigger[to]) moveTo(ownerhand)
+text=Enchant land -- Enchanted land is a 2/6 white Wall creature with defender. It's still a land. -- When enchanted land is put into a graveyard, return that card to its owner's hand.
+mana={2}{W}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Guardians of Akrasa
 abilities=defender,exalted
 text=Defender -- Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.)
@@ -55990,6 +56040,16 @@ power=1
 toughness=2
 [/card]
 [card]
+name=Shade's Form
+target=creature
+auto=teach(creature) {B}:1/1
+auto=@movedTo(mytgt|graveyard) from(battlefield):all(trigger[to]) moveTo(mybattlefield)
+text=Enchant creature -- Enchanted creature has "{B}: This creature gets +1/+1 until end of turn." -- When enchanted creature is put into a graveyard, return that card to the battlefield under your control.
+mana={1}{B}{B}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Shadow Guildmage
 auto={U}{T}:moveTo(ownerlibrary) target(creature|myBattlefield)
 auto={R}{T}:damage:1 target(creature,player) && damage:1 controller
@@ -61313,6 +61373,16 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Squee's Embrace
+target=creature
+auto=2/2
+auto=@movedTo(mytgt|graveyard) from(battlefield):all(trigger[to]) moveTo(ownerhand)
+text=Enchant creature -- Enchanted creature gets +2/+2. -- When enchanted creature is put into a graveyard, return that card to its owner's hand.
+mana={R}{W}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Squee's Toy
 auto={T}:prevent:1 target(creature)
 text={T}: Prevent the next 1 damage that would be dealt to target creature this turn.
@@ -69618,6 +69688,16 @@ power=5
 toughness=6
 [/card]
 [card]
+name=Vastwood Zendikon
+target=land
+auto=becomes(Creature Elemental,6/4,green)
+auto=@movedTo(mytgt|graveyard) from(battlefield):all(trigger[to]) moveTo(ownerhand)
+text=Enchant land -- Enchanted land is a 6/4 green Elemental creature. It's still a land. -- When enchanted land is put into a graveyard, return that card to its owner's hand.
+mana={4}{G}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Vault of Whispers
 auto={T}:Add{B}
 text=(Vault of Whispers isn't a spell.) -- {T}: Add {B} to your mana pool.
@@ -73618,6 +73698,16 @@ mana={2}{G}
 type=Instant
 [/card]
 [card]
+name=Wind Zendikon
+target=land
+auto=becomes(Creature Elemental,2/2,flying,blue)
+auto=@movedTo(mytgt|graveyard) from(battlefield):all(trigger[to]) moveTo(ownerhand)
+text=Enchant land -- Enchanted land is a 2/2 blue Elemental creature with flying. It's still a land. -- When enchanted land is put into a graveyard, return that card to its owner's hand.
+mana={U}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Windbrisk Raptor
 abilities=flying
 auto=lord(creature[attacking]|myBattlefield) lifelink