diff --git a/projects/mtg/bin/Res/sets/M21/_cards.dat b/projects/mtg/bin/Res/sets/M21/_cards.dat
index 8aaecde53..fa135c770 100644
--- a/projects/mtg/bin/Res/sets/M21/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M21/_cards.dat
@@ -3,7 +3,7 @@ author=Wagic Team
 name=Core Set: Magic 2021
 orderindex=COR-K.M21
 year=2020-07-03
-total=319
+total=397
 [/meta]
 [card]
 primitive=Dog Rin
@@ -1338,17 +1338,17 @@ rarity=R
 [card]
 primitive=Bloodfell Caves
 id=485566
-rarity=L
+rarity=C
 [/card]
 [card]
 primitive=Blossoming Sands
 id=485567
-rarity=L
+rarity=C
 [/card]
 [card]
 primitive=Dismal Backwater
 id=485568
-rarity=L
+rarity=C
 [/card]
 [card]
 primitive=Fabled Passage
@@ -1358,7 +1358,7 @@ rarity=R
 [card]
 primitive=Jungle Hollow
 id=485570
-rarity=L
+rarity=C
 [/card]
 [card]
 primitive=Radiant Fountain
@@ -1368,17 +1368,17 @@ rarity=C
 [card]
 primitive=Rugged Highlands
 id=485572
-rarity=L
+rarity=C
 [/card]
 [card]
 primitive=Scoured Barrens
 id=485573
-rarity=L
+rarity=C
 [/card]
 [card]
 primitive=Swiftwater Cliffs
 id=485574
-rarity=L
+rarity=C
 [/card]
 [card]
 primitive=Temple of Epiphany
@@ -1408,17 +1408,17 @@ rarity=R
 [card]
 primitive=Thornwood Falls
 id=485580
-rarity=L
+rarity=C
 [/card]
 [card]
 primitive=Tranquil Cove
 id=485581
-rarity=L
+rarity=C
 [/card]
 [card]
 primitive=Wind-Scarred Crag
 id=485582
-rarity=L
+rarity=C
 [/card]
 [card]
 primitive=Plains
@@ -1496,6 +1496,231 @@ id=488475
 rarity=L
 [/card]
 [card]
+primitive=Teferi, Master of Time
+id=489165
+rarity=M
+[/card]
+[card]
+primitive=Teferi, Master of Time
+id=489166
+rarity=M
+[/card]
+[card]
+primitive=Teferi, Master of Time
+id=489167
+rarity=M
+[/card]
+[card]
+primitive=Rin and Seri, Inseparable
+id=489663
+rarity=M
+[/card]
+[card]
+primitive=Ugin, the Spirit Dragon
+id=488173
+rarity=M
+[/card]
+[card]
+primitive=Basri Ket
+id=488174
+rarity=M
+[/card]
+[card]
+primitive=Teferi, Master of Time
+id=488175
+rarity=M
+[/card]
+[card]
+primitive=Liliana, Waker of the Dead
+id=488176
+rarity=M
+[/card]
+[card]
+primitive=Chandra, Heart of Fire
+id=488177
+rarity=M
+[/card]
+[card]
+primitive=Garruk, Unleashed
+id=488178
+rarity=M
+[/card]
+[card]
+primitive=Ugin, the Spirit Dragon
+id=488901
+rarity=M
+[/card]
+[card]
+primitive=Basri Ket
+id=488902
+rarity=M
+[/card]
+[card]
+primitive=Basri's Acolyte
+id=488903
+rarity=C
+[/card]
+[card]
+primitive=Basri's Lieutenant
+id=488904
+rarity=R
+[/card]
+[card]
+primitive=Basri's Solidarity
+id=488905
+rarity=U
+[/card]
+[card]
+primitive=Teferi, Master of Time
+id=488906
+rarity=M
+[/card]
+[card]
+primitive=Teferi, Master of Time
+id=488907
+rarity=M
+[/card]
+[card]
+primitive=Teferi, Master of Time
+id=488908
+rarity=M
+[/card]
+[card]
+primitive=Teferi, Master of Time
+id=488909
+rarity=M
+[/card]
+[card]
+primitive=Teferi's Ageless Insight
+id=488910
+rarity=R
+[/card]
+[card]
+primitive=Teferi's Protege
+id=488911
+rarity=C
+[/card]
+[card]
+primitive=Teferi's Tutelage
+id=488912
+rarity=U
+[/card]
+[card]
+primitive=Liliana, Waker of the Dead
+id=488913
+rarity=M
+[/card]
+[card]
+primitive=Liliana's Devotee
+id=488914
+rarity=U
+[/card]
+[card]
+primitive=Liliana's Standard Bearer
+id=488915
+rarity=R
+[/card]
+[card]
+primitive=Liliana's Steward
+id=488916
+rarity=C
+[/card]
+[card]
+primitive=Chandra, Heart of Fire
+id=488917
+rarity=M
+[/card]
+[card]
+primitive=Chandra's Incinerator
+id=488918
+rarity=R
+[/card]
+[card]
+primitive=Chandra's Magmutt
+id=488919
+rarity=C
+[/card]
+[card]
+primitive=Chandra's Pyreling
+id=488920
+rarity=U
+[/card]
+[card]
+primitive=Garruk, Unleashed
+id=488921
+rarity=M
+[/card]
+[card]
+primitive=Garruk's Gorehorn
+id=488922
+rarity=C
+[/card]
+[card]
+primitive=Garruk's Harbinger
+id=488923
+rarity=R
+[/card]
+[card]
+primitive=Garruk's Uprising
+id=488924
+rarity=U
+[/card]
+[card]
+primitive=Plains
+id=488846
+rarity=L
+[/card]
+[card]
+primitive=Island
+id=488847
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=488848
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=488849
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=488850
+rarity=L
+[/card]
+[card]
+primitive=Containment Priest
+id=488395
+rarity=R
+[/card]
+[card]
+primitive=Grim Tutor
+id=488396
+rarity=M
+[/card]
+[card]
+primitive=Massacre Wurm
+id=488397
+rarity=M
+[/card]
+[card]
+primitive=Cultivate
+id=488398
+rarity=R
+[/card]
+[card]
+primitive=Scavenging Ooze
+id=488399
+rarity=R
+[/card]
+[card]
+primitive=Solemn Simulacrum
+id=488400
+rarity=R
+[/card]
+[card]
 primitive=Basri, Devoted Paladin
 id=488626
 rarity=M
@@ -1596,7 +1821,264 @@ id=488645
 rarity=C
 [/card]
 [card]
-primitive=Rin and Seri, Inseparable
-id=489663
+primitive=Baneslayer Angel
+id=488239
 rarity=M
 [/card]
+[card]
+primitive=Glorious Anthem
+id=488240
+rarity=R
+[/card]
+[card]
+primitive=Idol of Endurance
+id=488241
+rarity=R
+[/card]
+[card]
+primitive=Mangara, the Diplomat
+id=488242
+rarity=M
+[/card]
+[card]
+primitive=Nine Lives
+id=488243
+rarity=R
+[/card]
+[card]
+primitive=Pack Leader
+id=488244
+rarity=R
+[/card]
+[card]
+primitive=Runed Halo
+id=488245
+rarity=R
+[/card]
+[card]
+primitive=Speaker of the Heavens
+id=488246
+rarity=R
+[/card]
+[card]
+primitive=Barrin, Tolarian Archmage
+id=488247
+rarity=R
+[/card]
+[card]
+primitive=Discontinuity
+id=488248
+rarity=M
+[/card]
+[card]
+primitive=Ghostly Pilferer
+id=488249
+rarity=R
+[/card]
+[card]
+primitive=Pursued Whale
+id=488250
+rarity=R
+[/card]
+[card]
+primitive=See the Truth
+id=488251
+rarity=R
+[/card]
+[card]
+primitive=Shacklegeist
+id=488252
+rarity=R
+[/card]
+[card]
+primitive=Stormwing Entity
+id=488253
+rarity=R
+[/card]
+[card]
+primitive=Sublime Epiphany
+id=488254
+rarity=R
+[/card]
+[card]
+primitive=Demonic Embrace
+id=488255
+rarity=R
+[/card]
+[card]
+primitive=Hooded Blightfang
+id=488256
+rarity=R
+[/card]
+[card]
+primitive=Kaervek, the Spiteful
+id=488257
+rarity=R
+[/card]
+[card]
+primitive=Necromentia
+id=488258
+rarity=R
+[/card]
+[card]
+primitive=Peer into the Abyss
+id=488259
+rarity=R
+[/card]
+[card]
+primitive=Thieves' Guild Enforcer
+id=488260
+rarity=R
+[/card]
+[card]
+primitive=Vito, Thorn of the Dusk Rose
+id=488261
+rarity=R
+[/card]
+[card]
+primitive=Brash Taunter
+id=488262
+rarity=R
+[/card]
+[card]
+primitive=Conspicuous Snoop
+id=488263
+rarity=R
+[/card]
+[card]
+primitive=Double Vision
+id=488264
+rarity=R
+[/card]
+[card]
+primitive=Fiery Emancipation
+id=488265
+rarity=M
+[/card]
+[card]
+primitive=Gadrak, the Crown-Scourge
+id=488266
+rarity=R
+[/card]
+[card]
+primitive=Subira, Tulzidi Caravanner
+id=488267
+rarity=R
+[/card]
+[card]
+primitive=Terror of the Peaks
+id=488268
+rarity=M
+[/card]
+[card]
+primitive=Transmogrify
+id=488269
+rarity=R
+[/card]
+[card]
+primitive=Volcanic Salvo
+id=488270
+rarity=R
+[/card]
+[card]
+primitive=Azusa, Lost but Seeking
+id=488271
+rarity=R
+[/card]
+[card]
+primitive=Elder Gargaroth
+id=488272
+rarity=M
+[/card]
+[card]
+primitive=Feline Sovereign
+id=488273
+rarity=R
+[/card]
+[card]
+primitive=Heroic Intervention
+id=488274
+rarity=R
+[/card]
+[card]
+primitive=Jolrael, Mwonvuli Recluse
+id=488275
+rarity=R
+[/card]
+[card]
+primitive=Primal Might
+id=488276
+rarity=R
+[/card]
+[card]
+primitive=Sporeweb Weaver
+id=488277
+rarity=R
+[/card]
+[card]
+primitive=Niambi, Esteemed Speaker
+id=488278
+rarity=R
+[/card]
+[card]
+primitive=Radha, Heart of Keld
+id=488279
+rarity=R
+[/card]
+[card]
+primitive=Sanctum of All
+id=488280
+rarity=R
+[/card]
+[card]
+primitive=Chromatic Orrery
+id=488281
+rarity=M
+[/card]
+[card]
+primitive=Mazemind Tome
+id=488282
+rarity=R
+[/card]
+[card]
+primitive=Sparkhunter Masticore
+id=488283
+rarity=R
+[/card]
+[card]
+primitive=Animal Sanctuary
+id=488284
+rarity=R
+[/card]
+[card]
+primitive=Fabled Passage
+id=488285
+rarity=R
+[/card]
+[card]
+primitive=Temple of Epiphany
+id=488286
+rarity=R
+[/card]
+[card]
+primitive=Temple of Malady
+id=488287
+rarity=R
+[/card]
+[card]
+primitive=Temple of Mystery
+id=488288
+rarity=R
+[/card]
+[card]
+primitive=Temple of Silence
+id=488289
+rarity=R
+[/card]
+[card]
+primitive=Temple of Triumph
+id=488290
+rarity=R
+[/card]
+
+