diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 46c30a85b..f63c31d3d 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -19,7 +19,7 @@ type=Enchantment
 [/card]
 [card]
 name=A-Haywire Mite
-auto=life:3 controller
+auto=_DIES_life:3 controller
 auto={G}{S}:name(Exile enchantment) target(enchantment[-creature]) moveTo(ownerexile)
 auto={G}{S}:name(Exile artifact) target(artifact[-creature]) moveTo(ownerexile)
 text=When Haywire Mite dies, you gain 3 life. -- {G}, Sacrifice Haywire Mite: Exile target noncreature artifact or noncreature enchantment.
@@ -15317,9 +15317,9 @@ toughness=1
 [/card]
 [card]
 name=Carrot Cake
-auto=create(rabbit:creature rabbit:1/1 white)
+auto=create(rabbit:creature rabbit:1/1:white)
 auto=_SCRY1_
-auto=@sacrificed(this):create(rabbit:creature rabbit:1/1 white)
+auto=@sacrificed(this):create(rabbit:creature rabbit:1/1:white)
 auto=@sacrificed(this):_SCRY1_
 auto={2}{T}{S}:life:3
 text=When Carrot Cake enters the battlefield and when you sacrifice it, create a 1/1 white Rabbit creature token and scry 1. {2}, {T}, Sacrifice Carrot Cake: You gain 3 life.
@@ -24018,7 +24018,7 @@ toughness=1
 [card]
 name=Daybreak Chimera
 abilities=flying
-anyzone=foreach(manaW|myBattlefield) changecost(colorless:-1) forcedalive
+anyzone=affinity(*[white]|mybattlefield) reduce({1})
 text=This spell costs {X} less to cast, where X is your devotion to white. (Each {W} in the mana costs of permanents you control counts towards your devotion to white.) -- Flying.
 mana={3}{W}{W}
 type=Creature
@@ -55650,7 +55650,7 @@ toughness=1
 name=Jacked Rabbit
 auto=counter(1/1,X)
 auto=this(X>=5) draw:1
-auto=_ATTACKING_create(rabbit:creature rabbit:1/1 white)*power
+auto=_ATTACKING_create(rabbit:creature rabbit:1/1:white)*power
 text=Ravenous (This creature enters with X +1/+1 counters on it. If X is 5 or more, draw a card when it enters.) -- Whenever Jacked Rabbit attacks, create a number of 1/1 white Rabbit creature tokens equal to Jacked Rabbit's power.
 mana={X}{1}{W}
 type=Creature
@@ -67430,7 +67430,7 @@ type=Sorcery
 [/card]
 [card]
 name=Mind Drill Assailant
-auto=_THRESHOLD_3/0
+auto=aslongas(*|mygraveyard) 3/0 >6
 auto={2}{UB}:_SURVEIL1_
 text=Threshold - As long as seven or more cards are in your graveyard, Mind Drill Assailant gets +3/+0. -- {2}{U/B}: Surveil 1. (Look at the top card of your library. You may put it into your graveyard.)
 mana={2}{UB}{UB}
@@ -67556,7 +67556,7 @@ type=Artifact
 [card]
 name=Mindwhisker
 auto=@each my upkeep:_SURVEIL1_
-auto=_THRESHOLD_lord(creature|opponentBattlefield) -1/-0
+auto=aslongas(*|mygraveyard) lord(creature|opponentBattlefield) -1/-0 >6
 text=At the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put it into your graveyard.) -- Threshold - As long as seven or more cards are in your graveyard, creatures your opponents control get -1/-0.
 mana={2}{U}
 type=Creature
@@ -72477,8 +72477,8 @@ toughness=2
 [card]
 name=Nightwhorl Hermit
 abilities=vigilance
-auto=_THRESHOLD_1/0
-auto=_THRESHOLD_unblockable
+auto=aslongas(*|mygraveyard) 1/0 >6
+auto=aslongas(*|mygraveyard) unblockable >6
 text=Vigilance -- Threshold - As long as seven or more cards are in your graveyard, Nightwhorl Hermit gets +1/+0 and can't be blocked.
 mana={2}{U}
 type=Creature
@@ -85715,9 +85715,9 @@ type=Sorcery
 [/card]
 [card]
 name=Repel Calamity
-auto=choice name(power 4 or greater) destroy target(creature[power>=4]) restriction{type(creature[power>=4]|mybattlefield)~morethan~0}
-auto=choice name(toughness 4 or greater) destroy target(creature[toughness>=4]) restriction{type(creature[power>=4]|mybattlefield)~morethan~0}
-restriction=type(creature)~morethan~0 
+auto=choice name(power 4 or greater) destroy target(creature[power>=4]) restriction{type(creature[power>=4])~morethan~0}
+auto=choice name(toughness 4 or greater) destroy target(creature[toughness>=4]) restriction{type(creature[toughness>=4])~morethan~0}
+restriction=type(creature)~morethan~0
 text=Destroy target creature with power or toughness 4 or greater.
 mana={1}{W}
 type=Instant
@@ -99198,8 +99198,8 @@ toughness=1
 [/card]
 [card]
 name=Sonar Strike
-target=creature[attacking;blocking;tap]
-auto=damage:4
+auto=choice name(target attacking or blocking) target(creature[attacking;blocking) damage:4 restriction{type(creature[attacking;blocking])~morethan~0}
+auto=choice name(target tapped creature) target(creature[tapped]) damage:4 restriction{type(creature[tapped])~morethan~0}
 auto=aslongas(bat|myBattlefield) life:3 controller
 text=Sonar Strike deals 4 damage to target attacking, blocking, or tapped creature. You gain 3 life if you control a Bat.
 mana={1}{W}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 04d2b3f71..b30893f9d 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -71581,7 +71581,7 @@ toughness=3
 [/card]
 [card]
 name=Marshmist Titan
-autohand=affinity(type:manaB) reduce({1})
+anyzone=affinity(*[black]|mybattlefield) reduce({1})
 text=Marshmist Titan costs {X} less to cast, where X is your devotion to black. (Each {B} in the mana costs of permanents you control counts toward your devotion to black.)
 mana={6}{B}
 type=Creature
@@ -137626,15 +137626,6 @@ toughness=2
 [/card]
 #Due to card type association, Dryad Arbor is placed at the end. Any other card that associates two super types in this manner should also be placed at the end of the primitive to avoid changeling thinking that "forest" is a creature type. This applies to reconfigure cards as well, to avoid making changelings equipment.
 [card]
-name=Dryad Arbor
-text=(Dryad Arbor isn't a spell, it's affected by summoning sickness, and it has "{T}: Add {G}.") -- Dryad Arbor is green.
-color=green
-type=Land Creature
-subtype=Forest Dryad
-power=1
-toughness=1
-[/card]
-[card]
 name=Acquisition Octopus
 auto={2}:reconfigure
 auto=this(cantargetcard(*[attached]|*) {2}{unattach}:name(Reconfigure unattach) name(Reconfigure unattach) donothing asSorcery
@@ -137713,6 +137704,15 @@ power=3
 toughness=2
 [/card]
 [card]
+name=Dryad Arbor
+text=(Dryad Arbor isn't a spell, it's affected by summoning sickness, and it has "{T}: Add {G}.") -- Dryad Arbor is green.
+color=green
+type=Land Creature
+subtype=Forest Dryad
+power=1
+toughness=1
+[/card]
+[card]
 name=Komainu Battle Armor
 abilities=menace
 auto={4}:reconfigure