diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 3ae9aa1a3..8d53fe999 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -1,7 +1,7 @@
 grade=borderline
 #Bordeline Primitives Pack for Wagic the Homebrew.
 #Please keep these card alphabetized, and try to have the "name=" line at the top of each card
-#I sorted this programmatically - Thanks to Vitty85 17-07-2023
+#I sorted this programmatically - Thanks to Vitty85 18-07-2023
 [card]
 name=+2 Mace
 auto={3}:equip
@@ -28617,10 +28617,8 @@ toughness=2
 [card]
 name=Emberwilde Djinn
 abilities=flying
-auto=@each opponent upkeep restriction{type(Emberwilde Djinn|opponentbattlefield)~morethan~0}:ability$!name(Pay RR) pay[[{R}{R}]] name(Gain Control) notatarget(Emberwilde Djinn|opponentbattlefield) moveto(mybattlefield)!$ opponent
-auto=@each opponent upkeep restriction{type(Emberwilde Djinn|opponentbattlefield)~morethan~0}:ability$!name(Pay 2 life) pay[[{L:2}]] name(Gain Control) notatarget(Emberwilde Djinn|opponentbattlefield) moveto(mybattlefield)!$ opponent
-auto=@each my upkeep restriction{type(Emberwilde Djinn|opponentbattlefield)~morethan~0}:ability$!name(Pay RR) pay[[{R}{R}]] name(Gain Control) notatarget(Emberwilde Djinn|opponentbattlefield) moveto(mybattlefield)!$ controller
-auto=@each my upkeep restriction{type(Emberwilde Djinn|opponentbattlefield)~morethan~0}:ability$!name(Pay 2 Life) pay[[{L:2}]] name(Gain Control) notatarget(Emberwilde Djinn|opponentbattlefield) moveto(mybattlefield)!$ controller
+auto=@each my upkeep:name(Choose one) ability$!name(Choose one) choice name(Don't pay anything) donothing _ choice name(Pay 2 life and gain control) notatarget(Emberwilde Djinn|battlefield) moveto(mybattlefield) and!( life:-2 controller )! _ choice name(Pay RR and gain control) pay[[{R}{R}]] name(Pay RR and gain control) notatarget(Emberwilde Djinn|battlefield) moveto(mybattlefield)!$ controller
+auto=@each opponent upkeep:name(Choose one) ability$!name(Choose one) choice name(Pay RR and gain control) pay[[{R}{R}]] name(Pay RR and gain control) notatarget(Emberwilde Djinn|battlefield) moveto(mybattlefield) _ choice name(Pay 2 life and gain control) notatarget(Emberwilde Djinn|battlefield) moveto(mybattlefield) and!( life:-2 controller )! _ choice name(Don't pay anything) donothing!$ opponent
 text=Flying -- At the beginning of each player's upkeep, that player may pay {R}{R} or 2 life. If he or she does, the player gains control of Emberwilde Djinn.
 mana={2}{R}{R}
 type=Creature
@@ -29317,9 +29315,29 @@ toughness=4
 [card]
 name=Entrancing Lyre
 abilities=shackler
-auto={X}{T}:shackle target(creature[power<=X])
 auto=@each my untap restriction{canuntap}:may untap
-text=You may choose not to untap Entrancing Lyre during your untap step. -- Variable Colorless , {T}: Tap target creature with power X or less. It doesn't untap during its controller's untap step for as long as Entrancing Lyre remains tapped.
+auto={T}:name(X=0) target(creature[power=0]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={1}{T}:name(X=1) target(creature[power<=1]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={2}{T}:name(X=2) target(creature[power<=2]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={3}{T}:name(X=3) target(creature[power<=3]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={4}{T}:name(X=4) target(creature[power<=4]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={5}{T}:name(X=5) target(creature[power<=5]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={6}{T}:name(X=6) target(creature[power<=6]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={7}{T}:name(X=7) target(creature[power<=7]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={8}{T}:name(X=8) target(creature[power<=8]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={9}{T}:name(X=9) target(creature[power<=9]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={10}{T}:name(X=10) target(creature[power<=10]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={11}{T}:name(X=11) target(creature[power<=11]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={12}{T}:name(X=12) target(creature[power<=12]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={13}{T}:name(X=13) target(creature[power<=13]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={14}{T}:name(X=14) target(creature[power<=14]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={15}{T}:name(X=15) target(creature[power<=15]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={16}{T}:name(X=16) target(creature[power<=16]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={17}{T}:name(X=17) target(creature[power<=17]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={18}{T}:name(X=18) target(creature[power<=18]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={19}{T}:name(X=19) target(creature[power<=19]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+auto={20}{T}:name(X=20) target(creature[power<=20]|battlefield) grant transforms((,newability[tap],newability[doesnotuntap])) grantend
+text=You may choose not to untap Entrancing Lyre during your untap step. -- {X}, {T}: Tap target creature with power X or less. It doesn't untap during its controller's untap step for as long as Entrancing Lyre remains tapped.
 mana={3}
 type=Artifact
 [/card]
@@ -29333,7 +29351,8 @@ type=Sorcery
 [/card]
 [card]
 name=Entrapment Maneuver
-auto=target(player) ability$!name(sacrifice attacker) notatarget(creature[attacking]|mybattlefield) sacrifice!$ targetedplayer then _SOLDIERTOKEN_*storedtoughness
+auto=choice name(Target opponent) ability$!name(Sacrifice attacker) name(Sacrifice attacker) notatarget(creature[attacking]|mybattlefield) sacrifice and!( transforms((,newability[_SOLDIERTOKEN_*toughness opponent])) oneshot )!!$ opponent 
+auto=choice name(Target yourself) ability$!name(Sacrifice attacker) name(Sacrifice attacker) notatarget(creature[attacking]|mybattlefield) sacrifice and!( transforms((,newability[_SOLDIERTOKEN_*toughness])) oneshot )!!$ controller 
 text=Target player sacrifices an attacking creature. You create X 1/1 white Soldier creature tokens, where X is that creature's toughness.
 mana={3}{W}
 type=Instant
@@ -30120,7 +30139,8 @@ toughness=4
 [card]
 name=Etrata, the Silencer
 abilities=unblockable
-auto=@damagefoeof(player) from(this): transforms((,newability[moveTo(opponentExile) target(creature|opponentBattlefield) with counter{0/0.1.Hit}],newability[if restriction{type(creature[counter{0/0.1.Hit}]|opponentExile)~morethan~2} wingame controller])) && moveTo(ownerlibrary) all(this) && shuffle
+auto=@combatdamagefoeof(player) from(this) restriction{type(creature|opponentBattlefield)~morethan~0}:name(Exile opponent creature) moveto(mylibrary) and!( transforms((,newability[shuffle],newability[name(Exile opponent creature) target(creature|opponentBattlefield) moveTo(opponentexile) and!( transforms((,newability[counter(0/0.1.Hit)],newability[if type(creature[counter{0/0.1.Hit}]|myexile)~morethan~2 then wingame opponent])) )!])) oneshot )!
+auto=@combatdamageof(player) from(this) restriction{type(creature|myBattlefield)~morethan~0}:name(Exile your creature) moveto(mylibrary) and!( transforms((,newability[shuffle],newability[name(Exile your creature) target(creature|myBattlefield) moveTo(myexile) and!( transforms((,newability[counter(0/0.1.Hit)],newability[if type(creature[counter{0/0.1.Hit}]|myexile)~morethan~2 then wingame opponent])) )!])) oneshot )!
 text=Etrata, the Silencer can't be blocked. -- Whenever Etrata deals combat damage to a player, exile target creature that player controls and put a hit counter on that card. That player loses the game if they own three or more exiled cards with hit counters on them. Etrata's owner shuffles Etrata into their library.
 mana={2}{U}{B}
 type=Legendary Creature
@@ -31247,8 +31267,8 @@ type=Instant
 [/card]
 [card]
 name=Extract Brain
-aicode=activate target(*[zpos<=fullpaid]|opponenthand) activate castcard(normal)
-auto=name(Look opponent hand) reveal:x revealzone(opponenthand) optionone name(Cast card) target(<upto:1>*|reveal) activate castcard(normal) optiononeend optiontwo name(Put back) all(*|reveal) moveto(ownerhand) optiontwoend revealend
+aicode=activate transforms((,newability[target(*[-land&zpos<=fullpaid]|opponenthand) activate castcard(normal)])) oneshot
+auto=name(Look opponent hand) reveal:x revealzone(opponenthand) optionone name(Cast card) target(<upto:1>*[-land]|reveal) activate castcard(normal) optiononeend optiontwo name(Put back) target(*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )! optiontwoend revealend
 text=Target opponent chooses X cards from their hand. Look at those cards. You may cast a spell from among them without paying its mana cost.
 mana={X}{U}{B}
 type=Sorcery
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index e47de3b11..8fbd83981 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1,6 +1,6 @@
 #Primitives Pack for Wagic the Homebrew.
 #Please keep these card alphabetized, and try to have the "name=" line at the top of each card
-#I sorted this programmatically so the other comments are removed except for AUTO_DEFINE - Vitty85 17-07-2023
+#I sorted this programmatically so the other comments are removed except for AUTO_DEFINE - Vitty85 18-07-2023
 [card]
 name=Abandon Reason
 target=<upto:2>creature
@@ -33641,7 +33641,8 @@ type=Enchantment
 [card]
 name=Earthbind
 target=creature
-alias=1288
+auto=teach(creature) -flying
+auto=if cantargetcard(*[flying]|*) then damage:2
 text=Enchant creature -- When Earthbind enters the battlefield, if enchanted creature has flying, Earthbind deals 2 damage to that creature and Earthbind gains "Enchanted creature loses flying."
 mana={R}
 type=Enchantment
@@ -37401,9 +37402,9 @@ toughness=2
 [/card]
 [card]
 name=Etherwrought Page
-aicode=activate name(look) donothing
-auto=@each my upkeep:ability$!name(Reveal) reveal:1 optionone name(Choose to put in Graveyard) target(*|reveal) moveto(mygraveyard) optiononeend optiontwo target(<1>*|reveal) moveto(mylibrary) optiontwoend revealend _ choice name(opponent life loss) life:-1 opponent _ choice name(Gain Life) life:2 controller!$ controller
-text=At the beginning of your upkeep, choose one - You gain 2 life; or look at the top card of your library, then you may put that card into your graveyard; or each opponent loses 1 life.
+aicode=activate donothing
+auto=@each my upkeep:name(Choose one) transforms((,newability[choice name(Gain 2 life) life:2 controller],newability[choice name(Reveal top card) reveal:1 optionone name(Put in graveyard) target(<upto:1>*|reveal) moveto(mygraveyard) optiononeend optiontwo target(*|reveal) moveto(mylibrary) optiontwoend revealend],newability[choice name(Opponent loses 1 life) life:-1 opponent])) oneshot
+text=At the beginning of your upkeep, choose one -- You gain 2 life -- Look at the top card of your library, then you may put that card into your graveyard -- Each opponent loses 1 life.
 mana={1}{W}{U}{B}
 type=Artifact
 [/card]
@@ -44317,7 +44318,7 @@ toughness=1
 [card]
 name=Fyndhorn Pollen
 auto=lord(creature) -1/0
-auto={1}{G}:-1/0 all(creature) ueot
+auto={1}{G}:name(Creatures get -1/-0) all(creature) transforms((,newability[-1/0])) ueot
 auto=cumulativeupcost[{1}] sacrifice
 text=Cumulative upkeep {1} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.) -- All creatures get -1/-0. -- {1}{G}: All creatures get -1/-0 until end of turn.
 mana={2}{G}