diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 4184462b5..6d54e8bcf 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -6656,6 +6656,7 @@ auto={1}{p(G)}{T}{S(creature[manacost=13]|mybattlefield)}:name(with manacost = 1
 auto={1}{p(G)}{T}{S(creature[manacost=14]|mybattlefield)}:name(with manacost = 15) target(creature[manacost=15]|mylibrary) moveTo(myBattlefield) asSorcery
 auto={1}{p(G)}{T}{S(creature[manacost=15]|mybattlefield)}:name(with manacost = 16) target(creature[manacost=16]|mylibrary) moveTo(myBattlefield) asSorcery
 text=({(g/p)} can be paid with either {G} or 2 life.) {1}{(g/p)}, {T}, Sacrifice a creature: Search your library for a creature card with converted mana cost equal to 1 plus the sacrificed creature's converted mana cost, put that card onto the battlefield, then shuffle your library. Activate this ability only any time you could cast a sorcery.
+color=green
 mana={3}{p(G)}
 type=Artifact
 [/card]
@@ -7714,6 +7715,7 @@ abilities=flying
 auto=lord(other vampire|mybattlefield) 2/2
 auto={T}:token(Vampire,Creature Vampire,2/2,black,flying)
 text=Flying -- Other Vampire creatures you control get +2/+2. -- {T}: Put a 2/2 black Vampire creature token with flying onto the battlefield.
+color=black
 type=Creature
 subtype=Vampire
 power=5
@@ -9714,7 +9716,7 @@ name=Ichiga, Who Topples Oaks
 abilities=trample
 auto={C(0/0,-1,Ki)}:2/2
 text=Trample -- Remove a ki counter from Ichiga, Who Topples Oaks: Target creature gets +2/+2 until end of turn.
-mana={1}{G}{G}
+color=green
 type=Legendary Creature
 subtype=Spirit
 power=4
@@ -10008,7 +10010,7 @@ name=Kenzo the Hardhearted
 abilities=double strike
 auto=bushido(2/2)
 text=Double strike; bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.)
-mana={W}
+color=white
 type=Legendary Creature
 subtype=Human Samurai
 power=3
@@ -12404,6 +12406,7 @@ toughness=2
 [card]
 name=Markov's Servant
 text=
+color=black
 type=Creature
 subtype=Vampire
 power=4
@@ -15624,7 +15627,7 @@ toughness=2
 name=Azamuki, Treachery Incarnate
 auto={C(0/0,-1,Ki)}:target(creature) transforms((,newability[moveTo(opponentbattlefield)],newability[phaseaction[endofturn sourceinplay] moveTo(ownerbattlefield)])) ueot
 text=Remove a ki counter from Azamuki, Treachery Incarnate: Gain control of target creature until end of turn.
-mana={1}{R}{R}
+color=red
 type=Legendary Creature
 subtype=Spirit
 power=5
@@ -16851,6 +16854,7 @@ name=Nightfall Predator
 auto={R}{T}:target(creature) dynamicability<!powerstrike eachother!>
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Daybreak Ranger)
 text={R},{T}: Nightfall Predator fights target creature. (Each deals damage equal to its power to the other.) -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Nightfall Predator.
+color=green
 type=Creature
 subtype=Werewolf
 power=4
@@ -21363,6 +21367,7 @@ name=Withengar Unbound
 abilities=flying,trample,intimidate
 auto=this(controllerlife < 0) all(this) counter(1/1,13)
 text=Flying, trample, intimidate -- Whenever a player loses the game, put thirteen +1/+1 counters on Withengar Unbound.
+color=black
 type=Legendary Creature
 subtype=Demon
 power=13
@@ -23940,7 +23945,7 @@ name=Kaiso, Memory of Loyalty
 abilities=flying
 auto={C(0/0,-1,Ki)}:prevent:999 target(creature)
 text=Flying -- Remove a ki counter from Kaiso, Memory of Loyalty: Prevent all damage that would be dealt to target creature this turn.
-mana={1}{W}{W}
+color=white
 type=Legendary Creature
 subtype=Spirit
 power=3
@@ -28027,6 +28032,7 @@ name=Gatstaf Howler
 abilities=intimidate
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Gatstaf Shepherd)
 text=Intimidate (This creature can't be blocked except by artifact creatures and/or creatures that share a color with it.) -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Gatstaf Howler.
+color=green
 type=Creature
 subtype=Werewolf
 power=4
@@ -29072,7 +29078,7 @@ auto=draw:1 controller
 text=({p(U)} may be paid for with either {U} or 2 life.) -- Look at target player's hand. -- Draw a card.
 color=blue
 mana={p(U)}
-type=Instant
+type=Sorcery
 [/card]
 [card]
 name=Glacial Chasm
@@ -31836,6 +31842,7 @@ toughness=4
 name=Krallenhorde Wantons
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Grizzled Outcasts)
 text=At the beginning of each upkeep, if a player cast two or more spells last turn, transform Krallenhorde Wantons.
+color=green
 type=Creature
 subtype=Werewolf
 power=7
@@ -32765,6 +32772,7 @@ name=Bane of Hanweir
 abilities=mustattack
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Hanweir Watchkeep)
 text=Bane of Hanweir attacks each turn if able. -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Bane of Hanweir.
+color=red
 type=Creature
 subtype=Werewolf
 power=5
@@ -34234,7 +34242,7 @@ toughness=2
 name=Scarmaker
 auto={C(0/0,-1,Ki)}:fear target(creature)
 text=Remove a ki counter from Scarmaker: Target creature gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
-mana={1}{B}{B}
+color=black
 type=Legendary Creature
 subtype=Spirit
 power=4
@@ -34488,7 +34496,7 @@ auto=lord(creature|mybattlefield) 2/2
 auto=lord(creature|mybattlefield) flying
 auto=lord(creature|mybattlefield) {R}:1/0
 text=Creatures you control get +2/+2 and have flying and "{R}: This creature gets +1/+0 until end of turn".
-mana={4}{R}{R}
+color=red
 type=Legendary Enchantment
 [/card]
 ###The 2 cards above should stay together (Flip Card)###
@@ -35276,7 +35284,7 @@ auto=damage:2 opponent
 auto=may damage:2 target(creature|opponentbattlefield)
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Huntmaster of the Fells)
 text=Whenever this creature transforms into Ravager of the Fells, it deals 2 damage to target opponent and 2 damage to up to one target creature that opponent controls. -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Ravager of the Fells.
-mana={2}{R}{G}
+color=red,green
 type=Creature
 subtype=Werewolf
 power=4
@@ -36652,6 +36660,7 @@ abilities=trample
 auto=lord(creature[attacking]|mybattlefield) 3/0
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Instigator Gang)
 text=Trample -- Attacking creatures you control get +3/+0. -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Wildblood Pack.
+color=red
 type=Creature
 subtype=Werewolf
 power=5
@@ -38192,7 +38201,7 @@ toughness=2
 name=Tomoya the Revealer
 auto={3}{U}{U}{T}:foreach(*|myhand) draw:1 target(player)
 text={3}{U}{U}, {T}: Target player draws X cards, where X is the number of cards in your hand.
-mana={1}{U}
+color=blue
 type=Legendary Creature
 subtype=Human Wizard
 power=2
@@ -39638,7 +39647,7 @@ toughness=2
 [card]
 name=Kinscaer Harpoonist
 abilities=flying
-auto=auto=@combat(attacking) source(this):may -flying target(creature) ueot
+auto=@combat(attacking) source(this):may -flying target(creature) ueot
 text=Flying -- Whenever Kinscaer Harpoonist attacks, you may have target creature lose flying until end of turn.
 mana={3}{U}
 type=Creature
@@ -40476,7 +40485,7 @@ toughness=3
 [/card]
 [card]
 name=Kor Spiritdancer
-auto=auto=thisforeach(auras > 0) 2/2
+auto=thisforeach(auras > 0) 2/2
 auto=@movedTo(aura|mystack):draw:1 controller
 text=Kor Spiritdancer gets +2/+2 for each Aura attached to it. -- Whenever you cast an Aura spell, you may draw a card.
 mana={1}{W}
@@ -41235,7 +41244,7 @@ name=Silverpelt Werewolf
 auto=@combatdamaged(opponent) from(this):draw:1 controller
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Lambholt Elder)
 text=Whenever Silverpelt Werewolf deals combat damage to a player, draw a card. -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Silverpelt Werewolf.
-mana={2}{G}
+color=green
 type=Creature
 subtype=Werewolf
 power=4
@@ -43545,6 +43554,7 @@ toughness=3
 name=Ludevic's Abomination
 abilities=trample
 text=Trample
+color=blue
 type=Creature
 subtype=Lizard Horror
 power=13
@@ -45513,6 +45523,7 @@ auto=lord(other wolf|mybattlefield) 1/1
 auto=@each my endofturn:token(Wolf,Creature Wolf,2/2,green)
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Mayor of Avabruck)
 text=Other Werewolf and Wolf creatures you control get +1/+1. -- At the beginning of your end step, put a 2/2 green Wolf creature token onto the battlefield. -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Howlpack Alpha.
+color=green
 type=Creature
 subtype=Werewolf
 power=3
@@ -46380,8 +46391,8 @@ type=Instant
 [card]
 name=Mikaeus, the Lunarch
 auto=counter(1/1,X)
-auto={T}:counter(1/1,1)
-auto={T}{C(-1/-1,-1)}:counter(1/1,1) all(other creature|mybattlefield)
+auto=name(Put a +1/+1 counter on each other creature you control) {T}{C(1/1,-1)}:counter(1/1,1) all(other creature|mybattlefield)
+auto=name(Put a +1/+1 counter on Mikaeus) {T}:counter(1/1,1)
 text=Mikaeus, the Lunarch enters the battlefield with X +1/+1 counters on it. -- {T}: Put a +1/+1 counter on Mikaeus. -- {T}, Remove a +1/+1 counter from Mikaeus: Put a +1/+1 counter on each other creature you control.
 mana={X}{W}
 type=Legendary Creature
@@ -47598,7 +47609,7 @@ name=Tovolar's Magehunter
 auto=@movedTo(*|opponentstack):damage:2 opponent
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Mondronen Shaman)
 text=Whenever an opponent casts a spell, Tovolar's Magehunter deals 2 damage to that player. -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Tovolar's Magehunter.
-mana={3}{R}
+color=red
 type=Creature
 subtype=Werewolf
 power=5
@@ -50052,7 +50063,7 @@ toughness=1
 name=Nighteyes the Desecrator
 auto={4}{B}:moveTo(myBattlefield) target(creature|graveyard)
 text={4}{B}: Put target creature card in a graveyard onto the battlefield under your control.
-mana={1}{B}
+color=black
 type=Legendary Creature
 subtype=Rat Wizard
 power=4
@@ -52260,7 +52271,7 @@ toughness=1
 name=Shidako, Broodmistress
 auto={G}{S(creature|myBattlefield)}:3/3 target(creature)
 text={G}, Sacrifice a creature: Target creature gets +3/+3 until end of turn.
-mana={2}{G}
+color=green
 type=Legendary Creature
 subtype=Snake Shaman
 power=3
@@ -55984,7 +55995,7 @@ toughness=3
 name=Primeval Titan
 abilities=trample
 auto=may target(<upto:2>land|mylibrary) and((tap)) moveTo(mybattlefield)
-auto=@combat(attacking) source(this):may target(<upto:2>land|mylibrary) and((tap)) moveTo(mybattlefield)
+auto=@combat(attacking) source(this):may target(<upto:2>land|mylibrary) moveTo(mybattlefield) and((tap))
 text=Trample -- Whenever Primeval Titan enters the battlefield or attacks, you may search your library for up to two land cards, put them onto the battlefield tapped, then shuffle your library.
 mana={4}{G}{G}
 type=Creature
@@ -58360,7 +58371,7 @@ name=Archdemon of Greed
 abilities=flying,trample
 auto=upcostmulti[{S(human|mybattlefield)}] tap && damage:9 controller
 text=Flying, trample -- At the beginning of your upkeep, sacrifice a Human. If you can't, tap Archdemon of Greed and it deals 9 damage to you.
-mana={3}{B}{B}
+color=black
 type=Creature
 subtype=Demon
 power=9
@@ -58874,6 +58885,7 @@ toughness=1
 name=Merciless Predator
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Reckless Waif)
 text=At the beginning of each upkeep, if a player cast two or more spells last turn, transform Merciless Predator.
+color=red
 type=Creature
 subtype=Werewolf
 power=3
@@ -63262,6 +63274,7 @@ auto=vigilance
 auto={T}:Add{G}{G}
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Scorned Villager)
 text={T}: Add {G}{G} to your mana pool. -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Moonscarred Werewolf.
+color=green
 type=Creature
 subtype=Werewolf
 power=2
@@ -63475,6 +63488,18 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Stalking Vampire
+abilities=flying
+auto={2}{B}{B}:flip(Screeching Bat) myUpkeepOnly
+text=Flying -- At the beginning of your upkeep, you may pay {2}{B}{B}. If you do, transform Stalking Vampire.
+color=black
+type=Creature
+subtype=Vampire
+power=5
+toughness=5
+[/card]
+###The 2 cards above should stay together (Flip Card)###
+[card]
 name=Screeching Skaab
 auto=deplete:2
 text=When Screeching Skaab enters the battlefield, put the top two cards of your library into your graveyard.
@@ -63485,17 +63510,6 @@ power=2
 toughness=1
 [/card]
 [card]
-name=Stalking Vampire
-abilities=flying
-auto={2}{B}{B}:flip(Screeching Bat) myUpkeepOnly
-text=Flying -- At the beginning of your upkeep, you may pay {2}{B}{B}. If you do, transform Stalking Vampire.
-type=Creature
-subtype=Vampire
-power=5
-toughness=5
-[/card]
-###The 2 cards above should stay together (Flip Card)###
-[card]
 name=Screeching Drake
 abilities=flying
 auto=draw:1
@@ -76304,6 +76318,7 @@ toughness=2
 name=Thraben Militia
 abilities=trample
 text=Trample
+color=white
 type=Creature
 subtype=Human Soldier
 power=5
@@ -77585,6 +77600,7 @@ toughness=2
 name=Rampaging Werewolf
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Village Ironsmith)
 text=At the beginning of each upkeep, if a player cast two or more spells last turn, transform Rampaging Werewolf.
+color=red
 type=Creature
 subtype=Werewolf
 power=6
@@ -77985,7 +78001,7 @@ type=Enchantment
 [/card]
 [card]
 name=Tradewind Rider
-abilitiees=flying
+abilities=flying
 auto={T}{T(creature|myBattlefield)}{T(creature|myBattlefield)}:moveTo(ownerhand) target(*)
 text=Flying -- {T}, Tap two untapped creatures you control: Return target permanent to its owner's hand.
 mana={3}{U}
@@ -79366,6 +79382,7 @@ name=Ulvenwald Primordials
 auto={G}:regenerate
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Ulvenwald Mystics)
 text=At the beginning of each upkeep, if a player cast two or more spells last turn, transform Ulvenwald Primordials.
+color=green
 type=Creature
 subtype=Werewolf
 power=5
@@ -79397,9 +79414,9 @@ subtype=Equipment
 name=Umezawa's Jitte
 auto={2}:equip
 auto=@combatdamaged(creature,player) from(mytgt):counter(0/0,2,Charge) all(this)
-auto=choice {C(0/0,-1,Charge)}:2/2
-auto=choice {C(0/0,-1,Charge)}:-1/-1 target(creature)
-auto=choice {C(0/0,-1,Charge)}:life:2 controller
+auto={C(0/0,-1,Charge)}:2/2
+auto={C(0/0,-1,Charge)}:-1/-1 target(creature)
+auto={C(0/0,-1,Charge)}:life:2 controller
 text=Whenever equipped creature deals combat damage, put two charge counters on Umezawa's Jitte. -- Remove a charge counter from Umezawa's Jitte: Choose one - Equipped creature gets +2/+2 until end of turn; or target creature gets -1/-1 until end of turn; or you gain 2 life. -- Equip {2}
 mana={2}
 type=Legendary Artifact
@@ -81826,6 +81843,7 @@ name=Ironfang
 abilities=first strike
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Village Ironsmith)
 text=First Strike -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Ironfang.
+color=red
 type=Creature
 subtype=Werewolf
 power=3
@@ -81858,6 +81876,7 @@ toughness=3
 name=Howlpack of Estwald
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Villagers of Estwald)
 text=At the beginning of each upkeep, if a player cast two or more spells last turn, transform Howlpack of Estwald.
+color=green
 type=Creature
 subtype=Werewolf
 power=4
@@ -84498,7 +84517,7 @@ type=Artifact
 [/card]
 [card]
 name=Well of Life
-auto=auto=@each my endofturn restriction{type(land[-tapped]|myBattlefield)~lessthan~1}:life:2 <1
+auto=@each my endofturn restriction{type(land[-tapped]|myBattlefield)~lessthan~1}:life:2 <1
 text=At the beginning of your end step, if you control no untapped lands, you gain 2 life.
 mana={4}
 type=Artifact
@@ -85937,7 +85956,7 @@ name=Krallenhorde Killer
 auto={3}{G}:4/4 limit:1
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Wolfbitten Captive)
 text={3}{G}: Krallenhorde Killer gets +4/+4 until end of turn. Activate this ability only once each turn. -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Moonscarred Werewolf.
-mana={G}
+color=green
 type=Creature
 subtype=Werewolf
 power=2