diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 3e5cd60d6..a7c325d88 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -11080,7 +11080,7 @@ type=Sorcery
 [card]
 name=Cleansing Beam
 target=creature
-auto=all(*[share!color!]) damage:2
+auto=all(creature[share!color!]) damage:2
 text=Radiance - Cleansing Beam deals 2 damage to target creature and each other creature that shares a color with it.
 mana={4}{R}
 type=Instant
@@ -18186,7 +18186,7 @@ type=Instant
 name=Echoing Ruin
 target=artifact
 auto=destroy
-auto=all(other creature[share!name!]) destroy
+auto=all(other artifact[share!name!]) destroy
 text=Destroy target artifact and all other artifacts with the same name as that artifact.
 mana={1}{R}
 type=Sorcery
@@ -19547,8 +19547,7 @@ target=creature[-black]
 auto=moveTo(exile)
 auto=all(*[share!name!]|targetcontrollerhand) moveto(exile)
 auto=all(*[share!name!]|targetcontrollerlibrary) moveto(exile)
-auto=all(*[share!name!]|targetcontrollergraveyard)moveto(exile)
-auto=all(*[share!name!]|targetcontrollerbattlefield) moveto(exile)
+auto=all(*[share!name!]|targetcontrollergraveyard) moveto(exile)
 text=Exile target nonblack creature. Search its controller's graveyard, hand, and library for all cards with the same name as that creature and exile them. That player then shuffles his or her library.
 mana={2}{B}{B}
 type=Sorcery
@@ -20296,8 +20295,7 @@ target=*[-basic]|graveyard
 auto=moveTo(exile)
 auto=all(*[share!name!]|targetcontrollerhand) moveto(exile)
 auto=all(*[share!name!]|targetcontrollerlibrary) moveto(exile)
-auto=all(*[share!name!]|targetcontrollergraveyard)moveto(exile)
-auto=all(*[share!name!]|targetcontrollerbattlefield) moveto(exile)
+auto=all(*[share!name!]|targetcontrollergraveyard) moveto(exile)
 text=Split second (As long as this spell is on the stack, players can't cast spells or activate abilities that aren't mana abilities.) -- Choose target card in a graveyard other than a basic land. Search its owner's graveyard, hand, and library for all cards with the same name as that card and exile them. Then that player shuffles his or her library.
 abilities=split second
 mana={B}
@@ -30850,7 +30848,7 @@ type=Instant
 [card]
 name=Incite Hysteria
 target=creature
-auto=all(other *[share!color!]) cantblock
+auto=all(creature[share!color!]) cantblock
 text=Radiance - Until end of turn, target creature and each other creature that shares a color with it gain "This creature can't block."
 mana={2}{R}
 type=Sorcery
@@ -35839,7 +35837,7 @@ toughness=1
 [card]
 name=Leave No Trace
 target=enchantment
-auto=all(*[share!color!]) destroy
+auto=all(enchantment[share!color!]) destroy
 text=Radiance - Destroy target enchantment and each other enchantment that shares a color with it.
 mana={1}{W}
 type=Instant
@@ -36912,7 +36910,7 @@ target=*[-basic]|opponenthand
 auto=moveTo(exile)
 auto=all(*[share!name!]|targetcontrollerhand) moveto(exile)
 auto=all(*[share!name!]|targetcontrollerlibrary) moveto(exile)
-auto=all(*[share!name!]|targetcontrollergraveyard)moveto(exile)
+auto=all(*[share!name!]|targetcontrollergraveyard) moveto(exile)
 text=Target player reveals his or her hand, then you choose a card other than a basic land card from it. Search that player's graveyard, hand, and library for all cards with the same name as the chosen card and exile them. Then that player shuffles his or her library.
 mana={2}{U}{B}
 type=Sorcery
@@ -42689,7 +42687,7 @@ mana={1}{U}{U}
 type=Creature
 subtype=Human Rogue
 power=2
-toughness=2
+toughness=1
 [/card]
 [card]
 name=Neurok Hoversail
@@ -49392,8 +49390,8 @@ type=Instant
 [card]
 name=Rally the Righteous
 target=creature
-auto=all(*[share!color!]) untap
-auto=all(*[share!color!]) 2/0
+auto=all(creature[share!color!]) untap
+auto=all(creature[share!color!]) 2/0
 text=Radiance - Untap target creature and each other creature that shares a color with it. Those creatures get +2/+0 until end of turn.
 mana={1}{R}{W}
 type=Instant
@@ -51009,7 +51007,7 @@ toughness=2
 [card]
 name=Retraced Image
 target=*|myhand
-auto=aslongas(*[share!name!]|mybattlefield) moveTo(mybattlefield)
+auto=aslongas(*[share!name!]|battlefield) moveTo(mybattlefield)
 text=Reveal a card in your hand, then put that card onto the battlefield if it has the same name as a permanent.
 mana={U}
 type=Sorcery
@@ -54137,8 +54135,7 @@ target=enchantment
 auto=moveTo(exile)
 auto=all(*[share!name!]|targetcontrollerhand) moveto(exile)
 auto=all(*[share!name!]|targetcontrollerlibrary) moveto(exile)
-auto=all(*[share!name!]|targetcontrollergraveyard)moveto(exile)
-auto=all(*[share!name!]|targetcontrollerbattlefield) moveto(exile)
+auto=all(*[share!name!]|targetcontrollergraveyard) moveto(exile)
 text=Exile target enchantment. Search its controller's graveyard, hand, and library for all cards with the same name as that enchantment and exile them. That player then shuffles his or her library.
 mana={2}{W}{W}
 type=Instant
@@ -59632,8 +59629,7 @@ target=land[-basic]
 auto=moveTo(exile)
 auto=all(*[share!name!]|targetcontrollerhand) moveto(exile)
 auto=all(*[share!name!]|targetcontrollerlibrary) moveto(exile)
-auto=all(*[share!name!]|targetcontrollergraveyard)moveto(exile)
-auto=all(*[share!name!]|targetcontrollerbattlefield) moveto(exile)
+auto=all(*[share!name!]|targetcontrollergraveyard) moveto(exile)
 text=Exile target nonbasic land. Search its controller's graveyard, hand, and library for all cards with the same name as that land and exile them. That player then shuffles his or her library.
 mana={2}{R}{R}
 type=Sorcery
@@ -60587,8 +60583,7 @@ target=artifact
 auto=moveTo(exile)
 auto=all(*[share!name!]|targetcontrollerhand) moveto(exile)
 auto=all(*[share!name!]|targetcontrollerlibrary) moveto(exile)
-auto=all(*[share!name!]|targetcontrollergraveyard)moveto(exile)
-auto=all(*[share!name!]|targetcontrollerbattlefield) moveto(exile)
+auto=all(*[share!name!]|targetcontrollergraveyard) moveto(exile)
 text=Exile target artifact. Search its controller's graveyard, hand, and library for all cards with the same name as that artifact and exile them. That player then shuffles his or her library.
 mana={2}{G}{G}
 type=Sorcery
@@ -62898,7 +62893,7 @@ subtype=Kithkin
 [card]
 name=Surge of Zeal
 target=creature
-auto=all(other *[share!color!]) haste
+auto=all(creature[share!color!]) haste
 text=Radiance - Target creature and each other creature that shares a color with it gain haste until end of turn.
 mana={R}
 type=Instant
@@ -71133,7 +71128,7 @@ type=Sorcery
 name=Wake of Destruction
 target=land
 auto=destroy
-auto=all(*[share!name!]) destroy
+auto=all(other land[share!name!]) destroy
 text=Destroy target land and all other lands with the same name as that land.
 mana={3}{R}{R}{R}
 type=Sorcery
@@ -73599,7 +73594,7 @@ toughness=5
 [card]
 name=Wojek Siren
 target=creature
-auto=all(other *[share!color!]) 1/1
+auto=all(creature[share!color!]) 1/1
 text=Radiance - Target creature and each other creature that shares a color with it get +1/+1 until end of turn.
 mana={W}
 type=Instant