diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 1bdc72aa0..ab4323b5a 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -16196,12 +16196,6 @@ power=6
 toughness=6
 [/card]
 [card]
-name=Imperial Mask
-text=When Imperial Mask enters the battlefield, if it's not a token, each of your teammates puts a token that's a copy of Imperial Mask onto the battlefield. -- You can't be the target of spells or abilities your opponents control.
-mana={4}{W}
-type=Enchantment
-[/card]
-[card]
 name=Imperial Seal
 text=Search your library for a card, then shuffle your library and put that card on top of it. You lose 2 life.
 mana={B}
@@ -16922,12 +16916,6 @@ power=3
 toughness=4
 [/card]
 [card]
-name=Ivory Mask
-text=You have shroud. (You can't be the target of spells or abilities.)
-mana={2}{W}{W}
-type=Enchantment
-[/card]
-[card]
 name=Ivy Seer
 text={2}{G}, {T}: Reveal any number of green cards in your hand. Target creature gets +X/+X until end of turn, where X is the number of cards revealed this way.
 mana={3}{G}
@@ -19018,18 +19006,6 @@ mana={2}{R}{R}
 type=Enchantment
 [/card]
 [card]
-name=Leyline of Sanctity
-text=If Leyline of Sanctity is in your opening hand, you may begin the game with it on the battlefield. -- You can't be the target of spells or abilities your opponents control.
-mana={2}{W}{W}
-type=Enchantment
-[/card]
-[card]
-name=Leyline of Singularity
-text=If Leyline of Singularity is in your opening hand, you may begin the game with it on the battlefield. -- All nonland permanents are legendary.
-mana={2}{U}{U}
-type=Enchantment
-[/card]
-[card]
 name=Leyline of the Meek
 text=If Leyline of the Meek is in your opening hand, you may begin the game with it on the battlefield. -- Creature tokens get +1/+1.
 mana={2}{W}{W}
@@ -19042,12 +19018,6 @@ mana={2}{G}{G}
 type=Enchantment
 [/card]
 [card]
-name=Leyline of the Void
-text=If Leyline of the Void is in your opening hand, you may begin the game with it on the battlefield. -- If a card would be put into an opponent's graveyard from anywhere, exile it instead.
-mana={2}{B}{B}
-type=Enchantment
-[/card]
-[card]
 name=Liar's Pendulum
 text={2}, {T}: Name a card. Target opponent guesses whether a card with that name is in your hand. You may reveal your hand. If you do and your opponent guessed wrong, draw a card.
 mana={1}
@@ -20526,12 +20496,6 @@ mana={2}{W}
 type=Enchantment
 [/card]
 [card]
-name=Martyr's Cry
-text=Exile all white creatures. For each creature exiled this way, its controller draws a card.
-mana={W}{W}
-type=Sorcery
-[/card]
-[card]
 name=Martyrdom
 text=Until end of turn, target creature you control gains "{0}: The next 1 damage that would be dealt to target creature or player this turn is dealt to this creature instead." Only you may activate this ability.
 mana={1}{W}{W}
@@ -22243,12 +22207,6 @@ power=2
 toughness=2
 [/card]
 [card]
-name=Multani's Decree
-text=Destroy all enchantments. You gain 2 life for each enchantment destroyed this way.
-mana={3}{G}
-type=Sorcery
-[/card]
-[card]
 name=Multani's Harmony
 text=Enchant creature -- Enchanted creature has "{T}: Add one mana of any color to your mana pool."
 mana={G}
@@ -27077,15 +27035,6 @@ mana={2}{R}
 type=Enchantment
 [/card]
 [card]
-name=Rain of Daggers
-auto=foreach(creature|opponentinplay) life:-2 controller
-auto=destroy all(creature|opponentinplay)
-####Does not work as it should (0.10.1)
-text=Destroy all creatures target opponent controls. You lose 2 life for each creature destroyed this way.
-mana={4}{B}{B}
-type=Sorcery
-[/card]
-[card]
 name=Rain of Gore
 text=If a spell or ability would cause its controller to gain life, that player loses that much life instead.
 mana={B}{R}
@@ -28370,15 +28319,6 @@ mana={1}{W}
 type=Enchantment
 [/card]
 [card]
-name=Righteous Fury
-auto=foreach(creature[tapped]) life:2 controller
-auto=destroy all(creature[tapped])
-####Does not work as it should (0.10.1)
-text=Destroy all tapped creatures. You gain 2 life for each creature destroyed this way.
-mana={4}{W}{W}
-type=Sorcery
-[/card]
-[card]
 name=Righteous Indignation
 text=Whenever a creature blocks a black or red creature, the blocking creature gets +1/+1 until end of turn.
 mana={2}{W}
@@ -33209,16 +33149,6 @@ mana={2}{W}
 type=Enchantment
 [/card]
 [card]
-name=Spirit of the Hearth
-abilities=flying
-text=Flying -- You can't be the target of spells or abilities your opponents control.
-mana={4}{W}{W}
-type=Creature
-subtype=Cat Spirit
-power=4
-toughness=5
-[/card]
-[card]
 name=Spiritmonger
 text=Whenever Spiritmonger deals damage to a creature, put a +1/+1 counter on Spiritmonger. -- {B}: Regenerate Spiritmonger. -- {G}: Spiritmonger becomes the color of your choice until end of turn.
 mana={3}{B}{G}
@@ -36728,15 +36658,6 @@ mana={2}{W}
 type=Instant
 [/card]
 [card]
-name=True Believer
-text=You have shroud. (You can't be the target of spells or abilities.)
-mana={W}{W}
-type=Creature
-subtype=Human Cleric
-power=2
-toughness=2
-[/card]
-[card]
 name=Trumpeting Armodon
 text={1}{G}: Target creature blocks Trumpeting Armodon this turn if able.
 mana={3}{G}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index ba48e5695..6efcd7a76 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -17559,7 +17559,7 @@ toughness=6
 [/card]
 [card]
 name=Fracturing Gust
-auto=foreach(artifact,enchantment) life:2
+auto=@movedto(artifact,enchantment|graveyard):life:2
 auto=destroy all(artifact,enchantment)
 text=Destroy all artifacts and enchantments. You gain 2 life for each permanent destroyed this way.
 mana={2}{GW}{GW}{GW}
@@ -22279,7 +22279,7 @@ type=Enchantment
 [/card]
 [card]
 name=Honor the Fallen
-auto=foreach(creature|graveyard) life:1
+auto=@movedto(creature|exile) from(graveyard):life:1
 auto=moveTo(exile) all(creature|graveyard)
 text=Exile all creature cards from all graveyards. You gain 1 life for each card exiled this way.
 mana={1}{W}
@@ -23230,6 +23230,13 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Imperial Mask
+text=When Imperial Mask enters the battlefield, if it's not a token, each of your teammates puts a token that's a copy of Imperial Mask onto the battlefield. -- You can't be the target of spells or abilities your opponents control.
+mana={4}{W}
+type=Enchantment
+subtype=controllershroud
+[/card]
+[card]
 name=Imperial Recruiter
 auto=may moveTo(myhand) target(creature[power<=2]|mylibrary)
 text=When Imperial Recruiter enters the battlefield, search your library for a creature card with power 2 or less, reveal it, and put it into your hand. Then shuffle your library.
@@ -23984,6 +23991,13 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Ivory Mask
+text=You have shroud. (You can't be the target of spells or abilities.)
+mana={2}{W}{W}
+type=Enchantment
+subtype=playershroud
+[/card]
+[card]
 name=Ivory Tower
 auto=@each my upkeep:foreach(*|myhand)life:1 controller >4
 text=At the beginning of your upkeep, you gain X life, where X is the number of cards in your hand minus four.
@@ -27388,6 +27402,37 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Leyline of Vitality
+##auto=lord(creature|mybattlefield) 0/1 
+##auto=@movedTo(creature|mybattlefield):life:1
+text=If Leyline of Sanctity is in your opening hand, you may begin the game with it on the battlefield. -- Creatures you control get +0/+1. -- Whenever a creature enters the battlefield under your control, you gain 1 life.
+mana={2}{G}{G}
+type=Enchantment
+subtype=Leyline
+[/card]
+[card]
+name=Leyline of Sanctity
+text=If Leyline of Sanctity is in your opening hand, you may begin the game with it on the battlefield. -- You can't be the target of spells or abilities your opponents control.
+mana={2}{W}{W}
+type=Enchantment
+subtype=Leyline controllershroud
+[/card]
+[card]
+name=Leyline of Singularity
+auto=lord(*[-land]) transforms(Legendary)
+text=If Leyline of Singularity is in your opening hand, you may begin the game with it on the battlefield. -- All nonland permanents are legendary.
+mana={2}{U}{U}
+type=Enchantment
+subtype=Leyline
+[/card]
+[card]
+name=Leyline of the Void
+auto=@movedTo(*|graveyard):all(trigger) moveTo(exile)
+text=If Leyline of the Void is in your opening hand, you may begin the game with it on the battlefield. -- If a card would be put into an opponent's graveyard from anywhere, exile it instead.
+mana={2}{B}{B}
+type=Enchantment
+[/card]
+[card]
 name=Lhurgoyf
 auto=foreach(creature|graveyard) 1/1
 text=Lhurgoyf's power is equal to the number of creature cards in all graveyards and its toughness is equal to that number plus 1.
@@ -29399,6 +29444,15 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Martyr's Cry
+auto=@movedto(creature[white]|exile) from(mybattlefield):draw:1 controller
+auto=@movedto(creature[white]|exile) from(opponentbattlefield):draw:1 opponent
+auto=moveTo(exile) all(creature[white])
+text=Exile all white creatures. For each creature exiled this way, its controller draws a card.
+mana={W}{W}
+type=Sorcery
+[/card]
+[card]
 name=Mask of Law and Grace
 target=creature
 auto=protection from black
@@ -31447,6 +31501,14 @@ power=2
 toughness=1
 [/card]
 [card]
+name=Multani's Decree
+auto=@movedTo(enchantment|graveyard):life:2
+auto=destroy all(enchantment)
+text=Destroy all enchantments. You gain 2 life for each enchantment destroyed this way.
+mana={3}{G}
+type=Sorcery
+[/card]
+[card]
 name=Mungha Wurm
 auto=@each my untap:untap notatarget(land|myBattlefield)
 auto=lord(land|myBattlefield) doesnotuntap
@@ -36995,6 +37057,14 @@ mana={W}
 type=Instant
 [/card]
 [card]
+name=Rain of Daggers
+auto=@movedTo(creature|graveyard) from(opponentBattlefield):life:-2 controller
+auto=destroy all(creature|opponentbattlefield)
+text=Destroy all creatures target opponent controls. You lose 2 life for each creature destroyed this way.
+mana={4}{B}{B}
+type=Sorcery
+[/card]
+[card]
 name=Rain of Embers
 auto=damage:1 all(creature,player)
 text=Rain of Embers deals 1 damage to each creature and each player.
@@ -38576,6 +38646,14 @@ mana={1}{W}{W}
 type=Sorcery
 [/card]
 [card]
+name=Righteous Fury
+auto=@movedTo(creature[tapped]|graveyard):life:2 controller
+auto=destroy all(creature[tapped])
+text=Destroy all tapped creatures. You gain 2 life for each creature destroyed this way.
+mana={4}{W}{W}
+type=Sorcery
+[/card]
+[card]
 name=Righteous War
 auto=lord(creature[white]|myBattlefield) protection from black
 auto=lord(creature[black]|myBattlefield) protection from white
@@ -45192,6 +45270,16 @@ power=2
 toughness=1
 [/card]
 [card]
+name=Spirit of the Hearth
+abilities=flying
+text=Flying -- You can't be the target of spells or abilities your opponents control.
+mana={4}{W}{W}
+type=Creature
+subtype=Cat Spirit controllershroud
+power=4
+toughness=5
+[/card]
+[card]
 name=Spirit of the Night
 abilities=flying,trample,haste,protection from black
 auto=lord(spirit of the night[attacking]|myBattlefield) first strike
@@ -50809,6 +50897,15 @@ power=3
 toughness=4
 [/card]
 [card]
+name=True Believer
+text=You have shroud. (You can't be the target of spells or abilities.)
+mana={W}{W}
+type=Creature
+subtype=Human Cleric playershroud
+power=2
+toughness=2
+[/card]
+[card]
 name=Trumpet Blast
 auto=lord(creature[attacking]) 2/0
 text=Attacking creatures get +2/+0 until end of turn.