diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 442b5e983..f32a1fbed 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -274,7 +274,7 @@ toughness=1
 [card]
 name=Abundance
 auto=name(Get Land) replacedraw choice name(Land) Reveal:1 revealzone(mylibrary) revealuntil(*[land]|mylibrary) optionone choice name(Get Cards) target(land|reveal)  moveto(myhand) optiononeend optiontwo choice name(put on bottom) all(*|reveal) bottomoflibrary optiontwoend revealend
-auto=name(Get NonLand) replacedraw choice name(NonLand) Reveal:1 revealzone(mylibrary) revealuntil(*[wizard]|mylibrary) optionone choice name(Get Cards) target(*[-land]|reveal)  moveto(myhand) optiononeend optiontwo choice name(put on bottom) all(*|reveal) bottomoflibrary optiontwoend revealend
+auto=name(Get NonLand) replacedraw choice name(NonLand) Reveal:1 revealzone(mylibrary) revealuntil(*[-land]|mylibrary) optionone choice name(Get Cards) target(*[-land]|reveal)  moveto(myhand) optiononeend optiontwo choice name(put on bottom) all(*|reveal) bottomoflibrary optiontwoend revealend
 text=If you would draw a card, you may instead choose land or nonland and reveal cards from the top of your library until you reveal a card of the chosen kind. Put that card into your hand and put all other cards revealed this way on the bottom of your library in any order.
 mana={2}{G}{G}
 type=Enchantment
@@ -12952,8 +12952,8 @@ toughness=1
 [/card]
 [card]
 name=Boggart Harbinger
-aicode=activate name(put on top) notatarget(goblin|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(goblin|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(goblin|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend 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
@@ -34313,8 +34313,8 @@ toughness=1
 [/card]
 [card]
 name=Elvish Harbinger
-aicode=activate name(put on top) notatarget(elf|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(elf|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(elf|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend revealend
 auto={T}:Add{G}
 auto={T}:Add{W}
 auto={T}:Add{U}
@@ -35494,8 +35494,8 @@ toughness=2
 [/card]
 [card]
 name=Enlightened Tutor
-aicode=activate name(put on top) notatarget(*[artifact;enchantment]|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(*[artifact;enchantment]|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(*[artifact;enchantment]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend 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
@@ -37648,8 +37648,8 @@ type=Land
 [card]
 name=Faerie Harbinger
 abilities=flash,flying
-aicode=activate name(put on top) notatarget(faerie|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(faerie|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(faerie|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend 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
@@ -40432,8 +40432,8 @@ toughness=2
 [/card]
 [card]
 name=Flamekin Harbinger
-aicode=activate name(put on top) notatarget(elemental|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(elemental|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(elemental|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend 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
@@ -45239,8 +45239,8 @@ type=Instant
 [/card]
 [card]
 name=Giant Harbinger
-aicode=activate name(put on top) notatarget(giant|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(giant|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(giant|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend 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
@@ -61907,8 +61907,8 @@ toughness=1
 [/card]
 [card]
 name=Kithkin Harbinger
-aicode=activate name(put on top) notatarget(kithkin|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(kithkin|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(kithkin|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend 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
@@ -66552,8 +66552,8 @@ toughness=2
 [/card]
 [card]
 name=Loam Larva
-aicode=activate name(put on top) notatarget(land[basic]|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(land[basic]|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(land[basic]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend 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
@@ -71538,8 +71538,8 @@ toughness=2
 [card]
 name=Merrow Harbinger
 abilities=islandwalk
-aicode=activate name(put on top) notatarget(merfolk|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(merfolk|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(merfolk|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend 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
@@ -76347,8 +76347,8 @@ type=Instant
 [/card]
 [card]
 name=Mystical Tutor
-aicode=activate name(put on top) notatarget(*[instant;sorcery]|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(*[instant;sorcery]|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(*[instant;sorcery]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend 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
@@ -83787,8 +83787,8 @@ type=Enchantment
 [/card]
 [card]
 name=Personal Tutor
-aicode=activate name(put on top) notatarget(sorcery|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(sorcery|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(sorcery|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend 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
@@ -111044,8 +111044,8 @@ toughness=1
 [card]
 name=Sterling Grove
 auto=lord(other enchantment|mybattlefield) shroud
-aicode=activate name(put on top) notatarget(enchantment|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(enchantment|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto={1}{S}:name(search enchantment) Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(enchantment|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend 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
@@ -114590,8 +114590,8 @@ type=Sorcery
 [/card]
 [card]
 name=Sylvan Tutor
-aicode=activate name(put on top) notatarget(creature|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(creature|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(creature|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend 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
@@ -121309,8 +121309,8 @@ type=Artifact Land
 [/card]
 [card]
 name=Treefolk Harbinger
-aicode=activate name(put on top) notatarget(*[treefolk;forest]|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(*[treefolk;forest]|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(*[treefolk;forest]|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend 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
@@ -132971,8 +132971,8 @@ type=Instant
 [/card]
 [card]
 name=Worldly Tutor
-aicode=activate name(put on top) notatarget(creature|mylibrary) moveTo(ownerexile) and!(moveto(ownerlibrary))!
-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
+aicode=activate target(creature|mylibrary) moveto(mylibrary) and!(moveto(mylibrary))!
+auto=Reveal:type:*:mylibrary revealzone(mylibrary) optionone name(choose card) target(creature|reveal) transforms((,newability[all(other *|reveal) moveto(mylibrary) and!(shuffle)!],newability[moveto(mylibrary)])) optiononeend optiontwo bottomoflibrary target(<1>*|reveal) and!( all(*|reveal) bottomoflibrary )! optiontwoend revealend
 text=Search your library for a creature card and reveal that card. Shuffle your library, then put the revealed card back on top of it.
 mana={G}
 type=Instant