diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 02739b12e..25719f119 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -6748,6 +6748,12 @@ power=6
 toughness=6
 [/card]
 [card]
+name=Crosis's Catacombs
+text=When Crosis's Catacombs enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {U}, {B}, or {R} to your mana pool.
+type=Land
+subtype=Lair
+[/card]
+[card]
 name=Crown of Ascension
 text=Enchant creature -- Enchanted creature has flying. -- Sacrifice Crown of Ascension: Enchanted creature and other creatures that share a creature type with it gain flying until end of turn.
 mana={1}{U}
@@ -7286,6 +7292,12 @@ power=6
 toughness=6
 [/card]
 [card]
+name=Darigaaz's Caldera
+text=When Darigaaz's Caldera enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {B}, {R}, or {G} to your mana pool.
+type=Land
+subtype=Lair
+[/card]
+[card]
 name=Dark Confidant
 text=At the beginning of your upkeep, reveal the top card of your library and put that card into your hand. You lose life equal to its converted mana cost.
 mana={1}{B}
@@ -9195,6 +9207,12 @@ power=6
 toughness=6
 [/card]
 [card]
+name=Dromar's Cavern
+text=When Dromar's Cavern enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {W}, {U}, or {B} to your mana pool.
+type=Land
+subtype=Lair
+[/card]
+[card]
 name=Droning Bureaucrats
 text={X}, {T}: Each creature with converted mana cost X can't attack or block this turn.
 mana={3}{W}
@@ -29592,6 +29610,12 @@ mana={R}{G}{W}
 type=Instant
 [/card]
 [card]
+name=Rith's Grove
+text=When Rith's Grove enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {R}, {G}, or {W} to your mana pool.
+type=Land
+subtype=Lair
+[/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}
@@ -38018,6 +38042,12 @@ power=6
 toughness=6
 [/card]
 [card]
+name=Treva's Ruins
+text=When Treva's Ruins enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {G}, {W}, or {U} to your mana pool.
+type=Land
+subtype=Lair
+[/card]
+[card]
 name=Trial // Error (Error)
 text=Counter target multicolored spell.
 mana={U}{B}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index d19507f15..2f8b0eb24 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -3612,7 +3612,7 @@ toughness=1
 [/card]
 [card]
 name=Battle-Rattle Shaman
-auto=@each my combatbegins:may 2/0 target(creature)
+auto=@each my combatbegins:may 2/0 target(creature) ueot
 text=At the beginning of combat on your turn, you may have target creature +2/+0 until end of turn.
 mana={3}{R}
 type=Creature
@@ -9311,15 +9311,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Crosis's Catacombs
-auto=aslongas(land[-lair]|myBattlefield) moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
-auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=@movedTo(land[-lair]|myhand) from(myBattlefield):lord(crosis's catacombs) {T}:Add{U} && lord(crosis's catacombs) {T}:Add{B} && lord(crosis's catacombs) {T}:Add{R}
-text=When Crosis's Catacombs enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {U}, {B}, or {R} to your mana pool.
-type=Land
-subtype=Lair
-[/card]
-[card]
 name=Crosis's Charm
 auto=may moveTo(ownerhand) target(*)
 auto=may bury target(creature[-black])
@@ -9912,15 +9903,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Darigaaz's Caldera
-auto=aslongas(land[-lair]|myBattlefield) moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
-auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=@movedTo(land[-lair]|myhand) from(myBattlefield):lord(darigaaz's caldera) {T}:Add{B} && lord(darigaaz's caldera) {T}:Add{R} && lord(darigaaz's caldera) {T}:Add{G}
-text=When Darigaaz's Caldera enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {B}, {R}, or {G} to your mana pool.
-type=Land
-subtype=Lair
-[/card]
-[card]
 name=Darigaaz's Charm
 auto=may moveTo(myhand) target(creature|mygraveyard)
 auto=may damage:3 target(creature,player)
@@ -12347,15 +12329,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Dromar's Cavern
-auto=aslongas(land[-lair]|myBattlefield) moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
-auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=@movedTo(land[-lair]|myhand) from(myBattlefield):lord(dromar's cavern) {T}:Add{W} && lord(dromar's cavern) {T}:Add{U} && lord(dromar's cavern) {T}:Add{B}
-text=When Dromar's Cavern enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {W}, {U}, or {B} to your mana pool.
-type=Land
-subtype=Lair
-[/card]
-[card]
 name=Dromar's Charm
 auto=may life:5 controller
 auto=may fizzle target(*|stack)
@@ -36371,15 +36344,6 @@ power=3
 toughness=3
 [/card]
 [card]
-name=Rith's Grove
-auto=aslongas(land[-lair]|myBattlefield) moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
-auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=@movedTo(land[-lair]|myhand) from(myBattlefield):lord(rith's grove) {T}:Add{R} && lord(rith's grove) {T}:Add{G} && lord(rith's grove) {T}:Add{W}
-text=When Rith's Grove enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {R}, {G}, or {W} to your mana pool.
-type=Land
-subtype=Lair
-[/card]
-[card]
 name=Ritual of Restoration
 target=artifact|myGraveyard
 auto=moveto(myHand)
@@ -47385,15 +47349,6 @@ id=-1111143
 type=nothing
 [/card]
 [card]
-name=Treva's Ruins
-auto=aslongas(land[-lair]|myBattlefield) moveTo(ownerhand) notatarget(land[-lair]|myBattlefield)
-auto=moveTo(graveyard) notatarget(this|myBattlefield)
-auto=@movedTo(land[-lair]|myhand) from(myBattlefield):lord(treva's ruins) {T}:Add{G} && lord(treva's ruins) {T}:Add{W} && lord(treva's ruins) {T}:Add{U}
-text=When Treva's Ruins enters the battlefield, sacrifice it unless you return a non-Lair land you control to its owner's hand. -- {T}: Add {G}, {W}, or {U} to your mana pool.
-type=Land
-subtype=Lair
-[/card]
-[card]
 name=Triassic Egg
 auto={3}{T}:counter(0/0,1,Hatchling)
 auto={C(0/0,-2,Hatchling)}{S}:moveTo(myBattlefield) target(creature|myhand,mygraveyard)
@@ -50199,7 +50154,7 @@ toughness=1
 [/card]
 [card]
 name=Walking Atlas
-auto={T}:may moveTo(myBattlefield) target(land|myhand)
+auto={T}:moveTo(myBattlefield) target(land|myhand)
 text={T}: You may put a land card from your hand onto the battlefield.
 mana={2}
 type=Artifact Creature