diff --git a/projects/mtg/bin/Res/sets/primitives/borderline.txt b/projects/mtg/bin/Res/sets/primitives/borderline.txt
index d12d8e2d7..418023b4e 100644
--- a/projects/mtg/bin/Res/sets/primitives/borderline.txt
+++ b/projects/mtg/bin/Res/sets/primitives/borderline.txt
@@ -6751,6 +6751,18 @@ power=2
 toughness=3
 [/card]
 [card]
+name=Clone Shell
+aicode=activate target(*[zpos<=4]|mylibrary) moveTo(myExile)
+auto=may name(look) reveal:4 optionone choice name(put in exile) target(*|reveal) moveTo(ownerExile) optiononeend optiontwo choice name(put on bottom) target(<4>*|reveal) bottomoflibrary optiontwoend revealend
+auto=@movedTo(this|Graveyard) from(myBattlefield):castcard(normal) target(*|myExile)
+text=Imprint — When Clone Shell enters the battlefield, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library in any order. -- When Clone Shell dies, turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control.
+mana={5}
+type=Artifact Creature
+subtype=Shapeshifter
+power=2
+toughness=2
+[/card]
+[card]
 name=Cloudkin Seer
 abilities=flying
 auto=draw:1
@@ -7670,6 +7682,17 @@ type=Land
 subtype=Desert
 [/card]
 [card]
+name=Cragganwick Cremator
+other={2}{R}{R}{D(*[creature]|myhand)} name(Discard a creature)
+auto=if paid(alternative) then damage:storedpower target(player,planeswalker)
+text=When Cragganwick Cremator enters the battlefield, discard a card at random. If you discard a creature card this way, Cragganwick Cremator deals damage equal to that card’s power to target player or planeswalker.
+mana={2}{R}{R}{D(*[-creature]|myhand)}
+type=Creature
+subtype=Giant Shaman
+power=5
+toughness=4
+[/card]
+[card]
 name=Crash Through
 auto=all(creature|mybattlefield) trample ueot
 auto=draw:1
@@ -22440,6 +22463,17 @@ type=Tribal Enchantment
 subtype=Treefolk Aura
 [/card]
 [card]
+name=Liliana, Heretical Healer
+abilities=lifelink
+auto=@movedTo(other creature[-token]|graveyard) from(myBattlefield):moveto(ownerBattlefield) && flip(Liliana, Defiant Necromancer) && ability$!name(Create Zombie) token(Zombie,Creature Zombie,2/2,black)!$ controller
+text=Lifelink -- Whenever another nontoken creature you control dies, exile Liliana, Heretical Healer, then return her to the battlefield transformed under her owner's control. If you do, put a 2/2 black Zombie creature token onto the battlefield.
+mana={1}{B}{B}
+type=Legendary Creature
+subtype=Human Cleric
+power=2
+toughness=3
+[/card]
+[card]
 name=Liliana's Defeat
 auto=choice name(target black creature) destroy target(creature[black])
 auto=choice name(target black planeswalker) destroy target(planeswalker[black])
@@ -23418,6 +23452,13 @@ mana={3}
 type=Artifact
 [/card]
 [card]
+name=Mana Reflection
+auto=@tappedformana(*|myBattlefield):all(trigger) transforms((,newability[produceextra:selectmana])) oneshot
+text=If you tap a permanent for mana, it produces twice as much of that mana instead.
+mana={4}{G}{G}
+type=Enchantment
+[/card]
+[card]
 name=Mana Screw
 auto={1}:flipacoin winability add{2} winabilityend flipend
 text={1}: Flip a coin. If you win the flip, add {2} to your mana pool. Play this ability only any time you could play an instant.
@@ -25979,6 +26020,18 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Nicol Bolas, the Ravager
+abilities=flying
+auto=ability$!name(discard) reject notatarget(*|myhand)!$ opponent
+auto={4}{U}{B}{R}:moveto(ownerBattlefield) && flip(Nicol Bolas, the Arisen) asSorcery
+text=Flying -- When Nicol Bolas, the Ravager enters the battlefield, each opponent discards a card. -- {4}{U}{B}{R}: Exile Nicol Bolas, the Ravager, then return him to the battlefield transformed under his owner's control. Activate this ability only any time you could cast a sorcery.
+mana={1}{U}{B}{R}
+type=Legendary Creature
+subtype=Elder Dragon
+power=4
+toughness=4
+[/card]
+[card]
 name=Night // Day
 other={2}{W} name(Day)
 auto=ifnot paid(alternative) then target(creature) -1/-1 ueot
@@ -34044,6 +34097,16 @@ power=2
 toughness=3
 [/card]
 [card]
+name=Sen Triplets
+auto=@each my upkeep:all(*|opponentBattlefield) noactivatedability && all(*|opponentcastingzone) maxCast(*)0 && may castcard(normal) target(*|opponenthand)
+text=At the beginning of your upkeep, choose target opponent. This turn, that player can't cast spells or activate abilities and plays with his or her hand revealed. You may play cards from that player's hand this turn.
+mana={2}{W}{U}{B}
+type=Legendary Artifact Creature
+subtype=Human Wizard
+power=3
+toughness=3
+[/card]
+[card]
 name=Senate Courier
 abilities=flying
 auto={1}{W}:vigilance
diff --git a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
index c5d13f43b..cb0c6cbb0 100644
--- a/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
+++ b/projects/mtg/bin/Res/sets/primitives/planeswalkers.txt
@@ -543,17 +543,6 @@ type=Legendary Planeswalker
 subtype=Chandra
 [/card]
 [card]
-name=Chandra, Fire of Kaladesh
-auto=@movedTo(*[red]|mystack):untap all(this)
-auto={T}:damage:1 target(player) limit^moveto(ownerBattlefield) && flip(Chandra, Roaring Flame)^3
-text=Whenever you cast a red spell, untap Chandra, Fire of Kaladesh. -- {T}: Chandra, Fire of Kaladesh deals 1 damage to target player. If Chandra has dealt 3 or more damage this turn, exile her, then return her to the battlefield transformed under her owner's control.
-mana={1}{R}{R}
-type=Legendary Creature
-subtype=Human Shaman
-power=2
-toughness=2
-[/card]
-[card]
 name=Chandra, Roaring Flame
 auto=counter(0/0.4.loyalty)
 auto={C(0/0,1,Loyalty)}:name(+1: Deals 2 damage to player or planeswalker) ability$!name(Choose one) choice name(Damage player) damage:2 target(player) _ choice name(Damage planeswalker) damage:2 target(planeswalker)!$ controller
@@ -1401,18 +1390,8 @@ type=Legendary Planeswalker
 subtype=Liliana
 [/card]
 [card]
-name=Liliana, Heretical Healer
-abilities=lifelink
-auto=@movedTo(other creature[-token]|graveyard) from(myBattlefield):if this cantargetcard(*[-planeswalker]|mybattlefield) then moveto(exile) and!( transforms((,newability[moveto(ownerBattlefield)],newability[flip(Liliana, Defiant Necromancer)],newability[counter(0/0.3.loyalty)],newability[token(Zombie Lil) controller])) forever )!
-text=Lifelink -- Whenever another nontoken creature you control dies, exile Liliana, Heretical Healer, then return her to the battlefield transformed under her owner's control. If you do, put a 2/2 black Zombie creature token onto the battlefield.
-mana={1}{B}{B}
-type=Legendary Creature
-subtype=Human Cleric
-power=2
-toughness=3
-[/card]
-[card]
 name=Liliana, Defiant Necromancer
+auto=counter(0/0,3,Loyalty)
 auto={C(0/0,2,Loyalty)}:name(+2: Each Player Discard) ability$!name(discard) notatarget(*|myhand) reject!$ controller && ability$!name(discard) notatarget(*|myhand) reject!$ opponent
 auto={C(0/0,-0,Loyalty)}:name(-0: Reanimate nonLegendary creature with manacost 0) moveto(mybattlefield) target(creature[-legendary;manacost=0]|mygraveyard)
 auto={C(0/0,-1,Loyalty)}:name(-1: Reanimate nonLegendary creature with manacost 1) moveto(mybattlefield) target(creature[-legendary;manacost=1]|mygraveyard)
@@ -1698,19 +1677,8 @@ type=Legendary Planeswalker
 subtype=Bolas
 [/card]
 [card]
-name=Nicol Bolas, the Ravager
-abilities=flying
-auto=ability$!name(discard) reject notatarget(*|myhand)!$ opponent
-auto={4}{U}{B}{R}:moveto(exile) and!( transforms((,newability[moveto(ownerBattlefield)],newability[flip(Nicol Bolas, the Arisen)],newability[counter(0/0.7.loyalty)])) forever )! asSorcery
-text=Flying -- When Nicol Bolas, the Ravager enters the battlefield, each opponent discards a card. -- {4}{U}{B}{R}: Exile Nicol Bolas, the Ravager, then return him to the battlefield transformed under his owner's control. Activate this ability only any time you could cast a sorcery.
-mana={1}{U}{B}{R}
-type=Legendary Creature
-subtype=Elder Dragon
-power=4
-toughness=4
-[/card]
-[card]
 name=Nicol Bolas, the Arisen
+auto=counter(0/0,7,Loyalty)
 auto={C(0/0,2,Loyalty)}:name(+2: Draw two cards) draw:2 controller
 auto={C(0/0,-3,Loyalty)}:name(-3: Deals 10 damage to creature or planeswalker) damage:10 target(creature,planeswalker)
 auto={C(0/0,-4,Loyalty)}:name(-4: Reanimate a creature or planeswalker) target(*[creature;planeswalker]|graveyard) moveto(myBattlefield)
diff --git a/projects/mtg/bin/Res/sets/primitives/unsupported.txt b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
index 74d762752..2f64d9c84 100644
--- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt
+++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
@@ -2321,15 +2321,6 @@ mana={U}
 type=Instant
 [/card]
 [card]
-name=Clone Shell
-text=Imprint — When Clone Shell enters the battlefield, look at the top four cards of your library, exile one face down, then put the rest on the bottom of your library in any order. -- When Clone Shell dies, turn the exiled card face up. If it's a creature card, put it onto the battlefield under your control.
-mana={5}
-type=Artifact Creature
-subtype=Shapeshifter
-power=2
-toughness=2
-[/card]
-[card]
 name=Coalition Flag
 text=Enchant creature you control -- Enchanted creature is a Flagbearer. -- While choosing targets as part of casting a spell or activating an ability, your opponents must choose at least one Flagbearer on the battlefield if able.
 mana={W}
@@ -2674,15 +2665,6 @@ power=1
 toughness=3
 [/card]
 [card]
-name=Cragganwick Cremator
-text=When Cragganwick Cremator enters the battlefield, discard a card at random. If you discard a creature card this way, Cragganwick Cremator deals damage equal to that card's power to target player.
-mana={2}{R}{R}
-type=Creature
-subtype=Giant Shaman
-power=5
-toughness=4
-[/card]
-[card]
 name=Cramped Bunker
 text=At the beginning of each opponent's upkeep, that player moves a permanent they control to touch Cramped Bunker and no other permanents. If the player can't, destroy each permanent they control that isn't touching Cramped Bunker, then sacrifice it.
 mana={4}{R}{G}
@@ -8266,12 +8248,6 @@ mana={1}{U}
 type=Enchantment
 [/card]
 [card]
-name=Mana Reflection
-text=If you tap a permanent for mana, it produces twice as much of that mana instead.
-mana={4}{G}{G}
-type=Enchantment
-[/card]
-[card]
 name=Mana Web
 text=Whenever a land an opponent controls is tapped for mana, tap all lands that player controls that could produce any type of mana that land could produce.
 mana={3}
@@ -11893,15 +11869,6 @@ mana={4}{G}{G}
 type=Sorcery
 [/card]
 [card]
-name=Sen Triplets
-text=At the beginning of your upkeep, choose target opponent. This turn, that player can't cast spells or activate abilities and plays with his or her hand revealed. You may play cards from that player's hand this turn.
-mana={2}{W}{U}{B}
-type=Legendary Artifact Creature
-subtype=Human Wizard
-power=3
-toughness=3
-[/card]
-[card]
 name=Sentinel
 text={0}: Sentinel's toughness becomes 1 plus the power of target creature blocking or blocked by Sentinel. (This effect lasts indefinitely.)
 mana={4}