diff --git a/projects/mtg/bin/Res/sets/CMD/_cards.dat b/projects/mtg/bin/Res/sets/CMD/_cards.dat
index ead9347e9..6afcd999d 100644
--- a/projects/mtg/bin/Res/sets/CMD/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CMD/_cards.dat
@@ -955,7 +955,7 @@ id=247161
 rarity=C
 [/card]
 [card]
-primitive=Oros the Avenger
+primitive=Oros, the Avenger
 id=247363
 rarity=R
 [/card]
@@ -1380,7 +1380,7 @@ id=247406
 rarity=U
 [/card]
 [card]
-primitive=Teneb the Harvester
+primitive=Teneb, the Harvester
 id=247365
 rarity=R
 [/card]
diff --git a/projects/mtg/bin/Res/sets/PLC/_cards.dat b/projects/mtg/bin/Res/sets/PLC/_cards.dat
index 7b24c3d21..4a6af0943 100644
--- a/projects/mtg/bin/Res/sets/PLC/_cards.dat
+++ b/projects/mtg/bin/Res/sets/PLC/_cards.dat
@@ -491,9 +491,7 @@ id=124062
 rarity=R
 [/card]
 [card]
-primitive=Oros the Avenger
-#The comma needed to be stripped from the name to make the card work.
-#Reintroducing it requires an update to mtg.txt as well.
+primitive=Oros, the Avenger
 id=136170
 rarity=R
 [/card]
@@ -749,9 +747,7 @@ id=126814
 rarity=R
 [/card]
 [card]
-primitive=Teneb the Harvester
-#The comma needed to be stripped from the name to make the card work.
-#Reintroducing it requires an update to mtg.txt as well.
+primitive=Teneb, the Harvester
 id=124075
 rarity=R
 [/card]
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 03d9ed064..8466faa83 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -16831,6 +16831,17 @@ mana={G}{S(land|mybattlefield)}
 type=instant
 [/card]
 [card]
+name=Crosis, the Purger
+abilities=flying
+auto=@combatdamaged(player) from(this):may name(pay ability) transforms((,newability[{2}{B}:activatechooseacolor all(*[chosencolor]|opponenthand) reject activatechooseend limit:1 mycombatdamageonly])) oneshot
+text=Flying -- Whenever Crosis, the Purger deals combat damage to a player, you may pay {2}{B}. If you do, choose a color, then that player reveals his or her hand and discards all cards of that color.
+mana={3}{U}{B}{R}
+type=Legendary Creature
+subtype=Dragon
+power=6
+toughness=6
+[/card]
+[card]
 name=Crosis's Attendant
 auto={1}{S}:Add{U}{B}{R}
 text={1}, Sacrifice Crosis's Attendant: Add {U}{B}{R} to your mana pool.
@@ -22530,6 +22541,17 @@ power=1
 toughness=5
 [/card]
 [card]
+name=Dromar, the Banisher
+abilities=flying
+auto=@combatdamaged(player) from(this):may name(pay ability) transforms((,newability[{2}{U}:activatechooseacolor all(creature[chosencolor]|battlefield) moveTo(ownerhand) activatechooseend limit:1 mycombatdamageonly])) oneshot
+text=Flying -- Whenever Dromar, the Banisher deals combat damage to a player, you may pay {2}{U}. If you do, choose a color, then return all creatures of that color to their owners' hands.
+mana={3}{W}{U}{B}
+type=Legendary Creature
+subtype=Dragon
+power=6
+toughness=6
+[/card]
+[card]
 name=Dromar's Attendant
 auto={1}{S}:Add {W}{U}{B}
 text={1}, Sacrifice Dromar's Attendant: Add {W}{U}{B} to your mana pool.
@@ -56809,6 +56831,17 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Numot, the Devastator
+abilities=flying
+auto=@combatdamaged(player) from(this):may name(pay ability) transforms((,newability[{2}{R}:destroy target(<upto:2>land|battlefield) limit:1 mycombatdamageonly])) oneshot
+text=Flying -- Whenever Numot, the Devastator deals combat damage to a player, you may pay {2}{R}. If you do, destroy up to two target lands.
+mana={3}{R}{W}{U}
+type=Legendary Creature
+subtype=Dragon
+power=6
+toughness=6
+[/card]
+[card]
 name=Nut Collector
 auto=@each my upkeep:may token(Squirrel,creature squirrel, 1/1,green)
 auto=aslongas(*|mygraveyard) lord(squirrel) 2/2 >6
@@ -58224,13 +58257,9 @@ power=1
 toughness=2
 [/card]
 [card]
-name=Oros the Avenger
-#The comma needed to be stripped from the name to make the card work.
-#Reintroducing it requires an update to PLC/_cards.dat as well.
-#Please don't correct the card name by adding a "," because then the first auto line won't work anymore and even won't work when you add an "," there, too! (0.10.1)
+name=Oros, the Avenger
 abilities=flying
-auto=aslongas(oros the avenger[attacking]|mybattlefield) lord(oros the avenger[attacking;-cloud]) {2}{W}:damage:3 all(creature[-white])
-auto=@combatdamaged(player) from(this):cloud
+auto=@combatdamaged(player) from(this):may name(pay ability) transforms((,newability[{2}{W}:damage:3 all(creature[-white]) limit:1 mycombatdamageonly])) oneshot
 text=Flying -- Whenever Oros, the Avenger deals combat damage to a player, you may pay {2}{W}. If you do, Oros deals 3 damage to each nonwhite creature.
 mana={3}{W}{B}{R}
 type=Legendary Creature
@@ -67187,6 +67216,17 @@ mana={2}{G}
 type=Enchantment
 [/card]
 [card]
+name=Rith, the Awakener
+abilities=flying
+auto=@combatdamaged(player) from(this):may name(pay ability) transforms((,newability[{2}{G}:activatechooseacolor foreach(*[chosencolor]|battlefield) token(Saproling,Creature Saproling,1/1,green) activatechooseend limit:1 mycombatdamageonly])) oneshot
+text=Flying -- Whenever Rith, the Awakener deals combat damage to a player, you may pay {2}{G}. If you do, choose a color, then put a 1/1 green Saproling creature token onto the battlefield for each permanent of that color.
+mana={3}{R}{G}{W}
+type=Legendary Creature
+subtype=Dragon
+power=6
+toughness=6
+[/card]
+[card]
 name=Rith's Attendant
 auto={1}{S}:Add {R}{G}{W}
 text={1}, Sacrifice Rith's Attendant: Add {R}{G}{W} to your mana pool.
@@ -83319,13 +83359,9 @@ mana={B}{S(creature|mybattlefield)}
 type=Sorcery
 [/card]
 [card]
-name=Teneb the Harvester
-#The comma needed to be stripped from the name to make the card work.
-#Reintroducing it requires an update to PLC/_cards.dat as well.
-#Please don't correct the card name by adding a "," because then the first auto line won't work anymore and even won't work when you add an "," there, too! (0.10.1)
+name=Teneb, the Harvester
 abilities=flying
-auto=aslongas(teneb the harvester[attacking]|mybattlefield) lord(teneb the harvester[attacking;-cloud]) {2}{B}:moveTo(myBattlefield) target(creature|graveyard)
-auto=@combatdamaged(player) from(this):cloud
+auto=@combatdamaged(player) from(this):may name(pay ability) transforms((,newability[{2}{B}:moveTo(myBattlefield) target(creature|graveyard) limit:1 mycombatdamageonly])) oneshot
 text=Flying -- Whenever Teneb, the Harvester deals combat damage to a player, you may pay {2}{B}. If you do, put target creature card in a graveyard onto the battlefield under your control.
 mana={3}{B}{G}{W}
 type=Legendary Creature
@@ -86915,6 +86951,17 @@ power=1
 toughness=4
 [/card]
 [card]
+name=Treva, the Renewer
+abilities=flying
+auto=@combatdamaged(player) from(this):may name(pay ability) transforms((,newability[{2}{W}:activatechooseacolor foreach(*[chosencolor]|battlefield) life:1 activatechooseend limit:1 mycombatdamageonly])) oneshot
+text=Flying -- Whenever Treva, the Renewer deals combat damage to a player, you may pay {2}{W}. If you do, choose a color, then you gain 1 life for each permanent of that color.
+mana={3}{G}{W}{U}
+type=Legendary Creature
+subtype=Dragon
+power=6
+toughness=6
+[/card]
+[card]
 name=Treva's Attendant
 auto={1}{S}:Add{G}{W}{U}
 text={1}, Sacrifice Treva's Attendant: Add {G}{W}{U} to your mana pool.
@@ -91618,6 +91665,17 @@ power=5
 toughness=4
 [/card]
 [card]
+name=Vorosh, the Hunter
+abilities=flying
+auto=@combatdamaged(player) from(this):may name(pay ability) transforms((,newability[{2}{G}:counter(1/1.6) limit:1 mycombatdamageonly])) oneshot
+text=Flying -- Whenever Vorosh, the Hunter deals combat damage to a player, you may pay {2}{G}. If you do, put six +1/+1 counters on Vorosh.
+mana={3}{G}{U}{B}
+type=Legendary Creature
+subtype=Dragon
+power=6
+toughness=6
+[/card]
+[card]
 name=Vorstclaw
 mana={4}{G}{G}
 type=Creature
diff --git a/projects/mtg/bin/Res/sets/primitives/unsupported.txt b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
index c0442a9b3..5787a878a 100644
--- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt
+++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
@@ -3502,15 +3502,6 @@ mana={4}
 type=Artifact
 [/card]
 [card]
-name=Crosis, the Purger
-text=Flying -- Whenever Crosis, the Purger deals combat damage to a player, you may pay {2}{B}. If you do, choose a color, then that player reveals his or her hand and discards all cards of that color.
-mana={3}{U}{B}{R}
-type=Legendary Creature
-subtype=Dragon
-power=6
-toughness=6
-[/card]
-[card]
 name=Crown of Convergence
 text=Play with the top card of your library revealed. -- As long as the top card of your library is a creature card, creatures you control that share a color with that card get +1/+1. -- {G}{W}: Put the top card of your library on the bottom of your library.
 mana={2}
@@ -4790,15 +4781,6 @@ mana={3}{U}
 type=Enchantment
 [/card]
 [card]
-name=Dromar, the Banisher
-text=Flying -- Whenever Dromar, the Banisher deals combat damage to a player, you may pay {2}{U}. If you do, choose a color, then return all creatures of that color to their owners' hands.
-mana={3}{W}{U}{B}
-type=Legendary Creature
-subtype=Dragon
-power=6
-toughness=6
-[/card]
-[card]
 name=Drooling Groodion
 text={2}{B}{G}, Sacrifice a creature: Target creature gets +2/+2 until end of turn. Another target creature gets -2/-2 until end of turn.
 mana={3}{B}{B}{G}
@@ -12861,15 +12843,6 @@ type=Instant
 text=Return target permanent to its owner's hand. Gotcha Whenever an opponent says a number, you may say "Gotcha" If you do, return Number Crunch from your graveyard to your hand.
 [/card]
 [card]
-name=Numot, the Devastator
-text=Flying -- Whenever Numot, the Devastator deals combat damage to a player, you may pay {2}{R}. If you do, destroy up to two target lands.
-mana={3}{R}{W}{U}
-type=Legendary Creature
-subtype=Dragon
-power=6
-toughness=6
-[/card]
-[card]
 name=Nurturer Initiate
 text=Whenever a player casts a green spell, you may pay {1}. If you do, target creature gets +1/+1 until end of turn.
 mana={G}
@@ -15739,15 +15712,6 @@ mana={R}{G}{W}
 type=Instant
 [/card]
 [card]
-name=Rith, the Awakener
-text=Flying -- Whenever Rith, the Awakener deals combat damage to a player, you may pay {2}{G}. If you do, choose a color, then put a 1/1 green Saproling creature token onto the battlefield for each permanent of that color.
-mana={3}{R}{G}{W}
-type=Legendary Creature
-subtype=Dragon
-power=6
-toughness=6
-[/card]
-[card]
 name=Ritual of Subdual
 text=Cumulative upkeep {2} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.) -- If a land is tapped for mana, it produces colorless mana instead of any other type.
 mana={4}{G}{G}
@@ -20236,15 +20200,6 @@ toughness=6
 text=Trample When Trench Gorger enters the battlefield, you may search your library for any number of land cards, exile them, then shuffle your library. If you do, Trench Gorger's power and toughness each become equal to the number of cards exiled this way.
 [/card]
 [card]
-name=Treva, the Renewer
-text=Flying -- Whenever Treva, the Renewer deals combat damage to a player, you may pay {2}{W}. If you do, choose a color, then you gain 1 life for each permanent of that color.
-mana={3}{G}{W}{U}
-type=Legendary Creature
-subtype=Dragon
-power=6
-toughness=6
-[/card]
-[card]
 name=Trial // Error (Error)
 text=Counter target multicolored spell.
 mana={U}{B}
@@ -21141,15 +21096,6 @@ toughness=6
 text=Trample Whenever you tap a land for mana, add one mana to your mana pool of any type that land produced. Whenever an opponent taps a land for mana, that land doesn't untap during its controller's next untap step.
 [/card]
 [card]
-name=Vorosh, the Hunter
-mana={3}{G}{U}{B}
-type=Legendary Creature
-subtype=Dragon
-power=6
-toughness=6
-text=Flying Whenever Vorosh, the Hunter deals combat damage to a player, you may pay {2}{G}. If you do, put six +1/+1 counters on Vorosh.
-[/card]
-[card]
 name=Wail of the Nim
 text=Choose one - Regenerate each creature you control; or Wail of the Nim deals 1 damage to each creature and each player. -- Entwine {B} (Choose both if you pay the entwine cost.)
 mana={2}{B}