diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 67a12c0d3..d0369b7ba 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -89180,6 +89180,13 @@ mana={3}
 type=Artifact
 [/card]
 [card]
+name=Thran Foundry
+auto={1}{T}{E}:name(shuffle graveyard) target(player) donothing && moveto(ownerlibrary) and!(shuffle)! all(*|targetedpersonsgraveyard)
+text={1}, {T}, Exile Thran Foundry: Target player shuffles his or her graveyard into his or her library.
+mana={1}
+type=Artifact
+[/card]
+[card]
 name=Thran Golem
 auto=this(auras >= 1) 2/2
 auto=this(auras >= 1) flying
@@ -91413,6 +91420,19 @@ power=4
 toughness=3
 [/card]
 [card]
+name=Treacherous Vampire
+abilities=flying
+auto=@combat(attacking,blocking) source(this):name(sacrifice or exile) all(this) transforms((,newability[choice sacrifice],newability[if type(*|mygraveyard)~morethan~0 then choice moveto(exile) notatarget(*|mygraveyard)])) ueot
+auto=aslongas(*|mygraveyard) 2/2 >6
+auto=@movedTo(this|graveyard) from(myBattlefield) restriction{type(*|mygraveyard)~morethan~6}:life:-6
+text=Flying -- Whenever Treacherous Vampire attacks or blocks, sacrifice it unless you exile a card from your graveyard. -- Threshold - As long as seven or more cards are in your graveyard, Treacherous Vampire gets +2/+2 and has "When Treacherous Vampire is put into a graveyard from the battlefield, you lose 6 life."
+mana={4}{B}
+type=Creature
+subtype=Vampire
+power=4
+toughness=4
+[/card]
+[card]
 name=Treacherous Werewolf
 auto=aslongas(*|mygraveyard) 2/2 >6
 auto=aslongas(*|mygraveyard) transforms((,newability[@movedTo(this|graveyard) from(battlefield):life:-4 controller])) >6
@@ -91593,6 +91613,14 @@ text=Treetop Village enters the battlefield tapped. -- {T}: Add {G} to your mana
 type=Land
 [/card]
 [card]
+name=Tremble
+auto=sacrifice notatarget(land|mybattlefield)
+auto=ability$! sacrifice notatarget(land|mybattlefield) !$ opponent
+text=Each player sacrifices a land.
+mana={1}{R}
+type=Sorcery
+[/card]
+[card]
 name=Tremor
 auto=damage:1 all(creature[-flying])
 text=Tremor deals 1 damage to each creature without flying.
@@ -92102,6 +92130,14 @@ power=3
 toughness=4
 [/card]
 [card]
+name=Truce
+auto=ability$!name(draw two) choice name(draw two) draw:2 _ choice name(draw one) draw:1 && life:1 _ choice name(draw zero) life:2!$ controller
+auto=ability$!name(draw two) choice name(draw two) draw:2 _ choice name(draw one) draw:1 && life:1 _ choice name(draw zero) life:2!$ opponent
+text=Each player may draw up to two cards. For each card less than two a player draws this way, that player gains 2 life.
+mana={2}{W}
+type=Instant
+[/card]
+[card]
 name=True Believer
 text=You have shroud. (You can't be the target of spells or abilities.)
 mana={W}{W}
diff --git a/projects/mtg/bin/Res/sets/primitives/unsupported.txt b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
index e7a43af67..0043fdf8e 100644
--- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt
+++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
@@ -18505,12 +18505,6 @@ mana={3}
 type=Artifact
 [/card]
 [card]
-name=Thran Foundry
-text={1}, {T}, Exile Thran Foundry: Target player shuffles his or her graveyard into his or her library.
-mana={1}
-type=Artifact
-[/card]
-[card]
 name=Thran Tome
 text={5}, {T}: Reveal the top three cards of your library. Target opponent chooses one of those cards. Put that card into your graveyard, then draw two cards.
 mana={4}
@@ -18945,15 +18939,6 @@ mana={4}{B}
 type=Instant
 [/card]
 [card]
-name=Treacherous Vampire
-text=Flying -- Whenever Treacherous Vampire attacks or blocks, sacrifice it unless you exile a card from your graveyard. -- Threshold - As long as seven or more cards are in your graveyard, Treacherous Vampire gets +2/+2 and has "When Treacherous Vampire is put into a graveyard from the battlefield, you lose 6 life."
-mana={4}{B}
-type=Creature
-subtype=Vampire
-power=4
-toughness=4
-[/card]
-[card]
 name=Treasure Hunt
 text=Reveal cards from the top of your library until you reveal a nonland card, then put all cards revealed this way into your hand.
 mana={1}{U}
@@ -18978,12 +18963,6 @@ power=2
 toughness=4
 [/card]
 [card]
-name=Tremble
-text=Each player sacrifices a land.
-mana={1}{R}
-type=Sorcery
-[/card]
-[card]
 name=Trench Gorger
 mana={6}{U}{U}
 type=Creature
@@ -19023,12 +19002,6 @@ mana={U}
 type=Instant
 [/card]
 [card]
-name=Truce
-text=Each player may draw up to two cards. For each card less than two a player draws this way, that player gains 2 life.
-mana={2}{W}
-type=Instant
-[/card]
-[card]
 name=Trumpeting Armodon
 text={1}{G}: Target creature blocks Trumpeting Armodon this turn if able.
 mana={3}{G}