diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index 017a69c27..9d8f5a066 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -69,6 +69,16 @@ mana={B}
 type=Sorcery
 [/card]
 [card]
+name=Cemetery Puca
+text=Whenever a creature is put into a graveyard from the battlefield, you may pay {1}. If you do, Cemetery Puca becomes a copy of that creature and gains this ability.
+auto=@movedto(creature|graveyard) from(battlefield):all(trigger[from]) pay[[{1}]] copy
+mana={1}{UB}{UB}
+type=Creature
+subtype=Shapeshifter
+power=1
+toughness=2
+[/card]
+[card]
 name=Cinder Seer
 auto={2}{r}{t}:target(creature,Player) damage:type:*[red]:myhand
 text={2}{R}, {T}: Reveal any number of red cards in your hand. Cinder Seer deals X damage to target creature or player, where X is the number of cards revealed this way.
@@ -89,6 +99,16 @@ mana={1}{B}{G}
 type=Instant
 [/card]
 [card]
+name=Cryptoplasm
+auto=@each my upkeep:may copy target(other creature|battlefield)
+text=At the beginning of your upkeep, you may have Cryptoplasm become a copy of another target creature. If you do, Cryptoplasm gains this ability.
+mana={1}{U}{U}
+type=Creature
+subtype=Shapeshifter
+power=2
+toughness=2
+[/card]
+[card]
 name=Dark Withering
 abilities=madness
 autoexile=restriction{discarded} pay({B}) name(pay B to cast) activate name(pay B to cast) castcard(normal)?name(put in graveyard) moveto(ownergraveyard)
@@ -99,6 +119,16 @@ mana={4}{B}{B}
 type=Instant
 [/card]
 [card]
+name=Dimir Doppelganger
+auto={1}{U}{B}:target(creature|graveyard) moveto(exile) and!(copy)!
+text={1}{U}{B}: Exile target creature card from a graveyard. Dimir Doppelganger becomes a copy of that card and gains this ability.
+mana={1}{U}{B}
+type=Creature
+subtype=Shapeshifter
+power=0
+toughness=2
+[/card]
+[card]
 name=Distortion Strike
 target=creature
 auto=1/0
@@ -462,6 +492,23 @@ type=Sorcery
 text=You gain 2 life. Then if you have more life than an opponent, draw a card. Rebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
 [/card]
 [card]
+name=Thespian's Stage
+auto={T}:Add{1}
+auto={2}{T}:copy target(land|battlefield)
+text={T}: Add {1} to your mana pool. -- {2}, {T}: Thespian's Stage becomes a copy of target land and gains this ability.
+type=Land
+[/card]
+[card]
+name=Unstable Shapeshifter
+auto=@movedto(other creature|battlefield):all(trigger[from]) copy
+text=Whenever another creature enters the battlefield, Unstable Shapeshifter becomes a copy of that creature and gains this ability.
+mana={3}{U}
+type=Creature
+subtype=Shapeshifter
+power=0
+toughness=1
+[/card]
+[card]
 name=Virulent Swipe
 target=creature
 auto=2/0
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index bfe4741ba..2cd71814f 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -15219,16 +15219,6 @@ power=0
 toughness=5
 [/card]
 [card]
-name=Cemetery Puca
-text=Whenever a creature is put into a graveyard from the battlefield, you may pay {1}. If you do, Cemetery Puca becomes a copy of that creature and gains this ability.
-auto=@movedto(creature|graveyard) from(battlefield):all(trigger[from]) pay[[{1}]] copy
-mana={1}{UB}{UB}
-type=Creature
-subtype=Shapeshifter
-power=1
-toughness=2
-[/card]
-[card]
 name=Cemetery Reaper
 auto=lord(other zombie|myBattlefield) 1/1
 auto={2}{B}{T}:moveTo(Exile) target(creature|graveyard) && token(Zombie,Creature Zombie,2/2,black)
@@ -20677,16 +20667,6 @@ power=0
 toughness=0
 [/card]
 [card]
-name=Cryptoplasm
-auto=@each my upkeep:may copy target(other creature|battlefield)
-text=At the beginning of your upkeep, you may have Cryptoplasm become a copy of another target creature. If you do, Cryptoplasm gains this ability.
-mana={1}{U}{U}
-type=Creature
-subtype=Shapeshifter
-power=2
-toughness=2
-[/card]
-[card]
 name=Cryptwailing
 auto={1}{E(creature|mygraveyard)}{E(creature|mygraveyard)}:target(player) ability$!name(discard) target(*|myhand) reject!$ targetedplayer asSorcery
 text={1}, Exile two creature cards from your graveyard: Target player discards a card. Activate this ability only any time you could cast a sorcery.
@@ -24759,16 +24739,6 @@ power=2
 toughness=2
 [/card]
 [card]
-name=Dimir Doppelganger
-auto={1}{U}{B}:target(creature|graveyard) moveto(exile) and!(copy)!
-text={1}{U}{B}: Exile target creature card from a graveyard. Dimir Doppelganger becomes a copy of that card and gains this ability.
-mana={1}{U}{B}
-type=Creature
-subtype=Shapeshifter
-power=0
-toughness=2
-[/card]
-[card]
 name=Dimir Guildgate
 auto=tap
 auto={T}:add{U}
@@ -101395,13 +101365,6 @@ mana={1}{G}{G}
 type=Sorcery
 [/card]
 [card]
-name=Thespian's Stage
-auto={T}:Add{1}
-auto={2}{T}:copy target(land|battlefield)
-text={T}: Add {1} to your mana pool. -- {2}, {T}: Thespian's Stage becomes a copy of target land and gains this ability.
-type=Land
-[/card]
-[card]
 name=Thicket Basilisk
 auto=@combat(blocking,blocked) source(this) from(creature[-wall]):all(trigger[from]) phaseaction[combatends once] destroy
 text=Whenever Thicket Basilisk blocks or becomes blocked by a non-Wall creature, destroy that creature at end of combat.
@@ -106654,16 +106617,6 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-name=Unstable Shapeshifter
-auto=@movedto(other creature|battlefield):all(trigger[from]) copy
-text=Whenever another creature enters the battlefield, Unstable Shapeshifter becomes a copy of that creature and gains this ability.
-mana={3}{U}
-type=Creature
-subtype=Shapeshifter
-power=0
-toughness=1
-[/card]
-[card]
 name=Unstoppable Ash
 abilities=trample
 auto=aslongas(other treefolk|mybattlefield) choice notatarget(other treefolk|mybattlefield) (blink)forsrc oneshot