diff --git a/projects/mtg/bin/Res/sets/C18/_cards.dat b/projects/mtg/bin/Res/sets/C18/_cards.dat
index 677dc2e84..2b6eea55d 100644
--- a/projects/mtg/bin/Res/sets/C18/_cards.dat
+++ b/projects/mtg/bin/Res/sets/C18/_cards.dat
@@ -7,182 +7,182 @@ total=307
 [card]
 primitive=Boreas Charger
 id=450602
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Empyrial Storm
 id=450603
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Heavenly Blademaster
 id=450604
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Loyal Unicorn
 id=450605
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Magus of the Balance
 id=450606
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Aminatou's Augury
 id=450607
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Echo Storm
 id=450608
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Estrid's Invocation
 id=450609
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Ever-Watching Threshold
 id=450610
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Loyal Drake
 id=450611
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Octopus Umbra
 id=450612
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Primordial Mist
 id=450613
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Vedalken Humiliator
 id=450614
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Bloodtracker
 id=450615
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Entreat the Dead
 id=450616
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Loyal Subordinate
 id=450617
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Night Incarnate
 id=450618
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Skull Storm
 id=450619
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Sower of Discord
 id=450620
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Emissary of Grudges
 id=450621
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Enchanter's Bane
 id=450622
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Fury Storm
 id=450623
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Loyal Apprentice
 id=450624
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Nesting Dragon
 id=450625
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Reality Scramble
 id=450626
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Saheeli's Directive
 id=450627
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Treasure Nabber
 id=450628
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Varchild, Betrayer of Kjeldor
 id=450629
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Crash of Rhino Beetles
 id=450630
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Genesis Storm
 id=450631
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Loyal Guardian
 id=450632
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Myth Unbound
 id=450633
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Nylea's Colossus
 id=450634
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Ravenous Slime
 id=450635
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Turntimber Sower
 id=450636
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Whiptongue Hydra
 id=450637
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Aminatou, the Fateshifter
@@ -192,7 +192,7 @@ rarity=M
 [card]
 primitive=Arixmethes, Slumbering Isle
 id=450639
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Brudiclad, Telchor Engineer
@@ -247,12 +247,12 @@ rarity=M
 [card]
 primitive=Windgrace's Judgment
 id=450650
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Xantcha, Sleeper Agent
 id=450651
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Yennett, Cryptic Sovereign
@@ -262,77 +262,77 @@ rarity=M
 [card]
 primitive=Yuriko, the Tiger's Shadow
 id=450653
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Ancient Stone Idol
 id=450654
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Coveted Jewel
 id=450655
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Endless Atlas
 id=450656
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Geode Golem
 id=450657
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Retrofitter Foundry
 id=450658
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Forge of Heroes
 id=450659
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Isolated Watchtower
 id=450660
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Adarkar Valkyrie
 id=451015
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Ajani's Chosen
 id=451016
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Akroma's Vengeance
 id=451017
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Banishing Stroke
 id=451018
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Celestial Archon
 id=451019
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Crib Swap
 id=451020
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Dismantling Blow
 id=451021
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Entreat the Angels
@@ -342,27 +342,27 @@ rarity=M
 [card]
 primitive=Lightform
 id=451023
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Martial Coup
 id=451024
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Phyrexian Rebirth
 id=451025
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Return to Dust
 id=451026
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Sage's Reverie
 id=451027
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Serra Avatar
@@ -372,197 +372,197 @@ rarity=M
 [card]
 primitive=Sigil of the Empty Throne
 id=451029
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Silent Sentinel
 id=451030
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Soul Snare
 id=451031
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Terminus
 id=451032
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Unquestioned Authority
 id=451033
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Winds of Rath
 id=451034
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Aether Gale
 id=451035
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Archetype of Imagination
 id=451036
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Brainstorm
 id=451037
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Cloudform
 id=451038
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Conundrum Sphinx
 id=451039
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Devastation Tide
 id=451040
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Dictate of Kruphix
 id=451041
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Djinn of Wishes
 id=451042
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Dream Cache
 id=451043
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Eel Umbra
 id=451044
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Etherium Sculptor
 id=451045
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Inkwell Leviathan
 id=451046
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Into the Roil
 id=451047
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Jeskai Infiltrator
 id=451048
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Mulldrifter
 id=451049
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Ninja of the Deep Hours
 id=451050
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Ponder
 id=451051
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Portent
 id=451052
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Predict
 id=451053
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Reverse Engineer
 id=451054
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Saheeli's Artistry
 id=451055
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Sharding Sphinx
 id=451056
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Sigiled Starfish
 id=451057
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Sphinx of Jwar Isle
 id=451058
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Sphinx of Uthuun
 id=451059
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Telling Time
 id=451060
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Thirst for Knowledge
 id=451061
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Thopter Spy Network
 id=451062
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Tidings
 id=451063
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Treasure Hunt
 id=451064
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Vow of Flight
 id=451065
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Whirler Rogue
 id=451066
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Whitewater Naiads
 id=451067
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Army of the Damned
@@ -572,22 +572,22 @@ rarity=M
 [card]
 primitive=Moonlight Bargain
 id=451069
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Phyrexian Delver
 id=451070
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Retreat to Hagra
 id=451071
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Ruinous Path
 id=451072
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Soul of Innistrad
@@ -597,52 +597,52 @@ rarity=M
 [card]
 primitive=Stitch Together
 id=451074
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Blasphemous Act
 id=451075
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Chain Reaction
 id=451076
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Chaos Warp
 id=451077
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Flameblast Dragon
 id=451078
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Hellkite Igniter
 id=451079
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Magmaquake
 id=451080
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Thopter Engineer
 id=451081
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Acidic Slime
 id=451082
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Aura Gnarlid
 id=451083
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Avenger of Zendikar
@@ -652,122 +652,122 @@ rarity=M
 [card]
 primitive=Baloth Woodcrasher
 id=451085
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Bear Umbra
 id=451086
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Boon Satyr
 id=451087
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Borderland Explorer
 id=451088
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Dokai, Weaver of Life
 id=451089
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Budoka Gardener
 id=451089
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Centaur Vinecrasher
 id=451090
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Consign to Dust
 id=451091
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Creeping Renaissance
 id=451092
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Cultivate
 id=451093
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Dawn's Reflection
 id=451094
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Eidolon of Blossoms
 id=451095
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Enchantress's Presence
 id=451096
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Epic Proportions
 id=451097
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Explore
 id=451098
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Explosive Vegetation
 id=451099
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Far Wanderings
 id=451100
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Farhaven Elf
 id=451101
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Fertile Ground
 id=451102
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Grapple with the Past
 id=451103
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Ground Seal
 id=451104
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Harrow
 id=451105
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Herald of the Pantheon
 id=451106
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Hunting Wilds
 id=451107
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Hydra Omnivore
@@ -777,82 +777,82 @@ rarity=M
 [card]
 primitive=Khalni Heart Expedition
 id=451109
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Kruphix's Insight
 id=451110
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Moldgraf Monstrosity
 id=451111
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Overgrowth
 id=451112
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Rampaging Baloths
 id=451113
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Reclamation Sage
 id=451114
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Sakura-Tribe Elder
 id=451115
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Scute Mob
 id=451116
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Snake Umbra
 id=451117
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Spawning Grounds
 id=451118
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Vow of Wildness
 id=451119
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Wild Growth
 id=451120
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Yavimaya Elder
 id=451121
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Yavimaya Enchantress
 id=451122
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Aethermage's Touch
 id=451123
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Bant Charm
 id=451124
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Bruna, Light of Alabaster
@@ -862,262 +862,262 @@ rarity=M
 [card]
 primitive=Charnelhoard Wurm
 id=451126
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Cold-Eyed Selkie
 id=451127
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Daxos of Meletis
 id=451128
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Deathreap Ritual
 id=451129
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Decimate
 id=451130
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Duskmantle Seer
 id=451131
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Elderwood Scion
 id=451132
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Enigma Sphinx
 id=451133
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Esper Charm
 id=451134
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Finest Hour
 id=451135
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Gaze of Granite
 id=451136
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Grisly Salvage
 id=451137
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=High Priest of Penance
 id=451138
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Lavalanche
 id=451139
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Maverick Thopterist
 id=451140
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Mortify
 id=451141
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Putrefy
 id=451142
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Righteous Authority
 id=451143
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Rubblehulk
 id=451144
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Savage Twister
 id=451145
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Silent-Blade Oni
 id=451146
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Unflinching Courage
 id=451147
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Utter End
 id=451148
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Worm Harvest
 id=451149
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Zendikar Incarnate
 id=451150
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Azorius Signet
 id=451151
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Blinkmoth Urn
 id=451152
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Bosh, Iron Golem
 id=451153
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Chief of the Foundry
 id=451154
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Commander's Sphere
 id=451155
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Crystal Ball
 id=451156
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Darksteel Juggernaut
 id=451157
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Dimir Signet
 id=451158
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Dreamstone Hedron
 id=451159
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Duplicant
 id=451160
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Hedron Archive
 id=451161
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Izzet Signet
 id=451162
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Magnifying Glass
 id=451163
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Mimic Vat
 id=451164
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Mind Stone
 id=451165
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Mirrorworks
 id=451166
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Myr Battlesphere
 id=451167
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Orzhov Signet
 id=451168
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Pilgrim's Eye
 id=451169
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Prismatic Lens
 id=451170
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Prototype Portal
 id=451171
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Psychosis Crawler
 id=451172
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Scrabbling Claws
 id=451173
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Scuttling Doom Engine
 id=451174
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Seer's Lantern
 id=451175
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Seer's Sundial
 id=451176
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Sol Ring
 id=451177
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Soul of New Phyrexia
@@ -1127,420 +1127,420 @@ rarity=M
 [card]
 primitive=Steel Hellkite
 id=451179
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Swiftfoot Boots
 id=451180
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Thopter Assembly
 id=451181
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Unstable Obelisk
 id=451182
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Unwinding Clock
 id=451183
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Vessel of Endless Rest
 id=451184
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Worn Powerstone
 id=451185
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Akoum Refuge
 id=451186
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Arcane Sanctum
 id=451187
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Azorius Chancery
 id=451188
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Azorius Guildgate
 id=451189
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Barren Moor
 id=451190
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Blighted Woodland
 id=451191
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Blossoming Sands
 id=451192
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Bojuka Bog
 id=451193
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Buried Ruin
 id=451194
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Command Tower
 id=451195
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Darksteel Citadel
 id=451196
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Dimir Aqueduct
 id=451197
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Dimir Guildgate
 id=451198
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Dismal Backwater
 id=451199
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Evolving Wilds
 id=451200
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Forgotten Cave
 id=451201
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Forsaken Sanctuary
 id=451202
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Foundry of the Consuls
 id=451203
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Golgari Rot Farm
 id=451204
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Great Furnace
 id=451205
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Grim Backwoods
 id=451206
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Gruul Turf
 id=451207
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Halimar Depths
 id=451208
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Haunted Fengraf
 id=451209
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Highland Lake
 id=451210
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Izzet Boilerworks
 id=451211
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Izzet Guildgate
 id=451212
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Jund Panorama
 id=451213
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Jungle Hollow
 id=451214
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Jwar Isle Refuge
 id=451215
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Kazandu Refuge
 id=451216
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Khalni Garden
 id=451217
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Krosan Verge
 id=451218
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Lonely Sandbar
 id=451219
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Meandering River
 id=451220
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Mortuary Mire
 id=451221
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Mosswort Bridge
 id=451222
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Mountain Valley
 id=451223
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Myriad Landscape
 id=451224
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=New Benalia
 id=451225
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Orzhov Basilica
 id=451226
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Orzhov Guildgate
 id=451227
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Rakdos Carnarium
 id=451228
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Rocky Tar Pit
 id=451229
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Savage Lands
 id=451230
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Scoured Barrens
 id=451231
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Seaside Citadel
 id=451232
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Seat of the Synod
 id=451233
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Secluded Steppe
 id=451234
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Sejiri Refuge
 id=451235
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Selesnya Sanctuary
 id=451236
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Simic Growth Chamber
 id=451237
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Submerged Boneyard
 id=451238
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Swiftwater Cliffs
 id=451239
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Temple of the False God
 id=451240
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Terramorphic Expanse
 id=451241
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Thornwood Falls
 id=451242
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Tranquil Cove
 id=451243
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Tranquil Expanse
 id=451244
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Tranquil Thicket
 id=451245
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Warped Landscape
 id=451246
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Woodland Stream
 id=451247
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Plains
 id=451248
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Plains
 id=451249
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Plains
 id=451250
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Island
 id=451251
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Island
 id=451252
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Island
 id=451253
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Swamp
 id=451254
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Swamp
 id=451255
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Swamp
 id=451256
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Mountain
 id=451257
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Mountain
 id=451258
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Mountain
 id=451259
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Forest
 id=451260
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Forest
 id=451261
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Forest
 id=451262
-rarity=M
-[/card]
\ No newline at end of file
+rarity=L
+[/card]
diff --git a/projects/mtg/bin/Res/sets/DOM/_cards.dat b/projects/mtg/bin/Res/sets/DOM/_cards.dat
index b592be997..6c0e34cf3 100644
--- a/projects/mtg/bin/Res/sets/DOM/_cards.dat
+++ b/projects/mtg/bin/Res/sets/DOM/_cards.dat
@@ -12,97 +12,97 @@ rarity=M
 [card]
 primitive=Adamant Will
 id=442890
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Aven Sentry
 id=442891
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Baird, Steward of Argive
 id=442892
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Benalish Honor Guard
 id=442893
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Benalish Marshal
 id=442894
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Blessed Light
 id=442895
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Board the Weatherlight
 id=442896
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Call the Cavalry
 id=442897
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Charge
 id=442898
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=D'Avenant Trapper
 id=442899
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Danitha Capashen, Paragon
 id=442900
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Daring Archaeologist
 id=442901
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Dauntless Bodyguard
 id=442902
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Dub
 id=442903
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Evra, Halcyon Witness
 id=442904
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Excavation Elephant
 id=442905
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Fall of the Thran
 id=442906
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Gideon's Reproach
 id=442907
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Healing Grace
 id=442908
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=History of Benalia
@@ -112,22 +112,22 @@ rarity=M
 [card]
 primitive=Invoke the Divine
 id=442910
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Knight of Grace
 id=442911
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Knight of New Benalia
 id=442912
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Kwende, Pride of Femeref
 id=442913
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Lyra Dawnbringer
@@ -137,162 +137,162 @@ rarity=M
 [card]
 primitive=Mesa Unicorn
 id=442915
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=On Serra's Wings
 id=442916
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Pegasus Courser
 id=442917
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Sanctum Spirit
 id=442918
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Seal Away
 id=442919
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Sergeant-at-Arms
 id=442920
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Serra Angel
 id=442921
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Serra Disciple
 id=442922
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Shalai, Voice of Plenty
 id=442923
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Teshar, Ancestor's Apostle
 id=442924
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Tragic Poet
 id=442925
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Triumph of Gerrard
 id=442926
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Urza's Ruinous Blast
 id=442927
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Academy Drake
 id=442928
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Academy Journeymage
 id=442929
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=The Antiquities War
 id=442930
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Arcane Flight
 id=442931
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Artificer's Assistant
 id=442932
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Befuddle
 id=442933
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Blink of an Eye
 id=442934
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Cloudreader Sphinx
 id=442935
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Cold-Water Snapper
 id=442936
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Curator's Ward
 id=442937
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Deep Freeze
 id=442938
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Diligent Excavator
 id=442939
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Divination
 id=442940
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Homarid Explorer
 id=442941
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=In Bolas's Clutches
 id=442942
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Karn's Temporal Sundering
 id=442943
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Merfolk Trickster
 id=442944
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=The Mirari Conjecture
 id=442945
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Naban, Dean of Iteration
 id=442946
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Naru Meha, Master Wizard
@@ -302,132 +302,132 @@ rarity=M
 [card]
 primitive=Opt
 id=442948
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Precognition Field
 id=442949
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Relic Runner
 id=442950
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Rescue
 id=442951
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Sage of Lat-Nam
 id=442952
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Sentinel of the Pearl Trident
 id=442953
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Slinn Voda, the Rising Deep
 id=442954
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Syncopate
 id=442955
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Tempest Djinn
 id=442956
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Tetsuko Umezawa, Fugitive
 id=442957
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Time of Ice
 id=442958
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Tolarian Scholar
 id=442959
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Unwind
 id=442960
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Vodalian Arcanist
 id=442961
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Weight of Memory
 id=442962
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Wizard's Retort
 id=442963
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Zahid, Djinn of the Lamp
 id=442964
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Blessing of Belzenlok
 id=442965
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Cabal Evangel
 id=442966
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Cabal Paladin
 id=442967
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Caligo Skin-Witch
 id=442968
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Cast Down
 id=442969
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Chainer's Torment
 id=442970
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Dark Bargain
 id=442971
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Deathbloom Thallid
 id=442972
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Demonic Vigor
 id=442973
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Demonlord Belzenlok
@@ -437,67 +437,67 @@ rarity=M
 [card]
 primitive=Divest
 id=442975
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Dread Shade
 id=442976
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Drudge Sentinel
 id=442977
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=The Eldest Reborn
 id=442978
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Eviscerate
 id=442979
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Feral Abomination
 id=442980
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Final Parting
 id=442981
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Fungal Infection
 id=442982
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Josu Vess, Lich Knight
 id=442983
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Kazarov, Sengir Pureblood
 id=442984
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Knight of Malice
 id=442985
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Lich's Mastery
 id=442986
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Lingering Phantom
 id=442987
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Phyrexian Scriptures
@@ -507,157 +507,157 @@ rarity=M
 [card]
 primitive=Rat Colony
 id=442989
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Rite of Belzenlok
 id=442990
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Settle the Score
 id=442991
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Soul Salvage
 id=442992
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Stronghold Confessor
 id=442993
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Thallid Omnivore
 id=442994
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Thallid Soothsayer
 id=442995
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Torgaar, Famine Incarnate
 id=442996
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Urgoros, the Empty One
 id=442997
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Vicious Offering
 id=442998
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Whisper, Blood Liturgist
 id=442999
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Windgrace Acolyte
 id=443000
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Yargle, Glutton of Urborg
 id=443001
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Yawgmoth's Vile Offering
 id=443002
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Bloodstone Goblin
 id=443003
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Champion of the Flame
 id=443004
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Fervent Strike
 id=443005
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Fiery Intervention
 id=443006
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Fight with Fire
 id=443007
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Fire Elemental
 id=443008
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Firefist Adept
 id=443009
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=The First Eruption
 id=443010
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=The Flame of Keld
 id=443011
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Frenzied Rage
 id=443012
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Ghitu Chronicler
 id=443013
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Ghitu Journeymage
 id=443014
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Ghitu Lavarunner
 id=443015
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Goblin Barrage
 id=443016
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Goblin Chainwhirler
 id=443017
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Goblin Warchief
 id=443018
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Haphazard Bombardment
 id=443019
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Jaya Ballard
@@ -667,82 +667,82 @@ rarity=M
 [card]
 primitive=Jaya's Immolating Inferno
 id=443021
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Keldon Overseer
 id=443022
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Keldon Raider
 id=443023
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Keldon Warcaller
 id=443024
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Orcish Vandal
 id=443025
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Radiating Lightning
 id=443026
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Rampaging Cyclops
 id=443027
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Run Amok
 id=443028
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Seismic Shift
 id=443029
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Shivan Fire
 id=443030
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Siege-Gang Commander
 id=443031
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Skirk Prospector
 id=443032
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Skizzik
 id=443033
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Squee, the Immortal
 id=443034
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Two-Headed Giant
 id=443035
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Valduk, Keeper of the Flame
 id=443036
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Verix Bladewing
@@ -752,122 +752,122 @@ rarity=M
 [card]
 primitive=Warcry Phoenix
 id=443038
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Warlord's Fury
 id=443039
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Wizard's Lightning
 id=443040
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Adventurous Impulse
 id=443041
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Ancient Animus
 id=443042
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Arbor Armament
 id=443043
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Baloth Gorger
 id=443044
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Broken Bond
 id=443045
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Corrosive Ooze
 id=443046
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Elfhame Druid
 id=443047
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Fungal Plots
 id=443048
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Gaea's Blessing
 id=443049
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Gaea's Protector
 id=443050
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Gift of Growth
 id=443051
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Grow from the Ashes
 id=443052
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Grunn, the Lonely King
 id=443053
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Kamahl's Druidic Vow
 id=443054
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Krosan Druid
 id=443055
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Llanowar Elves
 id=443056
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Llanowar Envoy
 id=443057
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Llanowar Scout
 id=443058
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Mammoth Spider
 id=443059
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Marwyn, the Nurturer
 id=443060
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=The Mending of Dominaria
 id=443061
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Multani, Yavimaya's Avatar
@@ -877,92 +877,92 @@ rarity=M
 [card]
 primitive=Nature's Spiral
 id=443063
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Pierce the Sky
 id=443064
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Primordial Wurm
 id=443065
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Saproling Migration
 id=443066
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Song of Freyalise
 id=443067
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Spore Swarm
 id=443068
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Sporecrown Thallid
 id=443069
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Steel Leaf Champion
 id=443070
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Sylvan Awakening
 id=443071
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Territorial Allosaurus
 id=443072
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Thorn Elemental
 id=443073
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Untamed Kavu
 id=443074
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Verdant Force
 id=443075
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Wild Onslaught
 id=443076
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Yavimaya Sapherd
 id=443077
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Adeliz, the Cinder Wind
 id=443078
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Arvad the Cursed
 id=443079
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Aryel, Knight of Windgrace
 id=443080
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Darigaaz Reincarnated
@@ -972,17 +972,17 @@ rarity=M
 [card]
 primitive=Garna, the Bloodflame
 id=443082
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Grand Warlord Radha
 id=443083
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Hallar, the Firefletcher
 id=443084
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Jhoira, Weatherlight Captain
@@ -992,7 +992,7 @@ rarity=M
 [card]
 primitive=Jodah, Archmage Eternal
 id=443086
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Muldrotha, the Gravetide
@@ -1002,37 +1002,37 @@ rarity=M
 [card]
 primitive=Oath of Teferi
 id=443088
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Primevals' Glorious Rebirth
 id=443089
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Raff Capashen, Ship's Mage
 id=443090
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Rona, Disciple of Gix
 id=443091
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Shanna, Sisay's Legacy
 id=443092
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Slimefoot, the Stowaway
 id=443093
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Tatyova, Benthic Druid
 id=443094
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Teferi, Hero of Dominaria
@@ -1042,82 +1042,82 @@ rarity=M
 [card]
 primitive=Tiana, Ship's Caretaker
 id=443096
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Aesthir Glider
 id=443097
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Amaranthine Wall
 id=443098
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Blackblade Reforged
 id=443099
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Bloodtallow Candle
 id=443100
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Damping Sphere
 id=443101
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Forebear's Blade
 id=443102
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Gilded Lotus
 id=443103
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Guardians of Koilos
 id=443104
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Helm of the Host
 id=443105
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Howling Golem
 id=443106
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Icy Manipulator
 id=443107
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Jhoira's Familiar
 id=443108
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Jousting Lance
 id=443109
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Juggernaut
 id=443110
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Mishra's Self-Replicator
 id=443111
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Mox Amber
@@ -1127,62 +1127,62 @@ rarity=M
 [card]
 primitive=Navigator's Compass
 id=443113
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Pardic Wanderer
 id=443114
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Powerstone Shard
 id=443115
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Shield of the Realm
 id=443116
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Short Sword
 id=443117
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Skittering Surveyor
 id=443118
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Sorcerer's Wand
 id=443119
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Sparring Construct
 id=443120
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Thran Temporal Gateway
 id=443121
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Traxos, Scourge of Kroog
 id=443122
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Urza's Tome
 id=443123
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Voltaic Servant
 id=443124
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Weatherlight
@@ -1192,162 +1192,162 @@ rarity=M
 [card]
 primitive=Cabal Stronghold
 id=443126
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Clifftop Retreat
 id=443127
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Hinterland Harbor
 id=443128
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Isolated Chapel
 id=443129
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Memorial to Folly
 id=443130
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Memorial to Genius
 id=443131
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Memorial to Glory
 id=443132
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Memorial to Unity
 id=443133
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Memorial to War
 id=443134
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Sulfur Falls
 id=443135
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Woodland Cemetery
 id=443136
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Zhalfirin Void
 id=443137
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Plains
 id=443138
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Plains
 id=443139
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Plains
 id=443140
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Plains
 id=443141
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Island
 id=443142
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Island
 id=443143
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Island
 id=443144
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Island
 id=443145
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Swamp
 id=443146
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Swamp
 id=443147
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Swamp
 id=443148
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Swamp
 id=443149
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Mountain
 id=443150
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Mountain
 id=443151
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Mountain
 id=443152
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Mountain
 id=443153
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Forest
 id=443154
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Forest
 id=443155
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Forest
 id=443156
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Forest
 id=443157
-rarity=M
+rarity=L
 [/card]
 [card]
 primitive=Teferi, Timebender
@@ -1357,22 +1357,22 @@ rarity=M
 [card]
 primitive=Temporal Machinations
 id=445849
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Niambi, Faithful Healer
 id=445850
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Teferi's Sentinel
 id=445851
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Meandering River
 id=445852
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Chandra, Bold Pyromancer
@@ -1382,25 +1382,25 @@ rarity=M
 [card]
 primitive=Chandra's Outburst
 id=445854
-rarity=M
+rarity=R
 [/card]
 [card]
 primitive=Karplusan Hound
 id=445855
-rarity=M
+rarity=U
 [/card]
 [card]
 primitive=Pyromantic Pilgrim
 id=445856
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Timber Gorge
 id=445857
-rarity=M
+rarity=C
 [/card]
 [card]
 primitive=Firesong and Sunspeaker
 id=445958
-rarity=M
+rarity=R
 [/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 2066fbf43..95f4d67d3 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -6189,7 +6189,7 @@ type=Sorcery
 name=Artful Maneuver
 target=creature
 auto=2/2 ueot
-auto=if rebound then moveto(exile) all(this)all(this) and!( transforms((,newability[@rebounded:may activate castcard(normal)])) forever )!
+auto=if rebound then moveto(exile) all(this) and!( transforms((,newability[@rebounded:may activate castcard(normal)])) forever )!
 text=Target creature gets +2/+2 until end of turn. -- Rebound (If you cast this spell from your hand, exile it as it resolves. At the beginning of your next upkeep, you may cast this card from exile without paying its mana cost.)
 mana={1}{W}
 type=Instant
@@ -12937,9 +12937,7 @@ subtype=Aura
 [/card]
 [card]
 name=Blue Sun's Zenith
-#target=player
-auto=choice name(You draw X) draw:X controller
-auto=choice name(Opponent draws) draw:X target(opponent)
+auto=draw:X target(player)
 alias=135262
 text=Target player draws X cards. Shuffle Blue Sun's Zenith into its owner's library.
 mana={X}{U}{U}{U}
@@ -14402,10 +14400,7 @@ type=Sorcery
 [/card]
 [card]
 name=Braingeyser
-#target=player
-#auto=draw:X
-auto=choice name(You draw X) draw:X controller
-auto=choice name(Opponent draws) draw:X target(opponent)
+auto=draw:X target(player)
 text=Target player draws X cards.
 mana={X}{U}{U}
 type=Sorcery
@@ -21095,7 +21090,7 @@ subtype=Aura
 [/card]
 [card]
 name=Cloven Casting
-auto=@movedto(instant,sorcery[multicolor]|mystack):target(trigger[to]<1>) pay[[{1}]] name(copy spell) activate name(copy spell) castcard(copied noevent)
+auto=@movedto(instant,sorcery[multicolor]|mystack):all(trigger[to]<1>) transforms((,newability[pay[[{1}]] name(copy spell) activate name(copy spell) castcard(copied noevent)])) forever
 text=Whenever you cast a multicolored instant or sorcery spell, you may pay {1}. If you do, copy that spell. You may choose new targets for the copy.
 mana={5}{U}{R}
 type=Enchantment
@@ -25544,9 +25539,7 @@ toughness=4
 [/card]
 [card]
 name=Damnable Pact
-#target=player
-auto=choice name(You draw) draw:X && life:-X controller
-auto=choice name(Opponent draws) draw:X && life:-X target(opponent)
+auto=choice name(target player) draw:X && life:-X target(player)
 text=Target player draws X cards and loses X life.
 mana={X}{B}{B}
 type=Sorcery
@@ -36121,8 +36114,8 @@ type=Instant
 [/card]
 [card]
 name=Energy Bolt
-auto=choice damage:X opponent
-auto=choice life:X target(player)
+auto=choice name(Damage player) damage:X target(player)
+auto=choice name(Life to player) life:X target(player)
 text=Choose one - Energy Bolt deals X damage to target player; or target player gains X life.
 mana={X}{R}{W}
 type=Sorcery
@@ -38973,8 +38966,8 @@ type=Sorcery
 [/card]
 [card]
 name=Famished Ghoul
-auto={1}{B}{S}:name(opponent's graveyard) target(other *<upto:2>|opponentgraveyard) moveTo(exile)
-auto={1}{B}{S}:name(your graveyard) target(other *<upto:2>|mygraveyard) moveTo(exile)
+auto={1}{B}{S}:name(opponent's graveyard) target(other <upto:2>*|opponentgraveyard) moveTo(exile)
+auto={1}{B}{S}:name(your graveyard) target(other <upto:2>*|mygraveyard) moveTo(exile)
 text={1}{B}, Sacrifice Famished Ghoul: Exile up to two target cards from a single graveyard.
 mana={3}{B}
 type=Creature
@@ -52897,7 +52890,6 @@ type=Enchantment
 [/card]
 [card]
 name=Haunted Dead
-abilities=flying
 auto=token(Spirit,Creature Spirit,1/1,white,flying)
 autograveyard={1}{B}{D(*|myhand)}{D(*|myhand)}:moveto(mybattlefield) and!(tap(noevent))!
 text=When Haunted Dead enters the battlefield, put a 1/1 white Spirit creature token with flying onto the battlefield. -- {1}{B}, Discard two cards: Return Haunted Dead from your graveyard to the battlefield tapped.
@@ -54326,7 +54318,7 @@ toughness=1
 [/card]
 [card]
 name=Hermit of the Natterknolls
-auto=@movedTo(*|opponentstack):draw:1
+auto=@movedTo(*|opponentstack) restriction{during opponent turn}:draw:1
 auto=@each upkeep restriction{lastturn(*|stack)~lessthan~1}:flip(Lone Wolf of the Natterknolls)
 text=Whenever an opponent casts a spell during your turn, draw a card. -- At the beginning of each upkeep, if no spells were cast last turn, transform Hermit of the Natterknolls.
 mana={2}{G}
@@ -56648,7 +56640,7 @@ toughness=4
 [/card]
 [card]
 name=Hyalopterous Lemure
-auto={0}:-1/0 && flying
+auto={0}:-1/0 && flying limit:9
 text={0}: Hyalopterous Lemure gets -1/-0 and gains flying until end of turn.
 mana={4}{B}
 type=Creature
@@ -57897,9 +57889,8 @@ type=Sorcery
 [/card]
 [card]
 name=Increasing Confusion
-target=player
-auto=ifnot gravecast then deplete:X
-auto=if gravecast then deplete:twiceX
+auto=ifnot gravecast then deplete:X target(player)
+auto=if gravecast then deplete:twiceX target(player)
 flashback={X}{U}
 text=Target player puts the top X cards of his or her library into his or her graveyard. If Increasing Confusion was cast from a graveyard, that player puts twice as many cards into his or her graveyard instead. -- Flashback {X}{U} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
 mana={X}{U}
@@ -59223,8 +59214,8 @@ name=Iroas, God of Victory
 abilities=indestructible
 auto=lord(creature|mybattlefield) menace
 auto=preventalldamage to(creature[attacking]|mybattlefield)
-auto=this(variable{Iroas}<7) transforms((removetypes,newability[becomes(Legendary Enchantment God)]))
-auto=this(variable{Iroas}>6) transforms((Legendary Enchantment Creature))
+auto=this(variable{boros}<7) transforms((removetypes,newability[becomes(Legendary Enchantment God)]))
+auto=this(variable{boros}>6) transforms((Legendary Enchantment Creature))
 text=Indestructible -- As long as your devotion to red and white is less than seven, Iroas isn't a creature. -- Creatures you control can't be blocked except by two or more creatures. -- Prevent all damage that would be dealt to attacking creatures you control.
 mana={2}{R}{W}
 type=Legendary Enchantment Creature
@@ -59772,8 +59763,8 @@ subtype=Gate
 [/card]
 [card]
 name=Izzet Guildmage
-auto={2}{U}:name(copy spell) target(instant[manacost<=2]|mystack) castcard(copied noevent)
-auto={2}{R}:name(copy spell) target(sorcery[manacost<=2]|mystack) castcard(copied noevent)
+auto=@movedto(instant[manacost<=2]|mystack):all(trigger[to]<1>) transforms((,newability[pay[[{2}{U}]] name(copy instant) activate name(copy instant) castcard(copied noevent)])) forever
+auto=@movedto(sorcery[manacost<=2]|mystack):all(trigger[to]<1>) transforms((,newability[pay[[{2}{R}]] name(copy sorcery) activate name(copy sorcery) castcard(copied noevent)])) forever
 text=({(u/r)} can be paid with either {U} or {R}.) -- {2}{U}: Copy target instant spell you control with converted mana cost 2 or less. You may choose new targets for the copy. -- {2}{R}: Copy target sorcery spell you control with converted mana cost 2 or less. You may choose new targets for the copy.
 mana={UR}{UR}
 type=Creature
@@ -66129,9 +66120,8 @@ toughness=2
 [/card]
 [card]
 name=Lavalanche
-target=player
-auto=damage:X
-auto=damage:X all(creature|targetedpersonsbattlefield)
+auto=damage:X target(player)
+auto=damage:X all(creature|opponentBattlefield)
 text=Lavalanche deals X damage to target player and each creature he or she controls.
 mana={X}{B}{R}{G}
 type=Sorcery
@@ -67602,8 +67592,8 @@ toughness=1
 [/card]
 [card]
 name=Liliana's Indignation
-target=player
-auto=reveal:x revealzone(mylibrary) optionone all(*|reveal) moveto(ownergraveyard) and!( if cantargetcard(creature|*) then life:-2 targetedplayer )! optiononeend revealend
+auto=choice name(Mode for AI) deplete:x && life:-type:creature:mygraveyard opponent
+auto=choice name(Working Mode) reveal:x revealzone(mylibrary) optionone all(*|reveal) moveto(ownergraveyard) and!( if cantargetcard(creature|*) then life:-2 target(player))! optiononeend revealend
 text=Put the top X cards of your library into your graveyard. Target player loses 2 life for each creature card put into your graveyard this way.
 mana={X}{B}
 type=Sorcery
@@ -68336,7 +68326,7 @@ toughness=1
 [/card]
 [card]
 name=Lone Wolf of the Natterknolls
-auto=@movedTo(*|opponentstack):draw:2
+auto=@movedTo(*|opponentstack) restriction{during opponent turn}:draw:2
 auto=@each upkeep restriction{lastturn(*|stack)~morethan~1}:flip(Hermit of the Natterknolls)
 text=Whenever an opponent casts a spell during your turn, draw two cards. -- At the beginning of each upkeep, if a player cast two or more spells last turn, transform Lone Wolf of the Natterknolls.
 type=Creature
@@ -74167,8 +74157,7 @@ type=Sorcery
 [/card]
 [card]
 name=Mind Shatter
-target=player
-auto=discard:X
+auto=discard:X target(player)
 text=Target player discards X cards at random.
 mana={X}{B}{B}
 type=Sorcery
@@ -74215,8 +74204,7 @@ type=Sorcery
 [/card]
 [card]
 name=Mind Twist
-target=player
-auto=discard:X
+auto=discard:X target(player)
 text=Target player discards X cards at random.
 mana={X}{B}
 type=Sorcery
@@ -74231,9 +74219,8 @@ type=Enchantment
 [/card]
 [card]
 name=Mind Warp
-target=player
-aicode=activate reject notatarget(<prex>*|targetedpersonshand)
-auto=name(look) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(<prex>*|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
+aicode=reject notatarget(<x>*|opponenthand)
+auto=reveal:type:*:opponenthand revealzone(opponenthand) optionone name(choose discards) notatarget(<X>*|reveal) transforms((,newability[moveto(ownerhand) all(other *|reveal)],newability[moveto(ownerhand) and!(reject)!])) ueot optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Look at target player's hand and choose X cards from it. That player discards them.
 mana={X}{3}{B}
 type=Sorcery
@@ -74925,7 +74912,7 @@ toughness=1
 name=Mirrorpool
 auto={t}:add{c}
 auto=tap(noevent)
-auto={2}{c}{t}{s}:name(copy spell) target(instant,sorcery|mystack) castcard(copied noevent)
+auto=@movedto(*[instant;sorcery]|mystack) restriction{type(Mirrorpool[-tapped]|myBattlefield)~morethan~0}:all(trigger[to]<1>) transforms(( ,newability[pay[[{2}{C}]] name(copy spell) activate name(copy spell) castcard(copied noevent) and!(bury notatarget(mirrorpool|myBattlefield)])! )) forever)!
 auto={4}{c}{t}{s}:name(Clone) clone notatarget(other creature|mybattlefield)
 text=Mirrorpool enters the battlefield tapped. -- {T}: Add {C} to your mana pool. -- {2}{C}, {T}, Sacrifice Mirrorpool: Copy target instant or sorcery spell you control. You may choose new targets for the copy. -- {4}{C}, {T}, Sacrifice Mirrorpool: Put a token onto the battlefield that's a copy of target creature you control.
 type=Land
@@ -78594,7 +78581,7 @@ type=Sorcery
 [card]
 name=Natural Connection
 aicode=activate moveTo(myBattlefield) and!(tap(noevent))! target(land[basic]|myLibrary)
-auto=name(search card) reveal:plibrarycount optionone name(choose card) target(land[basic]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield) and!(tap(noevent))!)! afterrevealedend revealend
+auto=name(search card) reveal:plibrarycount optionone name(choose card) target(<1>land[basic]|reveal) moveto(ownerlibrary) and!( becomes(tobecast) ueot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerlibrary) and!( all(*|reveal) moveto(ownerlibrary) and!(shuffle)! )! optiontwoend afterrevealed all(tobecast|mylibrary) moveto(ownerlibrary) and!(moveTo(myBattlefield) and!(tap(noevent))!)! afterrevealedend revealend
 text=Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.
 mana={2}{G}
 type=Instant
@@ -80653,7 +80640,7 @@ toughness=4
 [card]
 name=Nivix Guildmage
 auto={1}{U}{R}:name(draw & discard) ability$!draw:1 _ choice notatarget(*|myhand) reject)!$ controller
-auto={2}{U}{R}:name(copy spell) target(instant,sorcery|mystack) castcard(copied noevent)
+auto=@movedto(*[instant;sorcery]|mystack):all(trigger[to]<1>) transforms((,newability[pay[[{2}{U}{R}]] name(copy spell) activate name(copy spell) castcard(copied noevent)])) forever
 text={1}{U}{R}: Draw a card, then discard a card. -- {2}{U}{R}: Copy target instant or sorcery spell you control. You may choose new targets for the copy.
 mana={U}{R}
 type=Creature
@@ -89696,8 +89683,7 @@ type=Instant
 [/card]
 [card]
 name=Psychic Drain
-target=player
-auto=deplete:x targetedplayer
+auto=deplete:x target(player)
 auto=life:x controller
 text=Target player puts the top X cards of his or her library into his or her graveyard and you gain X life.
 mana={X}{U}{B}
@@ -90278,7 +90264,7 @@ type=Instant
 [/card]
 [card]
 name=Putrid Cyclops
-auto=scry:1 scrycore choice name(-x/-x) all(this) ueot -revealedmana/-revealedmana scrycoreend scryend
+auto=scry:1 scrycore name(-x/-x) all(this) ueot -revealedmana/-revealedmana scrycoreend scryend
 text=When Putrid Cyclops enters the battlefield, scry 1, then reveal the top card of your library. Putrid Cyclops gets -X/-X until end of turn, where X is that card's converted mana cost. (To scry 1, look at the top card of your library, then you may put that card on the bottom of your library.)
 mana={2}{B}
 type=Creature
@@ -91812,8 +91798,7 @@ toughness=6
 [/card]
 [card]
 name=Rakdos's Return
-#target=opponent Game crashes when AI plays a card with cost {X} and that targets a player
-auto=damage:x opponent
+auto=damage:x target(opponent)
 auto=ability$!name(discard) target(<storedx>*|myhand) reject!$ opponent
 text=Rakdos's Return deals X damage to target opponent. That player discards X cards.
 mana={X}{B}{R}
@@ -93070,7 +93055,6 @@ type=Sorcery
 [/card]
 [card]
 name=Reap Intellect
-#target=opponent Game crashes when AI plays a card with cost {X} and that targets a player
 aicode=activate notatarget(<upto:castx>*[-land]|opponenthand) moveto(exile) and!( transforms((,newability[moveTo(exile) all(*[share!name!]|mygraveyard)],newability[moveTo(exile) all(*[share!name!]|myhand)],newability[moveTo(exile) and!(shuffle)! all(*[share!name!]|mylibrary)])) oneshot )!
 auto=reveal:type:*:opponenthand revealzone(opponenthand) optionone name(choose card) notatarget(<upto:castx>*[-land]|reveal) moveto(exile) and!( transforms((,newability[moveTo(exile) all(*[share!name!]|mygraveyard)],newability[moveTo(exile) all(*[share!name!]|myhand)],newability[moveTo(exile) and!(shuffle)! all(*[share!name!]|mylibrary)])) oneshot )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target opponent reveals his or her hand. You choose up to X nonland cards from it and exile them. For each card exiled this way, search that player's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles his or her library.
@@ -95661,7 +95645,7 @@ type=Instant
 [card]
 name=Riku of Two Reflections
 mana={2}{U}{R}{G}
-auto=@movedto(*[instant;sorcery]|mystack):target(trigger[to]<1>) pay[[{U}{R}]] name(copy spell) activate name(copy spell) castcard(copied noevent)
+auto=@movedto(*[instant;sorcery]|mystack):all(trigger[to]<1>) transforms((,newability[pay[[{U}{R}]] name(copy spell) activate name(copy spell) castcard(copied noevent)])) forever
 auto=@movedto(other creature[-token]|mybattlefield):all(trigger[to]) pay[[{G}{U}]] clone
 type=Legendary Creature
 subtype=Human Wizard
@@ -114852,8 +114836,7 @@ subtype=Arcane
 [/card]
 [card]
 name=Stream of Life
-target=player
-auto=life:X
+auto=life:X target(player)
 text=Target player gains X life.
 mana={X}{G}
 type=Sorcery
@@ -115039,8 +115022,7 @@ toughness=2
 [/card]
 [card]
 name=Stroke of Genius
-target=player
-auto=draw:X
+auto=draw:X target(player)
 text=Target player draws X cards.
 mana={X}{2}{U}
 type=Instant
@@ -128286,9 +128268,8 @@ type=Land
 [/card]
 [card]
 name=Venarian Glimmer
-target=player
-aicode=activate reject notatarget(*[-land;manacost<=castx]|targetedpersonshand)
-auto=reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) notatarget(<1>*[-land;manacost<=castx]|reveal) transforms((,newability[moveto(ownerhand) all(other *|reveal)],newability[moveto(ownerhand) and!(reject)!])) ueot optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
+aicode=activate reject notatarget(*[-land;manacost<=castx]|opponenthand)
+auto=reveal:type:*:opponenthand revealzone(opponenthand) optionone name(choose discards) notatarget(<1>*[-land;manacost<=castx]|reveal) transforms((,newability[moveto(ownerhand) all(other *|reveal)],newability[moveto(ownerhand) and!(reject)!])) ueot optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend
 text=Target player reveals his or her hand. You choose a nonland card with converted mana cost X or less from it. That player discards that card.
 mana={X}{U}
 type=Instant
@@ -129984,7 +129965,7 @@ toughness=2
 [/card]
 [card]
 name=Viscid Lemures
-auto={0}:-1/-0 && swampwalk
+auto={0}:-1/-0 && swampwalk limit:9
 text={0}: Viscid Lemures gets -1/-0 and gains swampwalk until end of turn.
 mana={4}{B}
 type=Creature