diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 35b6f4701..3fdda54dc 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -941,15 +941,6 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-name=Apes of Rath
-text=Whenever Apes of Rath attacks, it doesn't untap during its controller's next untap step.
-mana={2}{G}{G}
-type=Creature
-subtype=Ape
-power=5
-toughness=4
-[/card]
-[card]
 name=Apex Hawks
 text=Multikicker {1}{W} (You may pay an additional {1}{W} any number of times as you cast this spell.) -- Flying -- Apex Hawks enters the battlefield with a +1/+1 counter on it for each time it was kicked.
 mana={2}{W}
@@ -1007,25 +998,7 @@ mana={2}
 type=Artifact
 [/card]
 [card]
-name=Apocalypse Hydra
-text=Apocalypse Hydra enters the battlefield with X +1/+1 counters on it. If X is 5 or more, it enters the battlefield with an additional X +1/+1 counters on it. -- {1}{R}, Remove a +1/+1 counter from Apocalypse Hydra: Apocalypse Hydra deals 1 damage to target creature or player.
-mana={X}{R}{G}
-type=Creature
-subtype=Hydra
-power=0
-toughness=0
-[/card]
-[card]
-name=Apprentice Necromancer
-text={B}, {T}, Sacrifice Apprentice Necromancer: Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it.
-mana={1}{B}
-type=Creature
-subtype=Zombie Wizard
-power=1
-toughness=1
-[/card]
-[card]
-####Behaviour is not stabile.
+####Behavior is not stabile.
 name=Aquamoeba
 auto={S(*|myhand)}:thisforeach(power>=1) -1/1 && thisforeach(toughness>=1) 1/-1
 text=Discard a card: Switch Aquamoeba's power and toughness until end of turn.
@@ -2163,12 +2136,6 @@ mana={GW}
 type=Instant
 [/card]
 [card]
-name=Barl's Cage
-text={3}: Target creature doesn't untap during its controller's next untap step.
-mana={4}
-type=Artifact
-[/card]
-[card]
 name=Baron Sengir
 text=Flying -- Whenever a creature dealt damage by Baron Sengir this turn is put into a graveyard, put a +2/+2 counter on Baron Sengir. -- {T}: Regenerate another target Vampire.
 mana={5}{B}{B}{B}
@@ -5131,11 +5098,6 @@ power=1
 toughness=2
 [/card]
 [card]
-name=Cinder Marsh
-text={T}: Add {1} to your mana pool. -- {T}: Add {B} or {R} to your mana pool. Cinder Marsh doesn't untap during your next untap step.
-type=Land
-[/card]
-[card]
 name=Cinder Seer
 text={2}{R}, {T}: Reveal any number of red cards in your hand. Cinder Seer deals X damage to target creature or player, where X is the number of cards revealed this way.
 mana={3}{R}
@@ -5346,11 +5308,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Cloudcrest Lake
-text={T}: Add {1} to your mana pool. -- {T}: Add {W} or {U} to your mana pool. Cloudcrest Lake doesn't untap during your next untap step.
-type=Land
-[/card]
-[card]
 name=Cloudgoat Ranger
 text=When Cloudgoat Ranger enters the battlefield, put three 1/1 white Kithkin Soldier creature tokens onto the battlefield. -- Tap three untapped Kithkin you control: Cloudgoat Ranger gets +2/+0 and gains flying until end of turn.
 mana={3}{W}{W}
@@ -7170,15 +7127,6 @@ power=2
 toughness=2
 [/card]
 [card]
-name=Deathknell Kami
-text=Flying -- {2}: Deathknell Kami gets +1/+1 until end of turn. Sacrifice it at the beginning of the next end step. -- Soulshift 1 (When this is put into a graveyard from the battlefield, you may return target Spirit card with converted mana cost 1 or less from your graveyard to your hand.)
-mana={1}{B}
-type=Creature
-subtype=Spirit
-power=0
-toughness=1
-[/card]
-[card]
 name=Deathrender
 text=Equipped creature gets +2/+2. -- Whenever equipped creature is put into a graveyard, you may put a creature card from your hand onto the battlefield and attach Deathrender to it. -- Equip {2}
 mana={4}
@@ -9288,16 +9236,6 @@ power=1
 toughness=2
 [/card]
 [card]
-name=Elvish Hunter
-auto={1}{G}:doesnotuntap target(creature)
-text={1}{G}, {T}: Target creature doesn't untap during its controller's next untap step.
-mana={1}{G}
-type=Creature
-subtype=Elf Archer
-power=1
-toughness=1
-[/card]
-[card]
 name=Elvish Soultiller
 text=When Elvish Soultiller is put into a graveyard from the battlefield, choose a creature type. Shuffle all creature cards of that type from your graveyard into your library.
 mana={3}{G}{G}
@@ -10070,12 +10008,6 @@ power=7
 toughness=7
 [/card]
 [card]
-name=Exhaustion
-text=Creatures and lands target opponent controls don't untap during his or her next untap step.
-mana={2}{U}
-type=Sorcery
-[/card]
-[card]
 name=Exhume
 text=Each player puts a creature card from his or her graveyard onto the battlefield.
 mana={1}{B}
@@ -10490,8 +10422,6 @@ toughness=3
 [/card]
 [card]
 name=Farsight Mask
-auto=@damaged(player) from(*|opponentBattlefield):aslongas(this[untapped]) may draw:1 controller
-auto=@damaged(player) from(*|opponentstack):aslongas(this[untapped]) may draw:1 controller
 text=Whenever a source an opponent controls deals damage to you, if Farsight Mask is untapped, you may draw a card.
 mana={5}
 type=Artifact
@@ -10509,12 +10439,6 @@ mana={B}
 type=Instant
 [/card]
 [card]
-name=Fatal Frenzy
-text=Until end of turn, target creature you control gains trample and gets +X/+0, where X is its power. Sacrifice it at the beginning of the next end step.
-mana={2}{R}
-type=Instant
-[/card]
-[card]
 name=Fatal Lore
 text=An opponent chooses one - You draw three cards; or you destroy up to two target creatures that opponent controls and that player draws up to three cards. Those creatures can't be regenerated.
 mana={2}{B}{B}
@@ -11492,16 +11416,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Footsteps of the Goryo
-target=creature|myGraveyard
-auto=moveto(myBattlefield)
-auto=@next endofturn:bury
-text=Return target creature card from your graveyard to the battlefield. Sacrifice that creature at the beginning of the next end step.
-mana={2}{B}
-type=Sorcery
-subtype=Arcane
-[/card]
-[card]
 name=Forbid
 text=Buyback - Discard two cards. (You may discard two cards in addition to any other costs as you cast this spell. If you do, put this card into your hand as it resolves.) -- Counter target spell.
 mana={1}{U}{U}
@@ -13210,15 +13124,6 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-name=Goblin Ski Patrol
-text={1}{R}: Goblin Ski Patrol gets +2/+0 and gains flying. Its controller sacrifices it at the beginning of the next end step. Activate this ability only once and only if you control a snow Mountain.
-mana={1}{R}
-type=Creature
-subtype=Goblin
-power=1
-toughness=1
-[/card]
-[card]
 name=Goblin Snowman
 text=Whenever Goblin Snowman blocks, prevent all combat damage that would be dealt to and dealt by it this turn. -- {T}: Goblin Snowman deals 1 damage to target creature it's blocking.
 mana={3}{R}
@@ -15139,15 +15044,6 @@ mana={U}{U}
 type=Enchantment
 [/card]
 [card]
-name=Homarid Warrior
-text={U}: Homarid Warrior gains shroud until end of turn and doesn't untap during your next untap step. Tap Homarid Warrior. (A permanent with shroud can't be the target of spells or abilities.)
-mana={4}{U}
-type=Creature
-subtype=Homarid Warrior
-power=3
-toughness=3
-[/card]
-[card]
 name=Homing Sliver
 text=Each Sliver card in each player's hand has slivercycling {3}. -- Slivercycling {3} ({3}, Discard this card: Search your library for a Sliver card, reveal it, and put it into your hand. Then shuffle your library.)
 mana={2}{R}
@@ -15822,15 +15718,6 @@ power=4
 toughness=4
 [/card]
 [card]
-name=Incandescent Soulstoke
-text=Other Elemental creatures you control get +1/+1. -- {1}{R}, {T}: You may put an Elemental creature card from your hand onto the battlefield. That creature gains haste until end of turn. Sacrifice it at the beginning of the next end step.
-mana={2}{R}
-type=Creature
-subtype=Elemental Shaman
-power=2
-toughness=2
-[/card]
-[card]
 name=Incendiary Command
 text=Choose two - Incendiary Command deals 4 damage to target player; or Incendiary Command deals 2 damage to each creature; or destroy target nonbasic land; or each player discards all the cards in his or her hand, then draws that many cards.
 mana={3}{R}{R}
@@ -16764,16 +16651,6 @@ power=2
 toughness=1
 [/card]
 [card]
-###This land cycle does not work!
-name=Jungle Basin
-auto=tap
-auto=aslongas(forest[-tapped]|myBattlefield) moveTo(ownerhand) notatarget(forest[-tapped]|myBattlefield)
-auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=@movedTo(forest[-tapped]|myhand) from(myBattlefield):lord(jungle basin) {T}:Add{1}{G}
-text=Jungle Basin enters the battlefield tapped. -- When Jungle Basin enters the battlefield, sacrifice it unless you return an untapped Forest you control to its owner's hand. -- {T}: Add {1}{G} to your mana pool.
-type=Land
-[/card]
-[card]
 name=Juniper Order Advocate
 text=Green creatures you control get +1/+1 as long as Juniper Order Advocate is untapped.
 mana={2}{W}
@@ -17011,33 +16888,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Kashi-Tribe Elite
-text=Legendary Snakes you control have shroud. (They can't be the targets of spells or abilities.) -- Whenever Kashi-Tribe Elite deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
-mana={1}{G}{G}
-type=Creature
-subtype=Snake Warrior
-power=2
-toughness=3
-[/card]
-[card]
-name=Kashi-Tribe Reaver
-text=Whenever Kashi-Tribe Reaver deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. -- {1}{G}: Regenerate Kashi-Tribe Reaver.
-mana={3}{G}
-type=Creature
-subtype=Snake Warrior
-power=3
-toughness=2
-[/card]
-[card]
-name=Kashi-Tribe Warriors
-text=Whenever Kashi-Tribe Warriors deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
-mana={3}{G}{G}
-type=Creature
-subtype=Snake Warrior
-power=2
-toughness=4
-[/card]
-[card]
 name=Katabatic Winds
 text=Phasing (This phases in or out before you untap during each of your untap steps. While it's phased out, it's treated as though it doesn't exist.) -- Creatures with flying can't attack or block, and their activated abilities with {T} in their costs can't be activated.
 mana={2}{G}
@@ -17709,15 +17559,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Kor Hookmaster
-text=When Kor Hookmaster enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
-mana={2}{W}
-type=Creature
-subtype=Kor Soldier
-power=2
-toughness=2
-[/card]
-[card]
 name=Kor Outfitter
 text=When Kor Outfitter enters the battlefield, you may attach target Equipment you control to target creature you control.
 mana={W}{W}
@@ -17831,15 +17672,6 @@ power=3
 toughness=2
 [/card]
 [card]
-name=Krovikan Elementalist
-text={2}{R}: Target creature gets +1/+0 until end of turn. -- {U}{U}: Target creature you control gains flying until end of turn. Sacrifice it at the beginning of the next end step.
-mana={B}{B}
-type=Creature
-subtype=Human Wizard
-power=1
-toughness=1
-[/card]
-[card]
 name=Krovikan Fetish
 target=creature
 auto=1/1
@@ -18102,11 +17934,6 @@ mana={1}
 type=Artifact
 [/card]
 [card]
-name=Lantern-Lit Graveyard
-text={T}: Add {1} to your mana pool. -- {T}: Add {B} or {R} to your mana pool. Lantern-Lit Graveyard doesn't untap during your next untap step.
-type=Land
-[/card]
-[card]
 name=Lapis Lazuli Talisman
 text=Whenever a player casts a blue spell, you may pay {3}. If you do, untap target permanent.
 mana={2}
@@ -18251,15 +18078,6 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-name=Lead Golem
-text=Whenever Lead Golem attacks, it doesn't untap during its controller's next untap step.
-mana={5}
-type=Artifact Creature
-subtype=Golem
-power=3
-toughness=5
-[/card]
-[card]
 name=Lead-Belly Chimera
 text=Trample -- Sacrifice Lead-Belly Chimera: Put a +2/+2 counter on target Chimera creature. It gains trample. (This effect lasts indefinitely.)
 mana={4}
@@ -19689,12 +19507,6 @@ mana={W}
 type=Instant
 [/card]
 [card]
-name=Mana Vapors
-text=Lands target player controls don't untap during his or her next untap step.
-mana={1}{U}
-type=Sorcery
-[/card]
-[card]
 name=Mana Vortex
 text=When you cast Mana Vortex, you may sacrifice a land. If you don't, counter Mana Vortex. -- At the beginning of each player's upkeep, that player sacrifices a land. -- When there are no lands on the battlefield, sacrifice Mana Vortex.
 mana={1}{U}{U}
@@ -20031,15 +19843,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Matsu-Tribe Birdstalker
-text=Whenever Matsu-Tribe Birdstalker deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. -- {G}: Matsu-Tribe Birdstalker gains reach until end of turn. (It can block creatures with flying.)
-mana={2}{G}{G}
-type=Creature
-subtype=Snake Warrior Archer
-power=2
-toughness=2
-[/card]
-[card]
 name=Matsu-Tribe Decoy
 text={2}{G}: Target creature blocks Matsu-Tribe Decoy this turn if able. -- Whenever Matsu-Tribe Decoy deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
 mana={2}{G}
@@ -20970,12 +20773,6 @@ power=4
 toughness=4
 [/card]
 [card]
-name=Misstep
-text=Creatures target player controls don't untap during that player's next untap step.
-mana={1}{U}
-type=Sorcery
-[/card]
-[card]
 name=Mist Dragon
 text={0}: Mist Dragon gains flying. (This effect lasts indefinitely.) -- {0}: Mist Dragon loses flying. (This effect lasts indefinitely.) -- {3}{U}{U}: Mist Dragon phases out. (While it's phased out, it's treated as though it doesn't exist. It phases in before you untap during your next untap step.)
 mana={4}{U}{U}
@@ -21182,11 +20979,6 @@ mana={2}
 type=Artifact
 [/card]
 [card]
-name=Mogg Hollows
-text={T}: Add {1} to your mana pool. -- {T}: Add {R} or {G} to your mana pool. Mogg Hollows doesn't untap during your next untap step.
-type=Land
-[/card]
-[card]
 name=Mogg Infestation
 text=Destroy all creatures target player controls. For each creature put into a graveyard this way, put two 1/1 red Goblin creature tokens onto the battlefield under that player's control.
 mana={3}{R}{R}
@@ -23513,20 +23305,6 @@ mana={X}{X}
 type=Artifact
 [/card]
 [card]
-name=Orochi Ranger
-text=Whenever Orochi Ranger deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
-mana={1}{G}
-type=Creature
-subtype=Snake Warrior
-power=2
-toughness=1
-[/card]
-[card]
-name=Orzhov Basilica
-text=Orzhov Basilica enters the battlefield tapped. -- When Orzhov Basilica enters the battlefield, return a land you control to its owner's hand. -- {T}: Add {W}{B} to your mana pool.
-type=Land
-[/card]
-[card]
 name=Orzhov Euthanist
 text=Haunt (When this card is put into a graveyard from the battlefield, exile it haunting target creature.) -- When Orzhov Euthanist enters the battlefield or the creature it haunts is put into a graveyard, destroy target creature that was dealt damage this turn.
 mana={2}{B}
@@ -24619,12 +24397,6 @@ toughness=3
 [/card]
 [card]
 name=Pili-Pala
-abilities=flying
-auto={2}{Q}:Add{R}
-auto={2}{Q}:Add{G}
-auto={2}{Q}:Add{B}
-auto={2}{Q}:Add{U}
-auto={2}{Q}:Add{W}
 text=Flying -- {2}, {Q}: Add one mana of any color to your mana pool. ({Q} is the untap symbol.)
 mana={2}
 type=Artifact Creature
@@ -24644,14 +24416,7 @@ text={T}: Add one mana of any color to your mana pool. Spend this mana only to c
 type=Land
 [/card]
 [card]
-name=Pinecrest Ridge
-text={T}: Add {1} to your mana pool. -- {T}: Add {R} or {G} to your mana pool. Pinecrest Ridge doesn't untap during your next untap step.
-type=Land
-[/card]
-[card]
 name=Pinpoint Avalanche
-target=creature
-auto=damage:4
 text=Pinpoint Avalanche deals 4 damage to target creature. The damage can't be prevented.
 mana={3}{R}{R}
 type=Instant
@@ -25824,15 +25589,6 @@ mana={6}
 type=Artifact
 [/card]
 [card]
-name=Pyric Salamander
-text={R}: Pyric Salamander gets +1/+0 until end of turn. Sacrifice Pyric Salamander at the beginning of the next end step.
-mana={1}{R}
-type=Creature
-subtype=Salamander
-power=1
-toughness=1
-[/card]
-[card]
 name=Pyroclast Consul
 text=Kinship - At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Pyroclast Consul, you may reveal it. If you do, Pyroclast Consul deals 2 damage to each creature.
 mana={3}{R}{R}
@@ -27178,16 +26934,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Reveka, Wizard Savant
-auto={T}:damage:2 target(creature,player) && doesnotuntap
-text={T}: Reveka, Wizard Savant deals 2 damage to target creature or player and doesn't untap during your next untap step.
-mana={2}{U}{U}
-type=Legendary Creature
-subtype=Dwarf Wizard
-power=0
-toughness=1
-[/card]
-[card]
 name=Revelation
 text=All players play with their hands revealed.
 mana={G}
@@ -27959,11 +27705,6 @@ mana={1}{G}{G}
 type=Enchantment
 [/card]
 [card]
-name=Rootwater Depths
-text={T}: Add {1} to your mana pool. -- {T}: Add {U} or {B} to your mana pool. Rootwater Depths doesn't untap during your next untap step.
-type=Land
-[/card]
-[card]
 name=Rootwater Matriarch
 text={T}: Gain control of target creature for as long as that creature is enchanted.
 mana={2}{U}{U}
@@ -28548,15 +28289,6 @@ power=6
 toughness=4
 [/card]
 [card]
-name=Samite Alchemist
-text={W}{W}, {T}: Prevent the next 4 damage that would be dealt this turn to target creature you control. Tap that creature. It doesn't untap during your next untap step.
-mana={3}{W}
-type=Creature
-subtype=Human Cleric
-power=0
-toughness=2
-[/card]
-[card]
 name=Samite Blessing
 text=Enchant creature -- Enchanted creature has "{T}: The next time a source of your choice would deal damage to target creature this turn, prevent that damage."
 mana={W}
@@ -30763,15 +30495,6 @@ power=5
 toughness=5
 [/card]
 [card]
-name=Skizzik
-text=Kicker {R} (You may pay an additional {R} as you cast this spell.) -- Trample, haste -- At the beginning of the end step, sacrifice Skizzik unless it was kicked.
-mana={3}{R}
-type=Creature
-subtype=Elemental
-power=5
-toughness=3
-[/card]
-[card]
 name=Skizzik Surger
 text=Haste -- Echo - Sacrifice two lands. (At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.)
 mana={4}{R}{R}
@@ -30967,12 +30690,6 @@ power=2
 toughness=1
 [/card]
 [card]
-name=Sleep
-text=Tap all creatures target player controls. Those creatures don't untap during that player's next untap step.
-mana={2}{U}{U}
-type=Sorcery
-[/card]
-[card]
 name=Sleeping Potion
 text=Enchant creature -- When Sleeping Potion enters the battlefield, tap enchanted creature. -- Enchanted creature doesn't untap during its controller's untap step. -- When enchanted creature becomes the target of a spell or ability, sacrifice Sleeping Potion.
 mana={1}{U}
@@ -31148,12 +30865,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Sneak Attack
-text={R}: You may put a creature card from your hand onto the battlefield. That creature gains haste. Sacrifice the creature at the beginning of the next end step.
-mana={3}{R}
-type=Enchantment
-[/card]
-[card]
 name=Snow Devil
 text=Enchant creature -- Enchanted creature has flying. -- Enchanted creature has first strike as long as it's blocking and you control a snow land.
 mana={1}{U}
@@ -31620,12 +31331,6 @@ power=0
 toughness=4
 [/card]
 [card]
-name=Soulshriek
-text=Target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard. Sacrifice that creature at the beginning of the next end step.
-mana={B}
-type=Instant
-[/card]
-[card]
 name=Sovereigns of Lost Alara
 text=Exalted (Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.) -- Whenever a creature you control attacks alone, you may search your library for an Aura card that could enchant that creature, put it onto the battlefield attached to that creature, then shuffle your library.
 mana={4}{W}{U}
@@ -31672,15 +31377,6 @@ type=Artifact
 subtype=Equipment
 [/card]
 [card]
-name=Spectral Bears
-text=Whenever Spectral Bears attacks, if defending player controls no black nontoken permanents, it doesn't untap during your next untap step.
-mana={1}{G}
-type=Creature
-subtype=Bear Spirit
-power=3
-toughness=3
-[/card]
-[card]
 name=Spectral Cloak
 text=Enchant creature -- Enchanted creature has shroud as long as it's untapped. (It can't be the target of spells or abilities.)
 mana={U}{U}
@@ -31688,15 +31384,6 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-name=Spectral Force
-text=Trample -- Whenever Spectral Force attacks, if defending player controls no black permanents, it doesn't untap during your next untap step.
-mana={3}{G}{G}
-type=Creature
-subtype=Elemental Spirit
-power=8
-toughness=8
-[/card]
-[card]
 name=Spectral Searchlight
 text={T}: Choose a player. That player adds one mana of any color he or she chooses to his or her mana pool.
 mana={3}
@@ -31704,12 +31391,6 @@ type=Artifact
 [/card]
 [card]
 name=Spectral Shield
-target=creature
-auto=0/2
-auto=shroud
-####
-####The target does not get shroud (Read its wording!)
-####
 text=Enchant creature -- Enchanted creature gets +0/+2 and can't be the target of spells.
 mana={1}{W}{U}
 type=Enchantment
@@ -32204,12 +31885,6 @@ mana={B}
 type=Instant
 [/card]
 [card]
-name=Spore Cloud
-text=Tap all blocking creatures. Prevent all combat damage that would be dealt this turn. Each attacking creature and each blocking creature doesn't untap during its controller's next untap step.
-mana={1}{G}{G}
-type=Instant
-[/card]
-[card]
 name=Sporogenesis
 text=At the beginning of your upkeep, you may put a fungus counter on target nontoken creature. -- Whenever a creature with a fungus counter on it is put into a graveyard from the battlefield, put a 1/1 green Saproling creature token onto the battlefield for each fungus counter on that creature. -- When Sporogenesis leaves the battlefield, remove all fungus counters from all creatures.
 mana={3}{G}
@@ -33705,12 +33380,6 @@ power=2
 toughness=4
 [/card]
 [card]
-name=Tangle
-text=Prevent all combat damage that would be dealt this turn. -- Each attacking creature doesn't untap during its controller's next untap step.
-mana={1}{G}
-type=Instant
-[/card]
-[card]
 name=Tangle Golem
 text=Affinity for Forests (This spell costs {1} less to cast for each Forest you control.)
 mana={7}
@@ -34247,19 +33916,7 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Thalakos Lowlands
-auto={T}: Add {1}
-auto={T}: Add {W}
-auto={T}: Add {U}
-text={T}: Add {1} to your mana pool. -- {T}: Add {W} or {U} to your mana pool. Thalakos Lowlands doesn't untap during your next untap step.
-type=Land
-[/card]
-[card]
 name=Thawing Glaciers
-auto=tap
-auto={1}{T}:moveto(myBattlefield) target(land[basic]|myLibrary) && tap && token(grrrt)
-auto=@next cleanup:aslongas(grrt|myBattlefield) moveto(myHand)
-auto=@next cleanup:aslongas(grrt|myBattlefield) destroy all(grrrt)
 text=Thawing Glaciers enters the battlefield tapped. -- {1}, {T}: Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle your library. Return Thawing Glaciers to its owner's hand at the beginning of the next cleanup step.
 type=Land
 [/card]
@@ -35243,11 +34900,6 @@ mana={4}{BR}
 type=Sorcery
 [/card]
 [card]
-name=Tranquil Garden
-text={T}: Add {1} to your mana pool. -- {T}: Add {G} or {W} to your mana pool. Tranquil Garden doesn't untap during your next untap step.
-type=Land
-[/card]
-[card]
 name=Transcendence
 text=You don't lose the game for having 0 or less life. -- When you have 20 or more life, you lose the game. -- Whenever you lose life, you gain 2 life for each 1 life you lost. (Damage dealt to you causes you to lose life.)
 mana={3}{W}{W}{W}
@@ -36154,15 +35806,6 @@ power=3
 toughness=4
 [/card]
 [card]
-name=Varchild's Crusader
-text={0}: Varchild's Crusader can't be blocked this turn except by Walls. Sacrifice Varchild's Crusader at the beginning of the next end step.
-mana={3}{R}
-type=Creature
-subtype=Human Knight
-power=3
-toughness=2
-[/card]
-[card]
 name=Vassal's Duty
 text={1}: The next 1 damage that would be dealt to target legendary creature you control this turn is dealt to you instead.
 mana={3}{W}
@@ -36185,11 +35828,6 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-name=Vec Townships
-text={T}: Add {1} to your mana pool. -- {T}: Add {G} or {W} to your mana pool. Vec Townships doesn't untap during your next untap step.
-type=Land
-[/card]
-[card]
 name=Vectis Dominator
 text={T}: Tap target creature unless its controller pays 2 life.
 mana={1}{W}{B}
@@ -37442,11 +37080,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Waterveil Cavern
-text={T}: Add {1} to your mana pool. -- {T}: Add {U} or {B} to your mana pool. Waterveil Cavern doesn't untap during your next untap step.
-type=Land
-[/card]
-[card]
 name=Wave Elemental
 text={U}, {T}, Sacrifice Wave Elemental: Tap up to three target creatures without flying.
 mana={2}{U}{U}
@@ -37949,12 +37582,6 @@ mana={3}{W}{W}
 type=Sorcery
 [/card]
 [card]
-name=Wine of Blood and Iron
-text={4}: Target creature gets +X/+0 until end of turn, where X is its power. Sacrifice Wine of Blood and Iron at the beginning of the next end step.
-mana={3}
-type=Artifact
-[/card]
-[card]
 name=Wing Shards
 text=Target player sacrifices an attacking creature. -- Storm (When you cast this spell, copy it for each spell cast before it this turn.)
 mana={1}{W}{W}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index f2ea8261b..acd86341c 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1303,7 +1303,7 @@ type=Sorcery
 [card]
 name=Anathemancer
 auto=foreach(land[-basic]|opponentBattlefield) damage:1 opponent
-autograveyard={5}{B}{R}:moveto(exile) && token(17953811) asSorcery
+autograveyard={5}{B}{R}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=When Anathemancer enters the battlefield, it deals damage to target player equal to the number of nonbasic lands that player controls. -- Unearth {5}{B}{R} ({5}{B}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{B}{R}
 type=Creature
@@ -1312,18 +1312,6 @@ power=2
 toughness=2
 [/card]
 [card]
-name=Anathemancer Unearthed
-type=Creature
-subtype=Zombie Wizard
-abilities=haste
-auto=foreach(land[-basic]|opponentBattlefield) damage:1 opponent
-auto=@next end:moveTo(exile)
-text=When Anathemancer enters the battlefield, it deals damage to target player equal to the number of nonbasic lands that player controls. -- Unearth {5}{B}{R} ({5}{B}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=2
-toughness=2
-mana={1}{B}{R}
-[/card]
-[card]
 name=Ancestor's Chosen
 abilities=first strike
 auto=foreach(*|mygraveyard) life:1
@@ -1771,6 +1759,16 @@ power=4
 toughness=3
 [/card]
 [card]
+name=Apes of Rath
+auto=@each mycombatdamage:all(Apes of Rath[attacking]|mybattlefield) frozen
+text=Whenever Apes of Rath attacks, it doesn't untap during its controller's next untap step.
+mana={2}{G}{G}
+type=Creature
+subtype=Ape
+power=5
+toughness=4
+[/card]
+[card]
 name=Aphetto Vulture
 abilities=flying
 autograveyard=@movedTo(this|graveyard) from(battlefield):may moveto(mylibrary) target(zombie other|mygraveyard)
@@ -1822,6 +1820,16 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Apprentice Necromancer
+auto={B}{T}{S}:moveto(mybattlefield) target(creature|mygraveyard) && transforms(,treason,haste) forever
+text={B}, {T}, Sacrifice Apprentice Necromancer: Return target creature card from your graveyard to the battlefield. That creature gains haste. At the beginning of the next end step, sacrifice it.
+mana={1}{B}
+type=Creature
+subtype=Zombie Wizard
+power=1
+toughness=1
+[/card]
+[card]
 name=Apprentice Sorcerer
 auto={T}:damage:1 target(creature,player) myTurnOnly
 text={T}: Apprentice Sorcerer deals 1 damage to target creature or player. Activate this ability only during your turn, before attackers are declared.
@@ -1936,8 +1944,7 @@ type=Nothing
 [/card]
 [card]
 name=Arc Runner
-abilities=haste
-auto=@next end:bury
+abilities=haste,treason
 text=Haste -- At the beginning of the end step, sacrifice Arc Runner.
 mana={2}{R}
 type=Creature
@@ -3439,8 +3446,7 @@ type=Sorcery
 [/card]
 [card]
 name=Ball Lightning
-abilities=trample,haste
-auto=@next end:bury
+abilities=trample,haste,treason
 text=Trample (If this creature would deal enough damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player or planeswalker.) -- Haste (This creature can attack and {T} as soon as it comes under your control.) -- At the beginning of the end step, sacrifice Ball Lightning.
 mana={R}{R}{R}
 type=Creature
@@ -3747,6 +3753,13 @@ power=6
 toughness=5
 [/card]
 [card]
+name=Barl's Cage
+auto={3}:frozen target(creature)
+text={3}: Target creature doesn't untap during its controller's next untap step.
+mana={4}
+type=Artifact
+[/card]
+[card]
 name=Barony Vampire
 text=
 mana={2}{B}
@@ -6029,7 +6042,7 @@ toughness=2
 [card]
 name=Brackwater Elemental
 auto=@each combatends:moveTo(ownerGraveyard) all(brackwater elemental[attacking;blocking]|myBattlefield)
-autograveyard={2}{U}:moveto(exile) && token(18014711) asSorcery
+autograveyard={2}{U}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=When Brackwater Elemental attacks or blocks, sacrifice it at the beginning of the next end step. -- Unearth {2}{U} ({2}{U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={2}{U}
 type=Creature
@@ -6038,18 +6051,6 @@ power=4
 toughness=4
 [/card]
 [card]
-name=Brackwater Elemental Unearthed
-type=Creature
-subtype=Elemental
-abilities=haste
-auto=@each combatends:moveTo(ownerGraveyard) all(brackwater elemental[attacking;blocking]|myBattlefield)
-auto=@next end:moveTo(exile)
-text=When Brackwater Elemental attacks or blocks, sacrifice it at the beginning of the next end step. -- Unearth {2}{U} ({2}{U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=4
-toughness=4
-mana={2}{U}
-[/card]
-[card]
 name=Braid of Fire
 auto=@each my upkeep:may moveTo(mygraveyard)
 auto=@each my upkeep:thisforeach(counter{0/0.1.Age}) add{R}
@@ -8496,6 +8497,14 @@ power=5
 toughness=3
 [/card]
 [card]
+name=Cinder Marsh
+auto={T}:Add{1}
+auto={T}:Add{B} && frozen
+auto={T}:Add{R} && frozen
+text={T}: Add {1} to your mana pool. -- {T}: Add {B} or {R} to your mana pool. Cinder Marsh doesn't untap during your next untap step.
+type=Land
+[/card]
+[card]
 name=Cinder Pyromancer
 auto={T}:damage:1 target(player)
 auto=@movedTo(*[red]|mystack):may untap
@@ -8976,15 +8985,6 @@ power=2
 toughness=3
 [/card]
 [card]
-name=Daru Warchief
-text=Soldier spells you cast cost {1} less to cast. -- Soldier creatures you control get +1/+2.
-mana={2}{W}{W}
-type=Creature
-subtype=Human Soldier
-power=1
-toughness=1
-[/card]
-[card]
 name=Cloud Key
 auto=choice name(artifact) && lord(artifact|myhand) colorless:-1
 auto=choice name(creature) && lord(creature|myhand) colorless:-1
@@ -9053,6 +9053,14 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Cloudcrest Lake
+auto={T}:Add{1}
+auto={T}:Add{W} && frozen
+auto={T}:Add{U} && frozen
+text={T}: Add {1} to your mana pool. -- {T}: Add {W} or {U} to your mana pool. Cloudcrest Lake doesn't untap during your next untap step.
+type=Land
+[/card]
+[card]
 name=Cloudcrown Oak
 abilities=reach
 text=Reach (This can block creatures with flying.)
@@ -9718,7 +9726,7 @@ toughness=1
 [card]
 name=Corpse Connoisseur
 auto=may moveTo(mygraveyard) target(creature|myLibrary)
-autograveyard={4}{B}:moveto(exile) && token(17644811) asSorcery
+autograveyard={4}{B}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=When Corpse Connoisseur enters the battlefield, you may search your library for a creature card and put that card into your graveyard. If you do, shuffle your library. -- Unearth {3}{B} ({3}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={4}{B}
 type=Creature
@@ -9727,18 +9735,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Corpse Connoisseur Unearthed
-type=Creature
-subtype=Zombie Wizard
-abilities=haste
-auto=may moveTo(mygraveyard) target(creature|myLibrary)
-auto=@next end:moveTo(exile)
-text=When Corpse Connoisseur enters the battlefield, you may search your library for a creature card and put that card into your graveyard. If you do, shuffle your library. -- Unearth {3}{B} ({3}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=3
-toughness=3
-mana={4}{B}
-[/card]
-[card]
 name=Corpse Hatch
 target=creature[-black]
 auto=destroy
@@ -11399,6 +11395,17 @@ power=3
 toughness=6
 [/card]
 [card]
+name=Deathknell Kami
+abilities=flying
+auto={2}:1/1 && treason
+text=Flying -- {2}: Deathknell Kami gets +1/+1 until end of turn. Sacrifice it at the beginning of the next end step. -- Soulshift 1 (When this is put into a graveyard from the battlefield, you may return target Spirit card with converted mana cost 1 or less from your graveyard to your hand.)
+mana={1}{B}
+type=Creature
+subtype=Spirit
+power=0
+toughness=1
+[/card]
+[card]
 name=Deathless Angel
 abilities=flying
 auto={W}{W}:indestructible target(creature)
@@ -12453,7 +12460,6 @@ toughness=3
 name=Disappear
 target=creature
 auto={U}:moveTo(ownerhand) all(this) && moveTo(ownerhand)
-###Tested and working!!! Don't ask me why! :)
 text=Enchant creature -- {U}: Return enchanted creature and Disappear to their owners' hands.
 mana={2}{U}{U}
 type=Enchantment
@@ -13353,7 +13359,7 @@ toughness=3
 [/card]
 [card]
 name=Dregscape Zombie
-autograveyard={B}:moveto(exile) && token(17483511) asSorcery
+autograveyard={B}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=Unearth {B} ({B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{B}
 type=Creature
@@ -13362,16 +13368,6 @@ power=2
 toughness=1
 [/card]
 [card]
-name=Dregscape Zombie Unearthed
-type=Creature
-subtype=Zombie
-abilities=haste
-auto=@next end:moveTo(exile)
-power=2
-toughness=1
-mana={1}{B}
-[/card]
-[card]
 name=Drekavac
 auto=aslongas(*[-creature]|myhand) moveTo(graveyard) notatarget(*[-creature]|myhand) oneshot
 auto=moveTo(graveyard) notatarget(this|myBattlefield)
@@ -14526,7 +14522,6 @@ toughness=1
 [card]
 name=Elvish Berserker
 auto=rampage(1/1,0)
-auto=name(look at opponents hand) target(*|opponenthand)
 text=Whenever Elvish Berserker becomes blocked, it gets +1/+1 until end of turn for each creature blocking it.
 mana={G}
 type=Creature
@@ -14598,6 +14593,16 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Elvish Hunter
+auto={1}{G}{T}:frozen target(creature)
+text={1}{G}, {T}: Target creature doesn't untap during its controller's next untap step.
+mana={1}{G}
+type=Creature
+subtype=Elf Archer
+power=1
+toughness=1
+[/card]
+[card]
 name=Elvish Lookout
 abilities=shroud
 text=Shroud (This permanent can't be the target of spells or abilities.)
@@ -15540,7 +15545,7 @@ toughness=3
 [/card]
 [card]
 name=Etherium Abomination
-autograveyard={1}{U}{B}:moveto(exile) && token(17957311) asSorcery
+autograveyard={1}{U}{B}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=Unearth {1}{U}{B} ({1}{U}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={3}{U}{B}
 type=Artifact Creature
@@ -15549,17 +15554,6 @@ power=4
 toughness=3
 [/card]
 [card]
-name=Etherium Abomination Unearthed
-type=Creature
-subtype=Horror
-abilities=haste
-auto=@next end:moveTo(exile)
-text=Unearth {1}{U}{B} ({1}{U}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=4
-toughness=3
-mana={3}{U}{B}
-[/card]
-[card]
 name=Etherium Astrolabe
 abilities=flash
 auto={B}{T}{S(artifact|myBattlefield)}:draw:1
@@ -15718,6 +15712,14 @@ mana={B}
 type=Artifact
 [/card]
 [card]
+name=Exhaustion
+auto=frozen all(creature|opponentbattlefield) frozen
+auto=frozen all(land|opponentbattlefield) frozen
+text=Creatures and lands target opponent controls don't untap during his or her next untap step.
+mana={2}{U}
+type=Sorcery
+[/card]
+[card]
 name=Exile
 target=creature[-white;attacking]
 auto=moveto(exile)
@@ -15834,8 +15836,8 @@ type=Sorcery
 [card]
 name=Extractor Demon
 abilities=flying
-autograveyard={B}:moveto(exile) && token(18908211) asSorcery
-auto=@movedTo(other creature|exile,graveyard,hand,library) from(battlefield):may deplete:2 target(player)
+autograveyard={B}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
+auto=@movedTo(other creature|nonbattlezone) from(battlefield):may deplete:2 target(player)
 text=Flying -- Whenever another creature leaves the battlefield, you may have target player put the top two cards of his or her library into his or her graveyard. -- Unearth {2}{B} ({2}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={4}{B}{B}
 type=Creature
@@ -15844,18 +15846,6 @@ power=5
 toughness=5
 [/card]
 [card]
-name=Extractor Demon Unearthed
-type=Creature
-subtype=Demon
-abilities=haste,flying
-auto=@next end:moveTo(exile)
-auto=@movedTo(other creature|exile,graveyard,hand,library) from(battlefield):may deplete:2 target(player)
-text=Flying -- Whenever another creature leaves the battlefield, you may have target player put the top two cards of his or her library into his or her graveyard. -- Unearth {2}{B} ({2}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=5
-toughness=5
-mana={4}{B}{B}
-[/card]
-[card]
 name=Extruder
 auto={S(artifact|myBattlefield)}:counter(1/1,1) target(creature)
 auto=upcost[{4}{0};next upkeep] moveTo(graveyard)
@@ -16212,10 +16202,20 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Fatal Frenzy
+target=creature
+auto=trample
+auto=treason
+auto=power/0
+text=Until end of turn, target creature you control gains trample and gets +X/+0, where X is its power. Sacrifice it at the beginning of the next end step.
+mana={2}{R}
+type=Instant
+[/card]
+[card]
 name=Fatestitcher
 auto={T}:Tap target(other *)
 auto={T}:Untap target(other *)
-autograveyard={U}:moveto(exile) && token(17645611) asSorcery
+autograveyard={U}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text={T}: You may tap or untap another target permanent. -- Unearth {U} ({U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={3}{U}
 type=Creature
@@ -16224,19 +16224,6 @@ power=1
 toughness=2
 [/card]
 [card]
-name=Fatestitcher Unearthed
-type=Creature
-subtype=Zombie Wizard
-abilities=haste
-auto={T}:Tap target(other *)
-auto={T}:Untap target(other *)
-auto=@next end:moveTo(exile)
-text={T}: You may tap or untap another target permanent. -- Unearth {U} ({U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=1
-toughness=2
-mana={3}{U}
-[/card]
-[card]
 name=Fault Line
 auto=damage:X all(creature[-flying])
 auto=damage:X all(player)
@@ -16877,7 +16864,7 @@ type=Sorcery
 [card]
 name=Fire-Field Ogre
 abilities=first strike
-autograveyard={U}{B}{R}:moveto(exile) && token(17644711) asSorcery
+autograveyard={U}{B}{R}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=First strike -- Unearth {U}{B}{R} ({U}{B}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{U}{B}{R}
 type=Creature
@@ -16886,17 +16873,6 @@ power=4
 toughness=2
 [/card]
 [card]
-name=Fire-Field Ogre Unearthed
-type=Creature
-subtype=Ogre Mutant
-abilities=haste,first strike
-auto=@next end:moveTo(exile)
-text=First strike -- Unearth {U}{B}{R} ({U}{B}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=4
-toughness=2
-mana={1}{U}{B}{R}
-[/card]
-[card]
 name=Fire-Lit Thicket
 auto={T}:Add{1}
 auto={RG}{T}:Add {R}{R}
@@ -17779,6 +17755,16 @@ power=2
 toughness=4
 [/card]
 [card]
+name=Footsteps of the Goryo
+target=creature|myGraveyard
+auto=moveto(myBattlefield)
+auto=treason
+text=Return target creature card from your graveyard to the battlefield. Sacrifice that creature at the beginning of the next end step.
+mana={2}{B}
+type=Sorcery
+subtype=Arcane
+[/card]
+[card]
 name=Foratog
 auto={G}{S(forest|myBattlefield)}:2/2
 text={G}, Sacrifice a Forest: Foratog gets +2/+2 until end of turn.
@@ -20099,6 +20085,16 @@ power=2
 toughness=1
 [/card]
 [card]
+name=Goblin Ski Patrol
+auto=aslongas(mountain[snow]|mybattlefield) {1}{R}:2/0 && flying && treason
+text={1}{R}: Goblin Ski Patrol gets +2/+0 and gains flying. Its controller sacrifices it at the beginning of the next end step. Activate this ability only once and only if you control a snow Mountain.
+mana={1}{R}
+type=Creature
+subtype=Goblin
+power=1
+toughness=1
+[/card]
+[card]
 name=Goblin Sky Raider
 abilities=flying
 text=Flying (This creature can't be blocked except by creatures with flying or reach.)
@@ -21074,7 +21070,7 @@ type=Land
 [card]
 name=Grixis Slavedriver
 auto=token(Zombie,Creature Token Zombie,2/2,black)
-autograveyard={3}{B}:moveto(exile) && token(17980411) asSorcery
+autograveyard={3}{B}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=When Grixis Slavedriver leaves the battlefield, put a 2/2 black Zombie creature token onto the battlefield. -- Unearth {3}{B} ({3}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={5}{B}
 type=Creature
@@ -21083,18 +21079,6 @@ power=4
 toughness=4
 [/card]
 [card]
-name=Grixis Slavedriver Unearthed
-type=Creature
-subtype=Zombie Giant
-abilities=haste
-auto=token(Zombie,Creature Token Zombie,2/2,black)
-auto=@next end:moveTo(exile)
-text=When Grixis Slavedriver leaves the battlefield, put a 2/2 black Zombie creature token onto the battlefield. -- Unearth {3}{B} ({3}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-mana={5}{B}
-power=4
-toughness=4
-[/card]
-[card]
 name=Grixis Sojourners
 auto=@movedTo(this|graveyard) from(battlefield):may moveTo(exile) target(*|graveyard)
 autohand={2}{B}:cycling
@@ -21151,8 +21135,7 @@ type=Enchantment
 [/card]
 [card]
 name=Groundbreaker
-abilities=trample,haste
-auto=@next endofturn:bury
+abilities=trample,haste,treason
 text=Trample, haste -- At the beginning of the end step, sacrifice Groundbreaker.
 mana={G}{G}{G}
 type=Creature
@@ -22298,7 +22281,7 @@ toughness=1
 name=Hell's Thunder
 abilities=flying,haste
 auto=@each endofturn:moveTo(ownergraveyard)
-autograveyard={4}{R}:moveto(exile) && token(17645511) asSorcery
+autograveyard={4}{R}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=Flying, haste -- At the beginning of the end step, sacrifice Hell's Thunder. -- Unearth {4}{R} ({4}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{R}{R}
 type=Creature
@@ -22307,17 +22290,6 @@ power=4
 toughness=4
 [/card]
 [card]
-name=Hell's Thunder Unearthed
-type=Creature
-subtype=Elemental
-abilities=flying,haste
-auto=@next end:moveTo(exile)
-text=Flying, haste -- At the beginning of the end step, sacrifice Hell's Thunder. -- Unearth {4}{R} ({4}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-mana={1}{R}{R}
-power=4
-toughness=4
-[/card]
-[card]
 name=Hellfire
 auto=foreach(creature[-black]) damage:1 controller
 auto=damage:3 controller
@@ -22356,7 +22328,7 @@ toughness=8
 name=Hellspark Elemental
 abilities=trample,haste
 auto=@each endofturn:moveTo(ownergraveyard)
-autograveyard={1}{R}:moveto(exile) && token(17479911) asSorcery
+autograveyard={1}{R}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=Trample, haste -- At the beginning of the end step, sacrifice Hellspark Elemental. -- Unearth {1}{R} ({1}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{R}
 type=Creature
@@ -22365,17 +22337,6 @@ power=3
 toughness=1
 [/card]
 [card]
-name=Hellspark Elemental Unearthed
-type=Creature
-subtype=Elemental
-abilities=trample,haste
-auto=@next endofturn:moveTo(exile)
-text=Trample, haste -- At the beginning of the end step, sacrifice Hellspark Elemental. -- Unearth {1}{R} ({1}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=3
-toughness=1
-mana={1}{R}
-[/card]
-[card]
 name=Helm of Awakening
 auto=lord(*|myhand) colorless:-1
 auto=lord(*|opponenthand) colorless:-1
@@ -22768,6 +22729,16 @@ power=2
 toughness=1
 [/card]
 [card]
+name=Homarid Warrior
+auto={U}:shroud && tap && frozen
+text={U}: Homarid Warrior gains shroud until end of turn and doesn't untap during your next untap step. Tap Homarid Warrior. (A permanent with shroud can't be the target of spells or abilities.)
+mana={4}{U}
+type=Creature
+subtype=Homarid Warrior
+power=3
+toughness=3
+[/card]
+[card]
 name=Honden of Cleansing Fire
 auto=@each my upkeep:foreach(shrine|myBattlefield) life:2
 text=At the beginning of your upkeep, you gain 2 life for each Shrine you control.
@@ -23843,6 +23814,17 @@ mana={3}{R}{R}
 type=Enchantment
 [/card]
 [card]
+name=Incandescent Soulstoke
+auto=lord(other creature[elemental]|myBattlefield) 1/1
+auto={1}{R}{T}:moveto(mybattlefield) target(creature[elemental]|myhand) && transforms(,treason,haste) forever
+text=Other Elemental creatures you control get +1/+1. -- {1}{R}, {T}: You may put an Elemental creature card from your hand onto the battlefield. That creature gains haste until end of turn. Sacrifice it at the beginning of the next end step.
+mana={2}{R}
+type=Creature
+subtype=Elemental Shaman
+power=2
+toughness=2
+[/card]
+[card]
 name=Incendiary
 target=creature
 auto=@each my upkeep:counter(0/0,1,Fuse)
@@ -25813,6 +25795,38 @@ power=0
 toughness=0
 [/card]
 [card]
+name=Kashi-Tribe Elite
+auto=lord(snake[legendary]|mybattlefield) shroud
+auto=@damaged(creature[attacking;blocking]) from(kashi-tribe elite[attacking;blocking]):all(trigger[to]) tap && frozen
+text=Legendary Snakes you control have shroud. (They can't be the targets of spells or abilities.) -- Whenever Kashi-Tribe Elite deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
+mana={1}{G}{G}
+type=Creature
+subtype=Snake Warrior
+power=2
+toughness=3
+[/card]
+[card]
+name=Kashi-Tribe Reaver
+auto=@damaged(creature[attacking;blocking]) from(kashi-tribe reaver[attacking;blocking]):all(trigger[to]) tap && frozen
+auto={1}{G}:regenerate
+text=Whenever Kashi-Tribe Reaver deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. -- {1}{G}: Regenerate Kashi-Tribe Reaver.
+mana={3}{G}
+type=Creature
+subtype=Snake Warrior
+power=3
+toughness=2
+[/card]
+[card]
+name=Kashi-Tribe Warriors
+auto=@damaged(creature[attacking;blocking]) from(kashi-tribe warriors[attacking;blocking]):all(trigger[to]) tap && frozen
+text=Whenever Kashi-Tribe Warriors deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
+mana={3}{G}{G}
+type=Creature
+subtype=Snake Warrior
+power=2
+toughness=4
+[/card]
+[card]
 name=Kasimir the Lone Wolf
 mana={4}{W}{U}
 type=Legendary Creature
@@ -25824,7 +25838,7 @@ toughness=3
 name=Kathari Bomber
 abilities=flying
 auto=@damaged(player) from(this):token(Goblin,Creature Token Goblin,1/1,red)*2 && moveTo(ownergraveyard) all(this)
-autograveyard={3}{B}{R}:moveto(exile) && token(17960211) asSorcery
+autograveyard={3}{B}{R}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=Flying -- When Kathari Bomber deals combat damage to a player, put two 1/1 red Goblin creature tokens onto the battlefield and sacrifice Kathari Bomber. -- Unearth {3}{B}{R} ({3}{B}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{B}{R}
 type=Creature
@@ -25833,21 +25847,9 @@ power=2
 toughness=2
 [/card]
 [card]
-name=Kathari Bomber Unearthed
-type=Creature
-subtype=Bird Shaman
-abilities=haste,flying
-auto=@next end:moveTo(exile)
-auto=@damaged(player) from(this):token(Goblin,Creature Token Goblin,1/1,red)*2 && moveTo(exile) all(this)
-text=Flying -- When Kathari Bomber deals combat damage to a player, put two 1/1 red Goblin creature tokens onto the battlefield and sacrifice Kathari Bomber. -- Unearth {3}{B}{R} ({3}{B}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=2
-toughness=2
-mana={1}{B}{R}
-[/card]
-[card]
 name=Kathari Screecher
 abilities=flying
-autograveyard={2}{U}:moveto(exile) && token(17483711) asSorcery
+autograveyard={2}{U}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=Flying -- Unearth {2}{U} ({2}{U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={2}{U}
 type=Creature
@@ -25856,17 +25858,6 @@ power=2
 toughness=2
 [/card]
 [card]
-name=Kathari Screecher Unearthed
-type=Creature
-subtype=Bird Soldier
-abilities=haste,flying
-auto=@next end:moveTo(exile)
-text=Flying -- Unearth {2}{U} ({2}{U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=2
-toughness=2
-mana={2}{U}
-[/card]
-[card]
 name=Kavu Aggressor
 abilities=cantblock
 kicker={4}
@@ -26042,7 +26033,7 @@ toughness=3
 [card]
 name=Kederekt Leviathan
 auto=moveTo(ownerhand) all(other *[-land])
-autograveyard={6}{U}:moveto(exile) && token(17488211) asSorcery
+autograveyard={6}{U}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=When Kederekt Leviathan enters the battlefield, return all other nonland permanents to their owners' hands. -- Unearth {6}{U} ({6}{U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={6}{U}{U}
 type=Creature
@@ -26051,18 +26042,6 @@ power=5
 toughness=5
 [/card]
 [card]
-name=Kederekt Leviathan Unearthed
-type=Creature
-subtype=Leviathan
-abilities=haste
-auto=moveTo(ownerhand) all(other *[-land])
-auto=@next end:moveTo(exile)
-text=When Kederekt Leviathan enters the battlefield, return all other nonland permanents to their owners' hands. -- Unearth {6}{U} ({6}{U}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=5
-toughness=5
-mana={6}{U}{U}
-[/card]
-[card]
 name=Kederekt Parasite
 auto=@movedTo(*|opponenthand) from(opponentlibrary):aslongas(*[red]|myBattlefield) may damage:1 opponent
 text=Whenever an opponent draws a card, if you control a red permanent, you may have Kederekt Parasite deal 1 damage to that player.
@@ -26299,8 +26278,7 @@ toughness=2
 [/card]
 [card]
 name=Kiki's Cloning Object
-auto=haste
-auto=@next endofturn:bury
+abilities=haste,treason
 auto=copy notatarget(creature[-legendary]|myBattlefield)
 text=Haste -- Copy target nonlegendary creature. -- Sacrifice it at end of turn.
 type=Creature
@@ -27079,6 +27057,16 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Kor Hookmaster
+auto=tap && frozen target(creature)
+text=When Kor Hookmaster enters the battlefield, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
+mana={2}{W}
+type=Creature
+subtype=Kor Soldier
+power=2
+toughness=2
+[/card]
+[card]
 name=Kor Sanctifiers
 kicker={W}
 auto=kicker destroy target(artifact,enchantment)
@@ -27319,6 +27307,17 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Krovikan Elementalist
+auto={2}{R}:1/0 target(creature)
+auto={U}{U}:flying target(creature) && treason
+text={2}{R}: Target creature gets +1/+0 until end of turn. -- {U}{U}: Target creature you control gains flying until end of turn. Sacrifice it at the beginning of the next end step.
+mana={B}{B}
+type=Creature
+subtype=Human Wizard
+power=1
+toughness=1
+[/card]
+[card]
 name=Krovikan Mist
 abilities=flying
 auto=foreach(illusion|battlefield) 1/1
@@ -27592,6 +27591,14 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Lantern-Lit Graveyard
+auto={T}:Add{1}
+auto={T}:Add{B} && frozen
+auto={T}:Add{R} && frozen
+text={T}: Add {1} to your mana pool. -- {T}: Add {B} or {R} to your mana pool. Lantern-Lit Graveyard doesn't untap during your next untap step.
+type=Land
+[/card]
+[card]
 name=Last Breath
 target=creature[power<=2]
 auto=moveTo(exile)
@@ -27836,6 +27843,16 @@ mana={1}{W}
 type=Instant
 [/card]
 [card]
+name=Lead Golem
+auto=@each mycombatdamage:all(lead golem[attacking]|mybattlefield) frozen
+text=Whenever Lead Golem attacks, it doesn't untap during its controller's next untap step.
+mana={5}
+type=Artifact Creature
+subtype=Golem
+power=3
+toughness=5
+[/card]
+[card]
 name=Leaden Fists
 abilities=flash
 target=creature
@@ -28370,9 +28387,8 @@ toughness=2
 [/card]
 [card]
 name=Lightning Serpent
-abilities=trample,haste
+abilities=trample,haste,treason
 auto=counter(1/0,X)
-auto=@next end:bury
 text=Trample, haste -- Lightning Serpent enters the battlefield with X +1/+0 counters on it. -- At the beginning of the end step, sacrifice Lightning Serpent.
 mana={X}{R}
 type=Creature
@@ -29726,6 +29742,14 @@ mana={2}{U}
 type=Instant
 [/card]
 [card]
+name=Mana Vapors
+auto=choice name(your opponent's lands don't untap during his next upkeep) && frozen all(land|opponentBattlefield)
+auto=choice name(your lands don't untap during your next upkeep) && frozen all(land|myBattlefield)
+text=Lands target player controls don't untap during his or her next untap step.
+mana={1}{U}
+type=Sorcery
+[/card]
+[card]
 name=Mana Vault
 auto=doesnotuntap
 auto={4}:untap myUpkeepOnly
@@ -30303,6 +30327,7 @@ subtype=Spirit
 power=*
 toughness=*
 [/card]
+
 [card]
 name=Matca Rioters
 auto=aslongas(forest|myBattlefield) 1/1
@@ -30328,6 +30353,17 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Matsu-Tribe Birdstalker
+auto=@damaged(creature[attacking;blocking]) from(matsu-tribe birdstalker[attacking;blocking]):all(trigger[to]) tap && frozen
+auto={G}:reach
+text=Whenever Matsu-Tribe Birdstalker deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step. -- {G}: Matsu-Tribe Birdstalker gains reach until end of turn. (It can block creatures with flying.)
+mana={2}{G}{G}
+type=Creature
+subtype=Snake Warrior Archer
+power=2
+toughness=2
+[/card]
+[card]
 name=Mawcor
 abilities=flying
 auto={T}:damage:1 target(creature,player)
@@ -31320,6 +31356,14 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Misstep
+text=Creatures target player controls don't untap during that player's next untap step.
+auto=choice name(your opponent's creatures don't untap during his next upkeep) && frozen all(creature|opponentBattlefield)
+auto=choice name(your creatures don't untap during your next upkeep) && frozen all(creature|myBattlefield)
+mana={1}{U}
+type=Sorcery
+[/card]
+[card]
 name=Mist Leopard
 abilities=shroud
 text=Shroud (This creature can't be the target of spells or abilities.)
@@ -31500,6 +31544,14 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Mogg Hollows
+auto={T}:Add{1}
+auto={T}:Add{R} && frozen
+auto={T}:Add{G} && frozen
+text={T}: Add {1} to your mana pool. -- {T}: Add {R} or {G} to your mana pool. Mogg Hollows doesn't untap during your next untap step.
+type=Land
+[/card]
+[card]
 name=Mogg Jailer
 auto=aslongas(creature[power<=2;-tapped]|opponentBattlefield) cantattack
 text=Mogg Jailer can't attack if defending player controls an untapped creature with power 2 or less.
@@ -34761,6 +34813,16 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Orochi Ranger
+auto=@damaged(creature[attacking;blocking]) from(orochi ranger[attacking;blocking]):all(trigger[to]) tap && frozen
+text=Whenever Orochi Ranger deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
+mana={1}{G}
+type=Creature
+subtype=Snake Warrior
+power=2
+toughness=1
+[/card]
+[card]
 name=Orochi Sustainer
 auto={T}:Add {G}
 text={T}: Add {G} to your mana pool.
@@ -36264,6 +36326,14 @@ text=Pine Barrens enters the battlefield tapped. -- {T}: Add {1} to your mana po
 type=Land
 [/card]
 [card]
+name=Pinecrest Ridge
+auto={T}:Add{1}
+auto={T}:Add{R} && frozen
+auto={T}:Add{G} && frozen
+text={T}: Add {1} to your mana pool. -- {T}: Add {R} or {G} to your mana pool. Pinecrest Ridge doesn't untap during your next untap step.
+type=Land
+[/card]
+[card]
 name=Pious Kitsune
 auto=@each my upkeep:aslongas(eight-and-a-half-tails|myBattlefield) thisforeach(counter{0/0.1.Devotion}) life:1 controller
 auto=@each my upkeep:counter(0/0,1,Devotion)
@@ -37578,6 +37648,16 @@ mana={1}{R}
 type=Instant
 [/card]
 [card]
+name=Pyric Salamander
+auto={R}:1/0 && treason
+text={R}: Pyric Salamander gets +1/+0 until end of turn. Sacrifice Pyric Salamander at the beginning of the next end step.
+mana={1}{R}
+type=Creature
+subtype=Salamander
+power=1
+toughness=1
+[/card]
+[card]
 name=Pyrite Spellbomb
 auto={R}{S}:Damage:2 target(creature,player)
 auto={1}{S}:draw:1
@@ -39507,6 +39587,16 @@ id=-152716111
 type=Nothing
 [/card]
 [card]
+name=Reveka, Wizard Savant
+auto={T}:damage:2 target(creature,player) && frozen all(this)
+text={T}: Reveka, Wizard Savant deals 2 damage to target creature or player and doesn't untap during your next untap step.
+mana={2}{U}{U}
+type=Legendary Creature
+subtype=Dwarf Wizard
+power=0
+toughness=1
+[/card]
+[card]
 name=Revelsong Horn
 auto={1}{T(other creature[-tapped]|myBattlefield)}{T}:1/1 target(creature)
 text={1}, {T}, Tap an untapped creature you control: Target creature gets +1/+1 until end of turn.
@@ -40401,6 +40491,14 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Rootwater Depths
+auto={T}:Add{1}
+auto={T}:Add{U} && frozen
+auto={T}:Add{B} && frozen
+text={T}: Add {1} to your mana pool. -- {T}: Add {U} or {B} to your mana pool. Rootwater Depths doesn't untap during your next untap step.
+type=Land
+[/card]
+[card]
 name=Rootwater Diver
 auto={T}{S}:moveTo(myhand) target(artifact|mygraveyard)
 text={T}, Sacrifice Rootwater Diver: Return target artifact card from your graveyard to your hand.
@@ -41001,6 +41099,16 @@ mana={6}
 type=Artifact
 [/card]
 [card]
+name=Samite Alchemist
+auto={W}{W}{T}:prevent:4 target(creature) && tap && frozen
+text={W}{W}, {T}: Prevent the next 4 damage that would be dealt this turn to target creature you control. Tap that creature. It doesn't untap during your next untap step.
+mana={3}{W}
+type=Creature
+subtype=Human Cleric
+power=0
+toughness=2
+[/card]
+[card]
 name=Samite Archer
 auto={T}:prevent:1 target(creature,player)
 auto={T}:damage:1 target(creature,player)
@@ -41743,7 +41851,7 @@ toughness=4
 [card]
 name=Scourge Devil
 auto=1/0 all(creature|myBattlefield)
-autograveyard={2}{R}:moveto(exile) && token(17484511) asSorcery
+autograveyard={2}{R}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=When Scourge Devil enters the battlefield, creatures you control get +1/+0 until end of turn. -- Unearth {2}{R} ({2}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={4}{R}
 type=Creature
@@ -41752,18 +41860,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Scourge Devil Unearthed
-type=Creature
-subtype=Devil
-abilities=haste
-auto=1/0 all(creature|myBattlefield)
-auto=@next end:moveTo(exile)
-text=When Scourge Devil enters the battlefield, creatures you control get +1/+0 until end of turn. -- Unearth {2}{R} ({2}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=3
-toughness=3
-mana={4}{R}
-[/card]
-[card]
 name=Scourge of Kher Ridges
 abilities=flying
 auto={1}{R}:damage:2 all(creature[-flying])
@@ -42935,7 +43031,7 @@ type=Sorcery
 [card]
 name=Shambling Remains
 abilities=cantblock
-autograveyard={B}{R}:moveto(exile) && token(18499111) asSorcery
+autograveyard={B}{R}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=Shambling Remains can't block. -- Unearth {B}{R} ({B}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={1}{B}{R}
 type=Creature
@@ -42944,17 +43040,6 @@ power=4
 toughness=3
 [/card]
 [card]
-name=Shambling Remains Unearthed
-type=Creature
-subtype=Zombie Horror
-abilities=haste,cantblock
-auto=@next end:moveTo(exile)
-text=Shambling Remains can't block. -- Unearth {B}{R} ({B}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=4
-toughness=3
-mana={1}{B}{R}
-[/card]
-[card]
 name=Shambling Strider
 auto={R}{G}:1/-1
 text={R}{G}: Shambling Strider gets +1/-1 until end of turn.
@@ -44403,6 +44488,18 @@ toughness=2
 # P/T modified to make auto rule possible
 [/card]
 [card]
+name=Skizzik
+abilities=trample,haste,treason
+kicker={R}
+auto=kicker -treason
+text=Kicker {R} (You may pay an additional {R} as you cast this spell.) -- Trample, haste -- At the beginning of the end step, sacrifice Skizzik unless it was kicked.
+mana={3}{R}
+type=Creature
+subtype=Elemental
+power=5
+toughness=3
+[/card]
+[card]
 name=Skred
 target=creature
 auto=foreach(snow|myBattlefield) damage:1
@@ -44866,7 +44963,7 @@ type=Instant
 name=Slave of Bolas
 target=creature
 auto=moveTo(myBattlefield)
-auto=@next end:bury
+auto=treason
 auto=untap
 auto=haste
 text=Gain control of target creature. Untap that creature. It gains haste until end of turn. Sacrifice it at the beginning of the next end step.
@@ -44883,6 +44980,14 @@ mana={2}{B}
 type=Instant
 [/card]
 [card]
+name=Sleep
+auto=choice name(your opponent's creatures don't untap during his next upkeep) && frozen all(creature|opponentBattlefield) && tap all(creature|opponentBattlefield)
+auto=choice name(your creatures don't untap during your next upkeep) && frozen all(creature|myBattlefield) && tap all(creature||myBattlefield)
+text=Tap all creatures target player controls. Those creatures don't untap during that player's next untap step.
+mana={2}{U}{U}
+type=Sorcery
+[/card]
+[card]
 name=Sleeper Agent
 auto=moveto(opponentBattlefield)
 auto=@each my upkeep:damage:2 Controller
@@ -45276,6 +45381,13 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Sneak Attack
+auto={R}:moveto(mybattlefield) target(creature) && transforms(,treason,haste) forever
+text={R}: You may put a creature card from your hand onto the battlefield. That creature gains haste. Sacrifice the creature at the beginning of the next end step.
+mana={3}{R}
+type=Enchantment
+[/card]
+[card]
 name=Sneaky Homunculus
 auto=cantbeblockedby(creature[power>=2])
 text=Sneaky Homunculus can't block or be blocked by creatures with power 2 or greater.
@@ -45953,6 +46065,15 @@ mana={7}{W}{W}{W}
 type=Sorcery
 [/card]
 [card]
+name=Soulshriek
+target=creature
+auto=foreach(creature|mygraveyard) 1/0
+auto=treason
+text=Target creature you control gets +X/+0 until end of turn, where X is the number of creature cards in your graveyard. Sacrifice that creature at the beginning of the next end step.
+mana={B}
+type=Instant
+[/card]
+[card]
 name=Soulsurge Elemental
 abilities=first strike
 auto=foreach(creature|myBattlefield) 1/0
@@ -46173,6 +46294,27 @@ mana={1}{B}
 type=Sorcery
 [/card]
 [card]
+name=Spectral Bears
+auto=@each mycombatdamage:aslongas(*[black]|opponentbattlefield) all(spectral bears[attacking]|mybattlefield) frozen <1
+text=Whenever Spectral Bears attacks, if defending player controls no black nontoken permanents, it doesn't untap during your next untap step.
+mana={1}{G}
+type=Creature
+subtype=Bear Spirit
+power=3
+toughness=3
+[/card]
+[card]
+name=Spectral Force
+abilities=trample
+auto=@each mycombatdamage:aslongas(*[black]|opponentbattlefield) all(spectral force[attacking]|mybattlefield) frozen <1
+text=Trample -- Whenever Spectral Force attacks, if defending player controls no black permanents, it doesn't untap during your next untap step.
+mana={3}{G}{G}
+type=Creature
+subtype=Elemental Spirit
+power=8
+toughness=8
+[/card]
+[card]
 name=Spectral Guardian
 auto=aslongas(spectral guardian[-tapped]|myBattlefield) lord(artifact[-creature]) shroud
 text=Noncreature artifacts have shroud as long as Spectral Guardian is untapped. (They can't be the targets of spells or abilities.)
@@ -46795,6 +46937,15 @@ mana={3}{G}
 type=Sorcery
 [/card]
 [card]
+name=Spore Cloud
+auto=tap all(creature[blocking])
+auto=preventAllcombatDamage ueot
+auto=frozen all(creature[attacking;blocking])
+text=Tap all blocking creatures. Prevent all combat damage that would be dealt this turn. Each attacking creature and each blocking creature doesn't untap during its controller's next untap step.
+mana={1}{G}{G}
+type=Instant
+[/card]
+[card]
 name=Spore Flower
 auto=@each my upkeep:counter(0/0,1,Spore)
 auto={C(0/0,-3,Spore)}:fog oneshot
@@ -49385,6 +49536,14 @@ power=2
 toughness=3
 [/card]
 [card]
+name=Tangle
+auto=preventAllcombatDamage ueot
+auto=frozen all(creature[attacking])
+text=Prevent all combat damage that would be dealt this turn. -- Each attacking creature doesn't untap during its controller's next untap step.
+mana={1}{G}
+type=Instant
+[/card]
+[card]
 name=Tangle Spider
 abilities=flash,reach
 text=Flash (You may cast this spell any time you could cast an instant.) -- Reach (This creature can block creatures with flying.)
@@ -50101,6 +50260,14 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Thalakos Lowlands
+auto={T}:Add{1}
+auto={T}:Add{W} && frozen
+auto={T}:Add{U} && frozen
+text={T}: Add {1} to your mana pool. -- {T}: Add {W} or {U} to your mana pool. Thalakos Lowlands doesn't untap during your next untap step.
+type=Land
+[/card]
+[card]
 name=Thalakos Mistfolk
 abilities=shadow
 auto={U}:moveTo(ownerLibrary)
@@ -51856,6 +52023,14 @@ mana={1}{G}
 type=Instant
 [/card]
 [card]
+name=Tranquil Garden
+auto={T}:Add{1}
+auto={T}:Add{G} && frozen
+auto={T}:Add{W} && frozen
+text={T}: Add {1} to your mana pool. -- {T}: Add {G} or {W} to your mana pool. Tranquil Garden doesn't untap during your next untap step.
+type=Land
+[/card]
+[card]
 name=Tranquil Grove
 auto={1}{G}{G}:Destroy all(other enchantment)
 text={1}{G}{G}: Destroy all other enchantments.
@@ -52736,7 +52911,7 @@ subtype=Aura
 [card]
 name=Undead Leotau
 auto={R}:1/-1
-autograveyard={2}{B}:moveto(exile) && token(17645211) asSorcery
+autograveyard={2}{B}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text={R}: Undead Leotau gets +1/-1 until end of turn. -- Unearth {2}{B} ({2}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={5}{B}
 type=Creature
@@ -52745,18 +52920,6 @@ power=3
 toughness=4
 [/card]
 [card]
-name=Undead Leotau Unearthed
-type=Creature
-subtype=Zombie Cat
-abilities=haste
-auto={R}:1/-1
-auto=@next end:moveTo(exile)
-text={R}: Undead Leotau gets +1/-1 until end of turn. -- Unearth {2}{B} ({2}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=3
-toughness=4
-mana={5}{B}
-[/card]
-[card]
 name=Undead Gladiator
 autohand={1}{B}:cycling
 autograveyard={1}{B}{S(*|myhand)}:moveTo(myhand) myUpkeepOnly
@@ -53503,6 +53666,16 @@ mana={2}{W}
 type=Instant
 [/card]
 [card]
+name=Varchild's Crusader
+auto={0}:cantbeblockedby(creature[-wall]) && treason
+text={0}: Varchild's Crusader can't be blocked this turn except by Walls. Sacrifice Varchild's Crusader at the beginning of the next end step.
+mana={3}{R}
+type=Creature
+subtype=Human Knight
+power=3
+toughness=2
+[/card]
+[card]
 name=Varchild's War-Riders
 abilities=trample
 auto=rampage(1/1,1)
@@ -53543,6 +53716,14 @@ power=0
 toughness=0
 [/card]
 [card]
+name=Vec Townships
+auto={T}:Add{1}
+auto={T}:Add{G} && frozen
+auto={T}:Add{W} && frozen
+text={T}: Add {1} to your mana pool. -- {T}: Add {G} or {W} to your mana pool. Vec Townships doesn't untap during your next untap step.
+type=Land
+[/card]
+[card]
 name=Vectis Agents
 auto={U}{B}:-2/0 && unblockable
 text={U}{B}: Vectis Agents gets -2/-0 until end of turn and is unblockable this turn.
@@ -54471,7 +54652,7 @@ toughness=5
 [card]
 name=Viscera Dragger
 autohand={2}:cycling
-autograveyard={1}{B}:moveto(exile) && token(17514411) asSorcery
+autograveyard={1}{B}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text=Cycling {2} ({2}, Discard this card: Draw a card.) -- Unearth {1}{B} ({1}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={3}{B}
 type=Creature
@@ -54480,17 +54661,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Viscera Dragger Unearthed
-type=Creature
-subtype=Zombie Ogre Warrior
-abilities=haste
-auto=@next end:moveTo(exile)
-text=Cycling {2} ({2}, Discard this card: Draw a card.) -- Unearth {1}{B} ({1}{B}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=3
-toughness=3
-mana={3}{B}
-[/card]
-[card]
 name=Viscerid Armor
 target=creature
 auto=1/1
@@ -54584,7 +54754,7 @@ toughness=2
 [card]
 name=Vithian Stinger
 auto={T}:damage:1 target(creature,player)
-autograveyard={B}:moveto(exile) && token(17492211) asSorcery
+autograveyard={1}{R}:moveto(mybattlefield) && transforms(,unearth,haste) asSorcery forever
 text={T}: Vithian Stinger deals 1 damage to target creature or player. -- Unearth {1}{R} ({1}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
 mana={2}{R}
 type=Creature
@@ -54593,18 +54763,6 @@ power=0
 toughness=1
 [/card]
 [card]
-name=Vithian Stinger Unearthed
-type=Creature
-subtype=Human Shaman
-abilities=haste
-auto={T}:damage:1 target(creature,player)
-auto=@next end:moveTo(exile)
-text={T}: Vithian Stinger deals 1 damage to target creature or player. -- Unearth {1}{R} ({1}{R}: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery.)
-power=0
-toughness=1
-mana={2}{R}
-[/card]
-[card]
 name=Vitu-Ghazi, the City-Tree
 auto={T}:Add {1}
 auto={2}{G}{W}{T}:token(Saproling,creature saproling, 1/1, green)
@@ -55873,6 +56031,14 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Waterveil Cavern
+auto={T}:Add{1}
+auto={T}:Add{U} && frozen
+auto={T}:Add{B} && frozen
+text={T}: Add {1} to your mana pool. -- {T}: Add {U} or {B} to your mana pool. Waterveil Cavern doesn't untap during your next untap step.
+type=Land
+[/card]
+[card]
 name=Watery Grave
 auto=tap
 auto=may untap && life:-2 controller
@@ -56828,6 +56994,13 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Wine of Blood and Iron
+auto={4}:power/0 target(creature) && treason all(this)
+text={4}: Target creature gets +X/+0 until end of turn, where X is its power. Sacrifice Wine of Blood and Iron at the beginning of the next end step.
+mana={3}
+type=Artifact
+[/card]
+[card]
 name=Wing Snare
 target=creature[flying]
 auto=destroy
diff --git a/projects/mtg/bin/Res/test/dregscape_zombie_unearth.txt b/projects/mtg/bin/Res/test/dregscape_zombie_unearth.txt
index 68ab074b7..6e645459e 100644
--- a/projects/mtg/bin/Res/test/dregscape_zombie_unearth.txt
+++ b/projects/mtg/bin/Res/test/dregscape_zombie_unearth.txt
@@ -12,7 +12,7 @@ next
 #begin
 next
 #attackers
-dregscape zombie unearthed
+dregscape zombie
 next
 #blockers
 next
@@ -20,7 +20,7 @@ next
 [ASSERT]
 COMBATDAMAGE
 [PLAYER1]
-inplay:dregscape zombie unearthed
+inplay:dregscape zombie
 graveyard:swamp
 manapool:{0}
 [PLAYER2]
diff --git a/projects/mtg/bin/Res/test/fatal_frenzy.txt b/projects/mtg/bin/Res/test/fatal_frenzy.txt
new file mode 100644
index 000000000..663bd1b03
--- /dev/null
+++ b/projects/mtg/bin/Res/test/fatal_frenzy.txt
@@ -0,0 +1,33 @@
+#Testing Fatal Frenzy & the keyword "Frenzy".
+[INIT]
+COMBATATTACKERS
+[PLAYER1]
+hand:Fatal frenzy
+inplay:Grizzly Bears
+manapool:{2}{R}
+[PLAYER2]
+life:20
+[DO]
+Fatal Frenzy
+Grizzly Bears
+Grizzly Bears
+next
+#blockers 
+next
+#combatdamage 2
+next
+#endofcombat 2
+next
+#secondmain
+next
+#endofturn
+next
+[ASSERT]
+CLEANUP
+[PLAYER1]
+graveyard:fatal frenzy,grizzly bears
+manapool:{0}
+life:20
+[PLAYER2]
+life:16
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/force_of_will.txt b/projects/mtg/bin/Res/test/force_of_will.txt
new file mode 100644
index 000000000..a63cc2517
--- /dev/null
+++ b/projects/mtg/bin/Res/test/force_of_will.txt
@@ -0,0 +1,28 @@
+#Testing counterspell on bad moon
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Grizzly Bears
+manapool:{1}{G}
+[PLAYER2]
+hand:Force of Will,Giant Octopus
+[DO]
+Grizzly Bears
+no
+yes
+Force of Will
+Giant Octopus
+Grizzly Bears
+endinterruption
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:Grizzly Bears
+manapool:{0}
+life:20
+[PLAYER2]
+graveyard:Force of Will
+exile:Giant Octopus
+manapool:{0}
+life:19
+[END]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/test/unearth1.txt b/projects/mtg/bin/Res/test/unearth1.txt
index 54661cc70..de4aeda81 100644
--- a/projects/mtg/bin/Res/test/unearth1.txt
+++ b/projects/mtg/bin/Res/test/unearth1.txt
@@ -22,7 +22,7 @@ Dregscape Zombie
 [ASSERT]
 SECONDMAIN
 [PLAYER1]
-inplay:Dregscape Zombie Unearthed,129754
+inplay:Dregscape Zombie,129754
 [PLAYER2]
 graveyard:Grizzly Bears
 life:20