diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index c71f25097..a41b0f8f2 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1510,7 +1510,7 @@ toughness=1
 [card]
 name=Ainok Guide
 auto=choice name(+1/+1 counter) counter(1/1,1)
-auto=choice name(search for a land) moveTo(ownerlibrary) notatarget(land[basic]|mylibrary)
+auto=choice name(search basic land) Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(land[basic]|mylibrary) optionone name(choose card) target(land[basic]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Ainok Guide enters the battlefield, choose one: -- Put a +1/+1 counter on Ainok Guide. -- Search your library for a basic land card, reveal it, then shuffle your library and put that card on top of it.
 mana={1}{G}
 type=Creature
@@ -12265,7 +12265,7 @@ toughness=1
 [/card]
 [card]
 name=Boggart Harbinger
-auto=moveTo(library) target(goblin|mylibrary) oneshot
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(goblin|mylibrary) optionone name(choose card) target(goblin|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Boggart Harbinger enters the battlefield, you may search your library for a Goblin card, reveal it, then shuffle your library and put that card on top of it.
 mana={2}{B}
 type=Creature
@@ -13931,7 +13931,8 @@ type=Sorcery
 [card]
 name=Bringer of the Black Dawn
 other={W}{U}{B}{R}{G} name(Spend WUBRG to Cast)
-auto=@each my upkeep:may name(search for a card) life:-2 controller && moveTo(library) target(*|mylibrary)
+abilities=trample
+auto=@each my upkeep restriction{compare(lifetotal)~morethan~1}:may name(pay 2 life) life:-2 controller && name(search a card) moveTo(exile) and!(transforms((,newability[moveto(ownerlibrary)])) oneshot)! notatarget(*|mylibrary)
 text=You may pay {W}{U}{B}{R}{G} rather than pay Bringer of the Black Dawn's mana cost. -- Trample -- At the beginning of your upkeep, you may pay 2 life. If you do, search your library for a card, then shuffle your library and put that card on top of it.
 mana={7}{B}{B}
 type=Creature
@@ -13965,6 +13966,7 @@ toughness=5
 [/card]
 [card]
 name=Bringer of the Red Dawn
+abilities=trample
 other={W}{U}{B}{R}{G} name(Spend WUBRG to Cast)
 auto=@each my upkeep:may name(gain control of target creature until end of turn) target(creature|opponentbattlefield) transforms((,newability[moveTo(opponentbattlefield)],newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)],newability[untap],haste)) ueot
 text=You may pay {W}{U}{B}{R}{G} rather than pay Bringer of the Red Dawn's mana cost. -- Trample -- At the beginning of your upkeep, you may untap target creature and gain control of it until end of turn. That creature gains haste until end of turn.
@@ -22391,7 +22393,7 @@ toughness=1
 [/card]
 [card]
 name=Cruel Tutor
-auto=moveTo(ownerlibrary) notatarget(*|mylibrary)
+auto=name(search a card) moveTo(exile) and!(transforms((,newability[moveto(ownerlibrary)])) oneshot)! notatarget(*|mylibrary)
 auto=life:-2 controller
 text=Search your library for a card, then shuffle your library and put that card on top of it. You lose 2 life.
 mana={2}{B}
@@ -32320,7 +32322,7 @@ toughness=1
 [/card]
 [card]
 name=Elvish Harbinger
-auto=moveTo(library) target(elf|mylibrary) oneshot
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(elf|mylibrary) optionone name(choose card) target(elf|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 auto={T}:Add{G}
 auto={T}:Add{W}
 auto={T}:Add{U}
@@ -33419,7 +33421,7 @@ toughness=1
 [/card]
 [card]
 name=Enlightened Tutor
-auto=moveTo(ownerlibrary) notatarget(artifact,enchantment|mylibrary)
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(*[artifact;enchantment]|mylibrary) optionone name(choose card) target(*[artifact;enchantment]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Search your library for an artifact or enchantment card and reveal that card. Shuffle your library, then put the card on top of it.
 mana={W}
 type=Instant
@@ -35441,7 +35443,7 @@ type=Land
 [card]
 name=Faerie Harbinger
 abilities=flash,flying
-auto=moveTo(library) target(faerie|mylibrary) oneshot
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(faerie|mylibrary) optionone name(choose card) target(faerie|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Flash -- Flying -- When Faerie Harbinger enters the battlefield, you may search your library for a Faerie card, reveal it, then shuffle your library and put that card on top of it.
 mana={3}{U}
 type=Creature
@@ -37982,7 +37984,7 @@ toughness=2
 [/card]
 [card]
 name=Flamekin Harbinger
-auto=moveTo(library) target(elemental|mylibrary) oneshot
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(elemental|mylibrary) optionone name(choose card) target(elemental|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Flamekin Harbinger enters the battlefield, you may search your library for an Elemental card, reveal it, then shuffle your library and put that card on top of it.
 mana={R}
 type=Creature
@@ -42486,7 +42488,7 @@ type=Instant
 [/card]
 [card]
 name=Giant Harbinger
-auto=moveTo(library) target(giant|mylibrary) oneshot
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(giant|mylibrary) optionone name(choose card) target(giant|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Giant Harbinger enters the battlefield, you may search your library for a Giant card, reveal it, then shuffle your library and put that card on top of it.
 mana={4}{R}
 type=Creature
@@ -52900,7 +52902,7 @@ toughness=1
 [/card]
 [card]
 name=Imperial Seal
-auto=moveTo(ownerlibrary) notatarget(*|mylibrary)
+auto=name(search a card) moveTo(exile) and!(transforms((,newability[moveto(ownerlibrary)])) oneshot)! notatarget(*|mylibrary)
 auto=life:-2 controller
 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}
@@ -58319,7 +58321,7 @@ toughness=1
 [/card]
 [card]
 name=Kithkin Harbinger
-auto=moveTo(library) target(kithkin|mylibrary) oneshot
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(kithkin|mylibrary) optionone name(choose card) target(kithkin|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Kithkin Harbinger enters the battlefield, you may search your library for a Kithkin card, reveal it, then shuffle your library and put that card on top of it.
 mana={2}{W}
 type=Creature
@@ -62213,7 +62215,7 @@ subtype=Liliana
 name=Liliana Vess
 auto=counter(0/0,5,loyalty)
 auto={C(0/0,1,Loyalty)}:name(+1: discard) target(player) ability$!name(discard) target(*|myhand) reject!$ targetedplayer
-auto={C(0/0,-2,Loyalty)}:name(-2: fetch) target(*|mylibrary) moveTo(library)
+auto={C(0/0,-2,Loyalty)}:name(-2: fetch) moveTo(exile) and!(transforms((,newability[moveto(ownerlibrary)])) oneshot)! notatarget(*|mylibrary)
 auto={C(0/0,-8,Loyalty)}:name(-8: reanimate) moveTo(mybattlefield) all(creature|graveyard)
 text=+1: Target player discards a card. -- -2: Search your library for a card, then shuffle your library and put that card on top of it. -- -8: Put all creature cards in all graveyards onto the battlefield under your control.
 mana={3}{B}{B}
@@ -62813,7 +62815,7 @@ toughness=2
 [/card]
 [card]
 name=Loam Larva
-auto=may moveTo(library) target(land[basic]|mylibrary) oneshot
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(land[basic]|mylibrary) optionone name(choose card) target(land[basic]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Loam Larva enters the battlefield, you may search your library for a basic land card, reveal it, then shuffle your library and put that card on top of it.
 mana={1}{G}
 type=Creature
@@ -67512,7 +67514,7 @@ toughness=2
 [card]
 name=Merrow Harbinger
 abilities=islandwalk
-auto=moveTo(library) target(merfolk|mylibrary) oneshot
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(*[merfolk]|mylibrary) optionone name(choose card) target(*[merfolk]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Islandwalk -- When Merrow Harbinger enters the battlefield, you may search your library for a Merfolk card, reveal it, then shuffle your library and put that card on top of it.
 mana={3}{U}
 type=Creature
@@ -71522,7 +71524,7 @@ type=Sorcery
 [/card]
 [card]
 name=Mwonvuli Beast Tracker
-auto=moveTo(ownerlibrary) target(creature[deathtouch;opponentshroud;reach;trample]|mylibrary)
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(creature[deathtouch;opponentshroud;reach;trample]|mylibrary) optionone name(choose card) target(creature[deathtouch;opponentshroud;reach;trample]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Mwonvuli Beast Tracker enters the battlefield, search your library for a creature card with deathtouch, hexproof, reach, or trample and reveal it. Shuffle your library and put that card on top of it.
 mana={1}{G}{G}
 type=Creature
@@ -72066,7 +72068,7 @@ type=Instant
 [/card]
 [card]
 name=Mystical Tutor
-auto=moveTo(ownerlibrary) notatarget(instant,sorcery|mylibrary)
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(*[instant;sorcery]|mylibrary) optionone name(choose card) target(*[instant;sorcery]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Search your library for an instant or sorcery card and reveal that card. Shuffle your library, then put the card on top of it.
 mana={U}
 type=Instant
@@ -78989,7 +78991,7 @@ type=Enchantment
 [/card]
 [card]
 name=Personal Tutor
-auto=moveTo(library) notatarget(sorcery|mylibrary)
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(sorcery|mylibrary) optionone name(choose card) target(sorcery|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Search your library for a sorcery card and reveal that card. Shuffle your library, then put the card on top of it.
 mana={U}
 type=Sorcery
@@ -105106,7 +105108,7 @@ toughness=1
 [card]
 name=Sterling Grove
 auto=lord(other enchantment|mybattlefield) shroud
-auto={1}{S}:moveTo(library) target(enchantment|mylibrary)
+auto={1}{S}:name(search enchantment) Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(enchantment|mylibrary) optionone name(choose card) target(enchantment|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Other enchantments you control have shroud. (They can't be the targets of spells or abilities.) -- {1}, Sacrifice Sterling Grove: Search your library for an enchantment card and reveal that card. Shuffle your library, then put the card on top of it.
 mana={G}{W}
 type=Enchantment
@@ -108497,7 +108499,7 @@ type=Sorcery
 [/card]
 [card]
 name=Sylvan Tutor
-auto=moveTo(ownerlibrary) notatarget(creature|mylibrary)
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(creature|mylibrary) optionone name(choose card) target(creature|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=Search your library for a creature card and reveal that card. Shuffle your library, then put the card on top of it.
 mana={G}
 type=Sorcery
@@ -114764,7 +114766,7 @@ type=Artifact Land
 [/card]
 [card]
 name=Treefolk Harbinger
-auto=moveTo(library) target(treefolk|mylibrary) oneshot
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) revealtype(*[treefolk;forest]|mylibrary) optionone name(choose card) target(*[treefolk;forest]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend revealend
 text=When Treefolk Harbinger enters the battlefield, you may search your library for a Treefolk or Forest card, reveal it, then shuffle your library and put that card on top of it.
 mana={G}
 type=Creature
@@ -118097,7 +118099,7 @@ type=Sorcery
 [/card]
 [card]
 name=Vampiric Tutor
-auto=moveTo(ownerlibrary) notatarget(*|mylibrary)
+auto=name(search a card) moveTo(exile) and!(transforms((,newability[moveto(ownerlibrary)])) oneshot)! notatarget(*|mylibrary)
 auto=life:-2 controller
 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}