diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index bc887c94e..d38989984 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -19492,7 +19492,7 @@ abilities=doublefacedeath,nomovetrigger,nofizzle
 auto=choice name(Draw three cards) draw:3 controller
 auto=choice name(Conjure a Manor Guardian) conjure cards(Manor Guardian) zone(myhand)
 auto=choice name(Return two creatures) moverandom(creature) from(mygraveyard) to(myhand) and!( counter(1/1.1.PerpetualPT) )!
-auto=choice name(Return creature with the highest mana) moverandom(creature[mancost=convertedcost:highest:*:mygraveyard]) from(mygraveyard) to(mybattlefield)
+auto=choice name(Return creature with the highest mana) moverandom(creature[manacost=convertedcost:highest:*:mygraveyard]) from(mygraveyard) to(mybattlefield)
 auto=choice name(Creatures you control get +2/+0.) emblem transforms((,newability[lord(creature|mybattlefield) 2/0])) forever dontremove
 auto=choice name(Spells you cast cost B less to cast.) emblem transforms((,newability[lord(*|mycastingzone) changecost(black:-1)])) forever dontremove
 auto=choice name(Davriel planeswalkers you control have "+2: Draw a card.") emblem transforms((,newability[lord(planeswalker[davriel]|mybattlefield) transforms((,newability[{C(0/0.2.Loyalty)}:limit:1 name(+2: Draw 1 card) draw:1 controller]))])) forever dontremove
@@ -26565,6 +26565,18 @@ power=5
 toughness=5
 [/card]
 [card]
+name=Ephara, Ever-Sheltering
+auto=aslongas(enchantment|mybattlefield) lifelink >3
+auto=aslongas(enchantment|mybattlefield) indestructible >3
+auto=@movedTo(enchantment|myBattlefield):name(Draw a card) draw:1 controller
+text=Ephara, Ever-Sheltering has lifelink and indestructible as long as you control at least three other enchantments. -- Whenever another enchantment enters the battlefield under your control, draw a card.
+type=Legendary Enchantment Creature
+subtype=God
+color=white,blue
+power=4
+toughness=4
+[/card]
+[card]
 name=Ephemerate
 target=creature|mybattlefield
 auto=moveto(exile) and!(moveto(ownerbattlefield))!
@@ -43728,7 +43740,7 @@ backside=Belenon War Anthem
 restriction=compare(isflipped)~equalto~0
 anyzone={0}:doubleside(backside)
 auto=name(Create knight) token(Knight,Creature Knight,2/2,white,blue,vigilance)
-auto=moveto(opponentbattlefield) and!( counter(0/0,3,Defense) )!
+auto=moveto(opponentbattlefield) and!( transforms((,newability[tap(noevent)],newability[doesnotuntap],newability[counter(0/0.3.Defense)])) forever )!
 auto=@counterremoved(0/0,1,Defense) from(this) restriction{compare(hascntdefense)~equalto~0}:name(Exile and transforms) name(Exile and transforms) moveto(ownerexile) and!( flip(backside) forcetype(Enchantment) )! asSorcery
 text=(As a Siege enters, choose an opponent to protect it. You and others can attack it. When it's defeated, exile it, then cast it transformed.) -- When Invasion of Belenon enters the battlefield, create a 2/2 white and blue Knight creature token with vigilance.
 mana={2}{W}
@@ -43736,12 +43748,40 @@ type=Battle
 subtype=Siege
 [/card]
 [card]
+name=Invasion of Dominaria
+backside=Serra Faithkeeper
+restriction=compare(isflipped)~equalto~0
+anyzone={0}:doubleside(backside)
+auto=name(Gain 4 life) life:4 controller
+auto=name(Draw a card) draw:1 controller
+auto=moveto(opponentbattlefield) and!( transforms((,newability[tap(noevent)],newability[doesnotuntap],newability[counter(0/0.5.Defense)])) forever )!
+auto=@counterremoved(0/0,1,Defense) from(this) restriction{compare(hascntdefense)~equalto~0}:name(Exile and transforms) name(Exile and transforms) moveto(ownerexile) and!( flip(backside) forcetype(Creature Angel) )! asSorcery
+text=(As a Siege enters, choose an opponent to protect it. You and others can attack it. When it's defeated, exile it, then cast it transformed.) -- When Invasion of Dominaria enters the battlefield, you gain 4 life and draw a card.
+mana={2}{W}
+type=Battle
+subtype=Siege
+[/card]
+[card]
+name=Invasion of Gobakhan
+backside=Lightshield Array
+restriction=compare(isflipped)~equalto~0
+anyzone={0}:doubleside(backside)
+auto=if type(*[-land]|opponenthand)~morethan~0 then ability$!name(Look opponent's hand) name(Look opponent's hand) target(*[-land]|opponenthand) moveto(myreveal) and!( transforms((,newability[choice name(Exile card) moveto(opponentexile) and!( transforms((,newability[canplayfromexile],newability[changecost(colorless:2) forcedalive])) forever )!],newability[choice name(Don't exile card) moveto(opponenthand)])) forever )! !$ controller
+auto=if type(*[-land]|opponenthand)~equalto~0 then ability$!name(Look opponent's hand) name(Look opponent's hand) target(*|opponenthand) moveto(opponentreveal) and!( moveto(opponenthand) )! !$ controller
+auto=moveto(opponentbattlefield) and!( transforms((,newability[tap(noevent)],newability[doesnotuntap],newability[counter(0/0.3.Defense)])) forever )!
+auto=@counterremoved(0/0,1,Defense) from(this) restriction{compare(hascntdefense)~equalto~0}:name(Exile and transforms) name(Exile and transforms) moveto(ownerexile) and!( flip(backside) forcetype(Enchantment) )! asSorcery
+text=(As a Siege enters, choose an opponent to protect it. You and others can attack it. When it's defeated, exile it, then cast it transformed.) -- When Invasion of Gobakhan enters the battlefield, look at target opponent's hand. You may exile a nonland card from it. For as long as that card remains exiled, its owner may play it. A spell cast this way costs {2} more to cast.
+mana={1}{W}
+type=Battle
+subtype=Siege
+[/card]
+[card]
 name=Invasion of Ravnica
 backside=Guildpact Paragon
 restriction=compare(isflipped)~equalto~0
 anyzone={0}:doubleside(backside)
 auto=name(Exile opponent permanent) target(*[multicolor]|opponentbattlefield) moveto(exile)
-auto=moveto(opponentbattlefield) and!( counter(0/0,4,Defense) )!
+auto=moveto(opponentbattlefield) and!( transforms((,newability[tap(noevent)],newability[doesnotuntap],newability[counter(0/0.4.Defense)])) forever )!
 auto=@counterremoved(0/0,1,Defense) from(this) restriction{compare(hascntdefense)~equalto~0}:name(Exile and transforms) name(Exile and transforms) moveto(ownerexile) and!( flip(backside) forcetype(Artifact Creature Construct) )! asSorcery
 text=(As a Siege enters, choose an opponent to protect it. You and others can attack it. When it's defeated, exile it, then cast it transformed.) -- When Invasion of Ravnica enters the battlefield, exile target nonland permanent an opponent controls that isn't exactly two colors.
 mana={5}
@@ -43749,6 +43789,19 @@ type=Battle
 subtype=Siege
 [/card]
 [card]
+name=Invasion of Theros
+backside=Ephara, Ever-Sheltering
+restriction=compare(isflipped)~equalto~0
+anyzone={0}:doubleside(backside)
+auto=ability$!name(Search library) name(Search library) target(*[aura;god;demigod]|mylibrary) moveto(myhand) and!( shuffle )! !$ controller
+auto=moveto(opponentbattlefield) and!( transforms((,newability[tap(noevent)],newability[doesnotuntap],newability[counter(0/0.4.Defense)])) forever )!
+auto=@counterremoved(0/0,1,Defense) from(this) restriction{compare(hascntdefense)~equalto~0}:name(Exile and transforms) name(Exile and transforms) moveto(ownerexile) and!( flip(backside) forcetype(Legendary Enchantment Creature) )! asSorcery
+text=(As a Siege enters, choose an opponent to protect it. You and others can attack it. When it's defeated, exile it, then cast it transformed.) -- When Invasion of Theros enters the battlefield, search your library for an Aura, God, or Demigod card, reveal it, put it into your hand, then shuffle.
+mana={2}{W}
+type=Battle
+subtype=Siege
+[/card]
+[card]
 name=Invasion of the Giants
 auto=counter(0/0,1,Lore)
 auto=@each my firstmain:counter(0/0,1,Lore)
@@ -47123,6 +47176,22 @@ power=4
 toughness=5
 [/card]
 [card]
+name=Knight-Errant of Eos
+aicode=activate target(*[zpos=1]|mylibrary) transforms((,newability[if type(*[creature&zpos<=6&manacost=0]|mylibrary)~equalto~0 then all(*[zpos<=6]|mylibrary) moveto(myreveal) and!( moveto(mylibrary) and!(shuffle)! )!],newability[if type(*[creature&zpos<=6&mancost=0]|mylibrary)~morethan~0 then target(<upto:2>*[creature&zpos<=6&mancost=0]|mylibrary) moveto(myhand) and!( transforms((,newability[all(*[zpos<=6]|mylibrary) moveto(myreveal) and!( moveto(mylibrary) and!(shuffle)! )!])) oneshot )! ])) oneshot
+other={convoke} name(Convoke)
+auto=if paid(alternative) then if type(creature[tapped;-attacking]|myBattlefield)~equalto~1 then name(Look top 6 cards) name(Look top 6 cards) name(Look top 6 cards) reveal:6 optionone name(Put in hand) target(<upto:2>creature[manacost<=1]|myreveal) moveto(myhand) optiononeend optiontwo name(Put on bottom) target(<6>*|reveal) moveto(mylibrary) and!( shuffle )! optiontwoend revealend
+auto=if paid(alternative) then if type(creature[tapped;-attacking]|myBattlefield)~equalto~2 then name(Look top 6 cards) name(Look top 6 cards) name(Look top 6 cards) reveal:6 optionone name(Put in hand) target(<upto:2>creature[manacost<=2]|myreveal) moveto(myhand) optiononeend optiontwo name(Put on bottom) target(<6>*|reveal) moveto(mylibrary) and!( shuffle )! optiontwoend revealend
+auto=if paid(alternative) then if type(creature[tapped;-attacking]|myBattlefield)~equalto~3 then name(Look top 6 cards) name(Look top 6 cards) name(Look top 6 cards) reveal:6 optionone name(Put in hand) target(<upto:2>creature[manacost<=3]|myreveal) moveto(myhand) optiononeend optiontwo name(Put on bottom) target(<6>*|reveal) moveto(mylibrary) and!( shuffle )! optiontwoend revealend
+auto=if paid(alternative) then if type(creature[tapped;-attacking]|myBattlefield)~morethan~3 then name(Look top 6 cards) name(Look top 6 cards) name(Look top 6 cards) reveal:6 optionone name(Put in hand) target(<upto:2>creature[manacost<=4]|myreveal) moveto(myhand) optiononeend optiontwo name(Put on bottom) target(<6>*|reveal) moveto(mylibrary) and!( shuffle )! optiontwoend revealend
+auto=ifnot paid(alternative) then name(Look top 6 cards) name(Look top 6 cards) reveal:6 optionone name(Put in hand) target(<upto:2>creature[manacost=0]|myreveal) moveto(myhand) optiononeend optiontwo name(Put on bottom) target(<6>*|reveal) moveto(mylibrary) and!( shuffle )! optiontwoend revealend
+text=Convoke -- When Knight-Errant of Eos enters the battlefield, look at the top six cards of your library. You may reveal up to two creature cards with mana value X or less from among them, where X is the number of creatures that convoked Knight-Errant of Eos. Put the revealed cards into your hand, then shuffle.
+mana={4}{W}
+type=Creature
+subtype=Human Knight
+power=4
+toughness=4
+[/card]
+[card]
 name=Knight Bas
 abilities=vigilance
 type=Creature
@@ -49617,6 +49686,14 @@ power=0
 toughness=5
 [/card]
 [card]
+name=Lightshield Array
+auto=@combat(attacking) source(creature|mybattlefield):name(Put 1/1 counter) name(Put 1/1 counter) all(trigger[to]) transforms((,newability[phaseaction[endofturn once sourceinplay] counter(1/1)])) ueot
+auto={S}:name(Sacrifice) name(Sacrifice) all(creature|myBattlefield) transforms((,newability[opponentshroud],newability[indestructible])) ueot
+text=At the beginning of your end step, put a +1/+1 counter on each creature that attacked this turn. -- Sacrifice Lightshield Array: Creatures you control gain hexproof and indestructible until end of turn.
+type=Enchantment
+color=white
+[/card]
+[card]
 name=Lignify
 target=creature
 auto=loseabilities
@@ -58060,6 +58137,17 @@ power=5
 toughness=4
 [/card]
 [card]
+name=Norn's Inquisitor
+auto=name(Incubate 2) token(Incubator^Artifact^0/0) and!( transforms((,newability[_DIES_:all(Brimaz^ Blight of Oreskos|mybattlefield) name(Phyrexian died) counter(0/0.1.BrimazEffect) notrg],newability[counter(1/1.2)],newability[{2}:name(Becomes creature) becomes(Creature^Phyrexian) forever])) forever )!
+auto=@movedto(phyrexian|myBattlefield) from(mybattlefield):name(Put 1/1 counter) all(trigger[to]) counter(1/1)
+text=When Norn's Inquisitor enters the battlefield, incubate 2. (Create an Incubator token with two +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.) -- Whenever a permanent you control transforms into a Phyrexian, put a +1/+1 counter on it.
+mana={1}{W}
+type=Creature
+subtype=Phyrexian Knight
+power=1
+toughness=1
+[/card]
+[card]
 name=Norn's Wellspring
 auto=@movedTo(creature|graveyard) from(mybattlefield):counter(0/0,1,oil)
 auto=@movedTo(creature|graveyard) from(mybattlefield):_SCRY1_
@@ -62084,6 +62172,14 @@ mana={3}
 type=Artifact
 [/card]
 [card]
+name=Phyrexian Awakening
+auto=name(Incubate 4) token(Incubator^Artifact^0/0) and!( transforms((,newability[_DIES_:all(Brimaz^ Blight of Oreskos|mybattlefield) name(Phyrexian died) counter(0/0.1.BrimazEffect) notrg],newability[counter(1/1.4)],newability[{2}:name(Becomes creature) becomes(Creature^Phyrexian) forever])) forever )!
+auto=lord(phyrexian|myBattlefield) transforms((,newability[vigilance]))
+text=When Phyrexian Awakening enters the battlefield, incubate 4. (Create an Incubator token with four +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.) -- Phyrexians you control have vigilance.
+mana={2}{W}
+type=Enchantment
+[/card]
+[card]
 name=Phyrexian Censor
 auto=maxCast(*[-Phyrexian])1
 auto=maxCast(*[-Phyrexian])1 opponent
@@ -63168,7 +63264,7 @@ type=Instant
 [card]
 name=Pollenbright Druid
 auto=choice name(Put 1/1 counter) counter(1/1) target(creature)
-auto=choice name(Proliferate) notatarget(<anyamount>player,permanent) proliferate
+auto=choice _PROLIFERATE_
 text=When Pollenbright Druid enters the battlefield, Choose one -- Put a +1/+1 counter on target creature. -- Proliferate. (Choose any number of permanents and/or players, then give each another counter of each kind already there.)
 mana={1}{G}
 type=Creature
@@ -64387,6 +64483,17 @@ mana={1}{W}
 type=Instant
 [/card]
 [card]
+name=Progenitor Exarch
+auto=auto=name(Incubate 3) token(Incubator^Artifact^0/0)*halfpaid and!( transforms((,newability[_DIES_:all(Brimaz^ Blight of Oreskos|mybattlefield) name(Phyrexian died) counter(0/0.1.BrimazEffect) notrg],newability[counter(1/1.3)],newability[{2}:name(Becomes creature) becomes(Creature^Phyrexian) forever])) forever )!
+auto={T}:name(Transform incubator) target(incubator[token]|myBattlefield) transforms((,newability[name(Becomes creature) becomes(Creature^Phyrexian) forever])) forever
+text=When Progenitor Exarch enters the battlefield, incubate 3 X times. (To incubate 3, create an Incubator token with three +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.) -- {T}: Transform target Incubator token you control.
+mana={X}{X}{W}
+type=Creature
+subtype=Phyrexian Cat Cleric
+power=1
+toughness=2
+[/card]
+[card]
 name=Prohibit
 kicker={2}
 auto=ifnot paid(kicker) then target(*[manacost<=2]|stack) fizzle
@@ -74538,6 +74645,16 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Serra Faithkeeper
+abilities=flying,vigilance
+text=Flying, vigilance
+type=Creature
+subtype=Angel
+color=white
+power=4
+toughness=4
+[/card]
+[card]
 name=Serra Redeemer
 abilities=flying
 auto=@movedTo(other creature[power<=2]|myBattlefield):all(trigger[to]) counter(1/1,2)
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index fb0025449..1297db600 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -104428,7 +104428,7 @@ toughness=1
 [/card]
 [card]
 name=Shock
-target=player,permanent
+target=player,creature,planeswalker
 auto=Damage:2
 text=Shock deals 2 damage to target creature or player.
 mana={R}