diff --git a/projects/mtg/bin/Res/sets/10E/_cards.dat b/projects/mtg/bin/Res/sets/10E/_cards.dat
index 64df5dd92..19e38d054 100644
--- a/projects/mtg/bin/Res/sets/10E/_cards.dat
+++ b/projects/mtg/bin/Res/sets/10E/_cards.dat
@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=10th Edition
+name=Tenth Edition
 year=2007
+total=383
 [/meta]
 [card]
 primitive=Abundance
@@ -59,6 +60,11 @@ id=129465
 rarity=U
 [/card]
 [card]
+primitive=Angel's Feather
+id=129466
+rarity=U
+[/card]
+[card]
 primitive=Angelic Blessing
 id=129711
 rarity=C
@@ -74,11 +80,6 @@ id=129671
 rarity=C
 [/card]
 [card]
-primitive=Angel's Feather
-id=129466
-rarity=U
-[/card]
-[card]
 primitive=Arcane Teachings
 id=130530
 rarity=U
@@ -574,16 +575,16 @@ id=134762
 rarity=C
 [/card]
 [card]
-primitive=Furnace of Rath
-id=129566
-rarity=R
-[/card]
-[card]
 primitive=Furnace Whelp
 id=130386
 rarity=U
 [/card]
 [card]
+primitive=Furnace of Rath
+id=129566
+rarity=R
+[/card]
+[card]
 primitive=Gaea's Herald
 id=129789
 rarity=R
@@ -959,16 +960,16 @@ id=135272
 rarity=R
 [/card]
 [card]
-primitive=Might of Oaks
-id=129642
-rarity=R
-[/card]
-[card]
 primitive=Might Weaver
 id=130996
 rarity=U
 [/card]
 [card]
+primitive=Might of Oaks
+id=129642
+rarity=R
+[/card]
+[card]
 primitive=Millstone
 id=129643
 rarity=R
diff --git a/projects/mtg/bin/Res/sets/2ED/_cards.dat b/projects/mtg/bin/Res/sets/2ED/_cards.dat
index c5f62cefa..79c829d31 100644
--- a/projects/mtg/bin/Res/sets/2ED/_cards.dat
+++ b/projects/mtg/bin/Res/sets/2ED/_cards.dat
@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=2nd Edition
+name=Unlimited Edition
 year=1993
+total=302
 [/meta]
 [card]
 primitive=Air Elemental
@@ -460,7 +461,7 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
-id=890
+id=888
 rarity=L
 [/card]
 [card]
@@ -470,7 +471,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=888
+id=890
 rarity=L
 [/card]
 [card]
@@ -644,8 +645,13 @@ id=756
 rarity=C
 [/card]
 [card]
+primitive=Island Sanctuary
+id=854
+rarity=R
+[/card]
+[card]
 primitive=Island
-id=896
+id=894
 rarity=L
 [/card]
 [card]
@@ -655,15 +661,10 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=894
+id=896
 rarity=L
 [/card]
 [card]
-primitive=Island Sanctuary
-id=854
-rarity=R
-[/card]
-[card]
 primitive=Ivory Cup
 id=619
 rarity=U
@@ -845,7 +846,7 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=893
+id=891
 rarity=L
 [/card]
 [card]
@@ -855,7 +856,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=891
+id=893
 rarity=L
 [/card]
 [card]
@@ -975,7 +976,7 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=899
+id=897
 rarity=L
 [/card]
 [card]
@@ -985,7 +986,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=897
+id=899
 rarity=L
 [/card]
 [card]
@@ -1104,13 +1105,13 @@ id=866
 rarity=C
 [/card]
 [card]
-primitive=Savannah
-id=881
+primitive=Savannah Lions
+id=867
 rarity=R
 [/card]
 [card]
-primitive=Savannah Lions
-id=867
+primitive=Savannah
+id=881
 rarity=R
 [/card]
 [card]
@@ -1240,7 +1241,7 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=877
+id=875
 rarity=L
 [/card]
 [card]
@@ -1250,7 +1251,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=875
+id=877
 rarity=L
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/4ED/_cards.dat b/projects/mtg/bin/Res/sets/4ED/_cards.dat
index 197b62fbc..9dcf0593c 100644
--- a/projects/mtg/bin/Res/sets/4ED/_cards.dat
+++ b/projects/mtg/bin/Res/sets/4ED/_cards.dat
@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=4th Edition
+name=Fourth Edition
 year=1995
+total=378
 [/meta]
 [card]
 primitive=Abomination
@@ -74,13 +75,13 @@ id=2144
 rarity=C
 [/card]
 [card]
-primitive=Armageddon
-id=2320
+primitive=Armageddon Clock
+id=2018
 rarity=R
 [/card]
 [card]
-primitive=Armageddon Clock
-id=2018
+primitive=Armageddon
+id=2320
 rarity=R
 [/card]
 [card]
@@ -509,13 +510,13 @@ id=2041
 rarity=R
 [/card]
 [card]
-primitive=Elder Land Wurm
-id=2339
+primitive=El-Hajjaj
+id=2101
 rarity=R
 [/card]
 [card]
-primitive=El-Hajjaj
-id=2101
+primitive=Elder Land Wurm
+id=2339
 rarity=R
 [/card]
 [card]
@@ -630,7 +631,7 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
-id=2379
+id=2377
 rarity=L
 [/card]
 [card]
@@ -640,7 +641,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=2377
+id=2379
 rarity=L
 [/card]
 [card]
@@ -839,8 +840,18 @@ id=2220
 rarity=C
 [/card]
 [card]
+primitive=Island Fish Jasconius
+id=2161
+rarity=R
+[/card]
+[card]
+primitive=Island Sanctuary
+id=2346
+rarity=R
+[/card]
+[card]
 primitive=Island
-id=2391
+id=2389
 rarity=L
 [/card]
 [card]
@@ -850,20 +861,10 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=2389
+id=2391
 rarity=L
 [/card]
 [card]
-primitive=Island Fish Jasconius
-id=2161
-rarity=R
-[/card]
-[card]
-primitive=Island Sanctuary
-id=2346
-rarity=R
-[/card]
-[card]
 primitive=Ivory Cup
 id=2050
 rarity=U
@@ -1105,7 +1106,7 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=2383
+id=2381
 rarity=L
 [/card]
 [card]
@@ -1115,7 +1116,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=2381
+id=2383
 rarity=L
 [/card]
 [card]
@@ -1245,7 +1246,7 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=2386
+id=2384
 rarity=L
 [/card]
 [card]
@@ -1255,7 +1256,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=2384
+id=2386
 rarity=L
 [/card]
 [card]
@@ -1545,7 +1546,7 @@ rarity=C
 [/card]
 [card]
 primitive=Swamp
-id=2376
+id=2374
 rarity=L
 [/card]
 [card]
@@ -1555,7 +1556,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=2374
+id=2376
 rarity=L
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/5ED/_cards.dat b/projects/mtg/bin/Res/sets/5ED/_cards.dat
index 65cbe4d45..e56d96c8c 100644
--- a/projects/mtg/bin/Res/sets/5ED/_cards.dat
+++ b/projects/mtg/bin/Res/sets/5ED/_cards.dat
@@ -1,9 +1,15 @@
 [meta]
 author=Wagic Team
-name=5th Edition
+name=Fifth Edition
 year=1997
+total=449
 [/meta]
 [card]
+primitive=AEther Storm
+id=3891
+rarity=U
+[/card]
+[card]
 primitive=Abbey Gargoyles
 id=4098
 rarity=U
@@ -19,11 +25,6 @@ id=4175
 rarity=R
 [/card]
 [card]
-primitive=AEther Storm
-id=3891
-rarity=U
-[/card]
-[card]
 primitive=Air Elemental
 id=3892
 rarity=U
@@ -54,16 +55,16 @@ id=3759
 rarity=C
 [/card]
 [card]
-primitive=Angry Mob
-id=4101
-rarity=U
-[/card]
-[card]
 primitive=An-Havva Constable
 id=3960
 rarity=R
 [/card]
 [card]
+primitive=Angry Mob
+id=4101
+rarity=U
+[/card]
+[card]
 primitive=Animate Dead
 id=3823
 rarity=U
@@ -429,6 +430,11 @@ id=3835
 rarity=U
 [/card]
 [card]
+primitive=D'Avenant Archer
+id=4120
+rarity=C
+[/card]
+[card]
 primitive=Dance of Many
 id=3899
 rarity=R
@@ -454,11 +460,6 @@ id=3836
 rarity=C
 [/card]
 [card]
-primitive=D'Avenant Archer
-id=4120
-rarity=C
-[/card]
-[card]
 primitive=Death Speakers
 id=4121
 rarity=C
@@ -734,23 +735,18 @@ id=3976
 rarity=C
 [/card]
 [card]
-primitive=Force of Nature
-id=3977
-rarity=R
-[/card]
-[card]
 primitive=Force Spike
 id=3909
 rarity=C
 [/card]
 [card]
-primitive=Forest
-id=4174
-rarity=L
+primitive=Force of Nature
+id=3977
+rarity=R
 [/card]
 [card]
 primitive=Forest
-id=4173
+id=4171
 rarity=L
 [/card]
 [card]
@@ -760,7 +756,12 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=4171
+id=4173
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=4174
 rarity=L
 [/card]
 [card]
@@ -899,13 +900,13 @@ id=4182
 rarity=U
 [/card]
 [card]
-primitive=Heal
-id=4129
+primitive=Healing Salve
+id=4130
 rarity=C
 [/card]
 [card]
-primitive=Healing Salve
-id=4130
+primitive=Heal
+id=4129
 rarity=C
 [/card]
 [card]
@@ -1054,13 +1055,13 @@ id=3988
 rarity=C
 [/card]
 [card]
-primitive=Island
-id=4202
-rarity=L
+primitive=Island Sanctuary
+id=4136
+rarity=R
 [/card]
 [card]
 primitive=Island
-id=4201
+id=4199
 rarity=L
 [/card]
 [card]
@@ -1070,13 +1071,13 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=4199
+id=4201
 rarity=L
 [/card]
 [card]
-primitive=Island Sanctuary
-id=4136
-rarity=R
+primitive=Island
+id=4202
+rarity=L
 [/card]
 [card]
 primitive=Ivory Cup
@@ -1364,13 +1365,13 @@ id=4072
 rarity=C
 [/card]
 [card]
-primitive=Mountain
-id=4198
-rarity=L
+primitive=Mountain Goat
+id=4073
+rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=4197
+id=4195
 rarity=L
 [/card]
 [card]
@@ -1380,13 +1381,13 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=4195
+id=4197
 rarity=L
 [/card]
 [card]
-primitive=Mountain Goat
-id=4073
-rarity=C
+primitive=Mountain
+id=4198
+rarity=L
 [/card]
 [card]
 primitive=Murk Dwellers
@@ -1545,12 +1546,7 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=4206
-rarity=L
-[/card]
-[card]
-primitive=Plains
-id=4205
+id=4203
 rarity=L
 [/card]
 [card]
@@ -1560,7 +1556,12 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=4203
+id=4205
+rarity=L
+[/card]
+[card]
+primitive=Plains
+id=4206
 rarity=L
 [/card]
 [card]
@@ -1794,16 +1795,16 @@ id=3810
 rarity=U
 [/card]
 [card]
-primitive=Shatter
-id=4086
-rarity=C
-[/card]
-[card]
 primitive=Shatterstorm
 id=4087
 rarity=U
 [/card]
 [card]
+primitive=Shatter
+id=4086
+rarity=C
+[/card]
+[card]
 primitive=Shield Bearer
 id=4159
 rarity=C
@@ -1920,12 +1921,7 @@ rarity=U
 [/card]
 [card]
 primitive=Swamp
-id=4170
-rarity=L
-[/card]
-[card]
-primitive=Swamp
-id=4169
+id=4167
 rarity=L
 [/card]
 [card]
@@ -1935,7 +1931,12 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=4167
+id=4169
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=4170
 rarity=L
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/6ED/_cards.dat b/projects/mtg/bin/Res/sets/6ED/_cards.dat
index ff52f00e5..fc9d8d488 100644
--- a/projects/mtg/bin/Res/sets/6ED/_cards.dat
+++ b/projects/mtg/bin/Res/sets/6ED/_cards.dat
@@ -1,9 +1,15 @@
 [meta]
 author=Wagic Team
-name=6th Edition
+name=Classic Sixth Edition
 year=1999
+total=350
 [/meta]
 [card]
+primitive=AEther Flash
+id=15447
+rarity=U
+[/card]
+[card]
 primitive=Abduction
 id=14526
 rarity=U
@@ -24,11 +30,6 @@ id=14727
 rarity=R
 [/card]
 [card]
-primitive=AEther Flash
-id=15447
-rarity=U
-[/card]
-[card]
 primitive=Agonizing Memories
 id=14586
 rarity=U
@@ -124,13 +125,13 @@ id=14628
 rarity=U
 [/card]
 [card]
-primitive=Blight
-id=15399
+primitive=Blighted Shaman
+id=15385
 rarity=U
 [/card]
 [card]
-primitive=Blighted Shaman
-id=15385
+primitive=Blight
+id=15399
 rarity=U
 [/card]
 [card]
@@ -289,6 +290,11 @@ id=15404
 rarity=R
 [/card]
 [card]
+primitive=D'Avenant Archer
+id=14472
+rarity=C
+[/card]
+[card]
 primitive=Dancing Scimitar
 id=14773
 rarity=R
@@ -304,11 +310,6 @@ id=14552
 rarity=R
 [/card]
 [card]
-primitive=D'Avenant Archer
-id=14472
-rarity=C
-[/card]
-[card]
 primitive=Deflection
 id=16438
 rarity=R
@@ -534,16 +535,16 @@ id=14626
 rarity=C
 [/card]
 [card]
-primitive=Flash
-id=16440
-rarity=R
-[/card]
-[card]
 primitive=Flashfires
 id=16446
 rarity=U
 [/card]
 [card]
+primitive=Flash
+id=16440
+rarity=R
+[/card]
+[card]
 primitive=Flight
 id=14515
 rarity=C
@@ -554,13 +555,13 @@ id=14776
 rarity=R
 [/card]
 [card]
-primitive=Fog
-id=14682
+primitive=Fog Elemental
+id=16433
 rarity=C
 [/card]
 [card]
-primitive=Fog Elemental
-id=16433
+primitive=Fog
+id=14682
 rarity=C
 [/card]
 [card]
@@ -994,6 +995,11 @@ id=15442
 rarity=U
 [/card]
 [card]
+primitive=Mountain Goat
+id=16442
+rarity=C
+[/card]
+[card]
 primitive=Mountain
 id=14745
 rarity=L
@@ -1014,11 +1020,6 @@ id=14748
 rarity=L
 [/card]
 [card]
-primitive=Mountain Goat
-id=16442
-rarity=C
-[/card]
-[card]
 primitive=Mystic Compass
 id=15435
 rarity=U
@@ -1364,16 +1365,16 @@ id=14670
 rarity=C
 [/card]
 [card]
-primitive=Shatter
-id=14614
-rarity=C
-[/card]
-[card]
 primitive=Shatterstorm
 id=11497
 rarity=R
 [/card]
 [card]
+primitive=Shatter
+id=14614
+rarity=C
+[/card]
+[card]
 primitive=Shock
 id=14609
 rarity=C
diff --git a/projects/mtg/bin/Res/sets/7ED/_cards.dat b/projects/mtg/bin/Res/sets/7ED/_cards.dat
index 958dd9c5a..8990f3bd7 100644
--- a/projects/mtg/bin/Res/sets/7ED/_cards.dat
+++ b/projects/mtg/bin/Res/sets/7ED/_cards.dat
@@ -1,9 +1,15 @@
 [meta]
 author=Wagic Team
-name=7th Edition
+name=Seventh Edition
 year=2001
+total=350
 [/meta]
 [card]
+primitive=AEther Flash
+id=25678
+rarity=U
+[/card]
+[card]
 primitive=Abyssal Horror
 id=13111
 rarity=R
@@ -19,11 +25,6 @@ id=11140
 rarity=R
 [/card]
 [card]
-primitive=AEther Flash
-id=25678
-rarity=U
-[/card]
-[card]
 primitive=Agonizing Memories
 id=12994
 rarity=U
diff --git a/projects/mtg/bin/Res/sets/8ED/_cards.dat b/projects/mtg/bin/Res/sets/8ED/_cards.dat
index 044d19759..efb6cacce 100644
--- a/projects/mtg/bin/Res/sets/8ED/_cards.dat
+++ b/projects/mtg/bin/Res/sets/8ED/_cards.dat
@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=8th Edition
+name=Eighth Edition
 year=2003
+total=357
 [/meta]
 [card]
 primitive=Abyssal Specter
@@ -894,16 +895,16 @@ id=45316
 rarity=U
 [/card]
 [card]
-primitive=Merchant of Secrets
-id=45231
-rarity=C
-[/card]
-[card]
 primitive=Merchant Scroll
 id=45275
 rarity=U
 [/card]
 [card]
+primitive=Merchant of Secrets
+id=45231
+rarity=C
+[/card]
+[card]
 primitive=Might of Oaks
 id=45452
 rarity=R
@@ -1274,16 +1275,16 @@ id=45187
 rarity=C
 [/card]
 [card]
-primitive=Sage of Lat-Nam
-id=45269
-rarity=R
-[/card]
-[card]
 primitive=Sage Owl
 id=45226
 rarity=C
 [/card]
 [card]
+primitive=Sage of Lat-Nam
+id=45269
+rarity=R
+[/card]
+[card]
 primitive=Salt Marsh
 id=45492
 rarity=U
@@ -1374,13 +1375,13 @@ id=45494
 rarity=U
 [/card]
 [card]
-primitive=Shock
-id=45352
+primitive=Shock Troops
+id=45350
 rarity=C
 [/card]
 [card]
-primitive=Shock Troops
-id=45350
+primitive=Shock
+id=45352
 rarity=C
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/9ED/_cards.dat b/projects/mtg/bin/Res/sets/9ED/_cards.dat
index 71771658e..516b7e330 100644
--- a/projects/mtg/bin/Res/sets/9ED/_cards.dat
+++ b/projects/mtg/bin/Res/sets/9ED/_cards.dat
@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=9th Edition
+name=Ninth Edition
 year=2005
+total=359
 [/meta]
 [card]
 primitive=Adarkar Wastes
@@ -44,16 +45,16 @@ id=82992
 rarity=U
 [/card]
 [card]
-primitive=Angelic Blessing
-id=84583
-rarity=C
-[/card]
-[card]
 primitive=Angel's Feather
 id=83449
 rarity=U
 [/card]
 [card]
+primitive=Angelic Blessing
+id=84583
+rarity=C
+[/card]
+[card]
 primitive=Annex
 id=84564
 rarity=U
diff --git a/projects/mtg/bin/Res/sets/LEA/_cards.dat b/projects/mtg/bin/Res/sets/LEA/_cards.dat
index fb434fba7..cc04e6adf 100644
--- a/projects/mtg/bin/Res/sets/LEA/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LEA/_cards.dat
@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Limited Edition Alpha
 block=Early
 year=1993
+total=295
 [/meta]
 [card]
 primitive=Air Elemental
@@ -455,12 +457,12 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
-id=289
+id=288
 rarity=L
 [/card]
 [card]
 primitive=Forest
-id=288
+id=289
 rarity=L
 [/card]
 [card]
@@ -634,9 +636,9 @@ id=159
 rarity=C
 [/card]
 [card]
-primitive=Island
-id=293
-rarity=L
+primitive=Island Sanctuary
+id=256
+rarity=R
 [/card]
 [card]
 primitive=Island
@@ -644,9 +646,9 @@ id=292
 rarity=L
 [/card]
 [card]
-primitive=Island Sanctuary
-id=256
-rarity=R
+primitive=Island
+id=293
+rarity=L
 [/card]
 [card]
 primitive=Ivory Cup
@@ -830,12 +832,12 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=291
+id=290
 rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=290
+id=291
 rarity=L
 [/card]
 [card]
@@ -955,12 +957,12 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=295
+id=294
 rarity=L
 [/card]
 [card]
 primitive=Plains
-id=294
+id=295
 rarity=L
 [/card]
 [card]
@@ -1079,13 +1081,13 @@ id=268
 rarity=C
 [/card]
 [card]
-primitive=Savannah
-id=282
+primitive=Savannah Lions
+id=269
 rarity=R
 [/card]
 [card]
-primitive=Savannah Lions
-id=269
+primitive=Savannah
+id=282
 rarity=R
 [/card]
 [card]
@@ -1215,12 +1217,12 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=278
+id=277
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=277
+id=278
 rarity=L
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/LEB/_cards.dat b/projects/mtg/bin/Res/sets/LEB/_cards.dat
index 6abdb0ae5..273d6eb20 100644
--- a/projects/mtg/bin/Res/sets/LEB/_cards.dat
+++ b/projects/mtg/bin/Res/sets/LEB/_cards.dat
@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Limited Edition Beta
 block=Early
 year=1993
+total=302
 [/meta]
 [card]
 primitive=Air Elemental
@@ -460,7 +462,7 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
-id=588
+id=586
 rarity=L
 [/card]
 [card]
@@ -470,7 +472,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=586
+id=588
 rarity=L
 [/card]
 [card]
@@ -644,8 +646,13 @@ id=454
 rarity=C
 [/card]
 [card]
+primitive=Island Sanctuary
+id=552
+rarity=R
+[/card]
+[card]
 primitive=Island
-id=594
+id=592
 rarity=L
 [/card]
 [card]
@@ -655,15 +662,10 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=592
+id=594
 rarity=L
 [/card]
 [card]
-primitive=Island Sanctuary
-id=552
-rarity=R
-[/card]
-[card]
 primitive=Ivory Cup
 id=317
 rarity=U
@@ -845,7 +847,7 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=591
+id=589
 rarity=L
 [/card]
 [card]
@@ -855,7 +857,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=589
+id=591
 rarity=L
 [/card]
 [card]
@@ -975,7 +977,7 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=597
+id=595
 rarity=L
 [/card]
 [card]
@@ -985,7 +987,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=595
+id=597
 rarity=L
 [/card]
 [card]
@@ -1104,13 +1106,13 @@ id=564
 rarity=C
 [/card]
 [card]
-primitive=Savannah
-id=579
+primitive=Savannah Lions
+id=565
 rarity=R
 [/card]
 [card]
-primitive=Savannah Lions
-id=565
+primitive=Savannah
+id=579
 rarity=R
 [/card]
 [card]
@@ -1240,7 +1242,7 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=575
+id=573
 rarity=L
 [/card]
 [card]
@@ -1250,7 +1252,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=573
+id=575
 rarity=L
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/M10/_cards.dat b/projects/mtg/bin/Res/sets/M10/_cards.dat
index d3c646fcd..ed002a48b 100644
--- a/projects/mtg/bin/Res/sets/M10/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M10/_cards.dat
@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=Wagic 2010
+name=Magic 2010
 year=2009
+total=249
 [/meta]
 [card]
 primitive=Acidic Slime
@@ -730,6 +731,11 @@ rarity=U
 [/card]
 [card]
 primitive=Mountain
+id=191401
+rarity=L
+[/card]
+[card]
+primitive=Mountain
 id=191402
 rarity=L
 [/card]
@@ -744,11 +750,6 @@ id=191404
 rarity=L
 [/card]
 [card]
-primitive=Mountain
-id=191401
-rarity=L
-[/card]
-[card]
 primitive=Naturalize
 id=189896
 rarity=C
@@ -815,11 +816,6 @@ rarity=R
 [/card]
 [card]
 primitive=Plains
-id=191395
-rarity=L
-[/card]
-[card]
-primitive=Plains
 id=191382
 rarity=L
 [/card]
@@ -830,6 +826,11 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
+id=191395
+rarity=L
+[/card]
+[card]
+primitive=Plains
 id=191396
 rarity=L
 [/card]
@@ -1060,7 +1061,7 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=191399
+id=191381
 rarity=L
 [/card]
 [card]
@@ -1070,12 +1071,12 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=191381
+id=191398
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=191398
+id=191399
 rarity=L
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/M11/_cards.dat b/projects/mtg/bin/Res/sets/M11/_cards.dat
index 233184b6b..956f9029d 100644
--- a/projects/mtg/bin/Res/sets/M11/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M11/_cards.dat
@@ -1,9 +1,15 @@
 [meta]
 author=Wagic Team
-name=Wagic 2011
+name=Magic 2011
 year=2010
+total=249
 [/meta]
 [card]
+primitive=AEther Adept
+id=205020
+rarity=C
+[/card]
+[card]
 primitive=Acidic Slime
 id=207333
 rarity=U
@@ -14,11 +20,6 @@ id=205072
 rarity=C
 [/card]
 [card]
-primitive=AEther Adept
-id=205020
-rarity=C
-[/card]
-[card]
 primitive=Air Servant
 id=205070
 rarity=U
@@ -49,16 +50,16 @@ id=204980
 rarity=R
 [/card]
 [card]
-primitive=Angelic Arbiter
-id=204975
-rarity=R
-[/card]
-[card]
 primitive=Angel's Feather
 id=206325
 rarity=U
 [/card]
 [card]
+primitive=Angelic Arbiter
+id=204975
+rarity=R
+[/card]
+[card]
 primitive=Arc Runner
 id=204991
 rarity=C
@@ -425,7 +426,12 @@ rarity=C
 [/card]
 [card]
 primitive=Forest
-id=213631
+id=213628
+rarity=L
+[/card]
+[card]
+primitive=Forest
+id=213629
 rarity=L
 [/card]
 [card]
@@ -435,12 +441,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=213628
-rarity=L
-[/card]
-[card]
-primitive=Forest
-id=213629
+id=213631
 rarity=L
 [/card]
 [card]
@@ -595,12 +596,12 @@ rarity=C
 [/card]
 [card]
 primitive=Island
-id=213617
+id=213616
 rarity=L
 [/card]
 [card]
 primitive=Island
-id=213619
+id=213617
 rarity=L
 [/card]
 [card]
@@ -610,7 +611,7 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=213616
+id=213619
 rarity=L
 [/card]
 [card]
@@ -669,13 +670,13 @@ id=204993
 rarity=R
 [/card]
 [card]
-primitive=Leyline of the Void
-id=205013
+primitive=Leyline of Vitality
+id=205031
 rarity=R
 [/card]
 [card]
-primitive=Leyline of Vitality
-id=205031
+primitive=Leyline of the Void
+id=205013
 rarity=R
 [/card]
 [card]
@@ -760,25 +761,25 @@ rarity=R
 [/card]
 [card]
 primitive=Mountain
-id=213625
-rarity=L
-[/card]
-[card]
-primitive=Mountain
-id=213627
-rarity=L
-[/card]
-[card]
-primitive=Mountain
 id=213624
 rarity=L
 [/card]
 [card]
 primitive=Mountain
+id=213625
+rarity=L
+[/card]
+[card]
+primitive=Mountain
 id=213626
 rarity=L
 [/card]
 [card]
+primitive=Mountain
+id=213627
+rarity=L
+[/card]
+[card]
 primitive=Mystifying Maze
 id=204978
 rarity=R
@@ -825,12 +826,12 @@ rarity=R
 [/card]
 [card]
 primitive=Ooze T1
-id=66666666
+id=-2050321
 rarity=T
 [/card]
 [card]
 primitive=Ooze T2
-id=77777777
+id=-2050322
 rarity=T
 [/card]
 [card]
@@ -870,7 +871,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=213615
+id=213613
 rarity=L
 [/card]
 [card]
@@ -880,7 +881,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=213613
+id=213615
 rarity=L
 [/card]
 [card]
@@ -1105,7 +1106,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=213623
+id=213621
 rarity=L
 [/card]
 [card]
@@ -1115,7 +1116,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=213621
+id=213623
 rarity=L
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/M12/_cards.dat b/projects/mtg/bin/Res/sets/M12/_cards.dat
index fb0151983..8660b6961 100644
--- a/projects/mtg/bin/Res/sets/M12/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M12/_cards.dat
@@ -1,9 +1,15 @@
 [meta]
 author=Wagic Team
-name=Wagic 2012
+name=Magic 2012
 year=2011
+total=249
 [/meta]
 [card]
+primitive=AEther Adept
+id=227222
+rarity=C
+[/card]
+[card]
 primitive=Acidic Slime
 id=226906
 rarity=U
@@ -24,11 +30,6 @@ id=220086
 rarity=R
 [/card]
 [card]
-primitive=AEther Adept
-id=227222
-rarity=C
-[/card]
-[card]
 primitive=Alabaster Mage
 id=220264
 rarity=U
@@ -44,11 +45,6 @@ id=220218
 rarity=C
 [/card]
 [card]
-primitive=Angelic Destiny
-id=220230
-rarity=M
-[/card]
-[card]
 primitive=Angel's Feather
 id=221520
 rarity=U
@@ -59,6 +55,11 @@ id=238569
 rarity=C
 [/card]
 [card]
+primitive=Angelic Destiny
+id=220230
+rarity=M
+[/card]
+[card]
 primitive=Arachnus Spinner
 id=220242
 rarity=R
@@ -194,11 +195,6 @@ id=234070
 rarity=R
 [/card]
 [card]
-primitive=Chandra, the Firebrand
-id=220146
-rarity=M
-[/card]
-[card]
 primitive=Chandra's Outrage
 id=226585
 rarity=C
@@ -209,6 +205,11 @@ id=220298
 rarity=R
 [/card]
 [card]
+primitive=Chandra, the Firebrand
+id=220146
+rarity=M
+[/card]
+[card]
 primitive=Chasm Drake
 id=220225
 rarity=C
@@ -454,16 +455,6 @@ id=220103
 rarity=M
 [/card]
 [card]
-primitive=Garruk, Primal Hunter
-id=220100
-rarity=M
-[/card]
-[card]
-primitive=Wurm Token
-id=-22010012
-rarity=T
-[/card]
-[card]
 primitive=Garruk's Companion
 id=226896
 rarity=C
@@ -474,6 +465,16 @@ id=220077
 rarity=R
 [/card]
 [card]
+primitive=Garruk, Primal Hunter
+id=220100
+rarity=M
+[/card]
+[card]
+primitive=Wurm Token
+id=-22010012
+rarity=T
+[/card]
+[card]
 primitive=Giant Spider
 id=233232
 rarity=C
@@ -635,6 +636,11 @@ rarity=L
 [/card]
 [card]
 primitive=Island
+id=244324
+rarity=L
+[/card]
+[card]
+primitive=Island
 id=244325
 rarity=L
 [/card]
@@ -644,16 +650,6 @@ id=244326
 rarity=L
 [/card]
 [card]
-primitive=Island
-id=244324
-rarity=L
-[/card]
-[card]
-primitive=Jace, Memory Adept
-id=238263
-rarity=M
-[/card]
-[card]
 primitive=Jace's Archivist
 id=220244
 rarity=R
@@ -664,6 +660,11 @@ id=227227
 rarity=C
 [/card]
 [card]
+primitive=Jace, Memory Adept
+id=238263
+rarity=M
+[/card]
+[card]
 primitive=Jade Mage
 id=220279
 rarity=U
@@ -785,7 +786,7 @@ rarity=R
 [/card]
 [card]
 primitive=Mountain
-id=244330
+id=244327
 rarity=L
 [/card]
 [card]
@@ -800,7 +801,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=244327
+id=244330
 rarity=L
 [/card]
 [card]
@@ -870,6 +871,11 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
+id=244332
+rarity=L
+[/card]
+[card]
+primitive=Plains
 id=244333
 rarity=L
 [/card]
@@ -879,11 +885,6 @@ id=244334
 rarity=L
 [/card]
 [card]
-primitive=Plains
-id=244332
-rarity=L
-[/card]
-[card]
 primitive=Plummet
 id=233235
 rarity=C
@@ -959,16 +960,16 @@ id=236464
 rarity=R
 [/card]
 [card]
-primitive=Runeclaw Bear
-id=221893
-rarity=C
-[/card]
-[card]
 primitive=Rune-Scarred Demon
 id=220130
 rarity=R
 [/card]
 [card]
+primitive=Runeclaw Bear
+id=221893
+rarity=C
+[/card]
+[card]
 primitive=Rusted Sentinel
 id=220241
 rarity=U
@@ -1110,22 +1111,22 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=244337
-rarity=L
-[/card]
-[card]
-primitive=Swamp
 id=244335
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=244338
+id=244336
 rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=244336
+id=244337
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=244338
 rarity=L
 [/card]
 [card]
@@ -1252,4 +1253,4 @@ rarity=C
 primitive=Zombie Infestation
 id=241860
 rarity=U
-[/card]
\ No newline at end of file
+[/card]
diff --git a/projects/mtg/bin/Res/sets/M13/_cards.dat b/projects/mtg/bin/Res/sets/M13/_cards.dat
index 3343f46ce..f2e8a43ca 100644
--- a/projects/mtg/bin/Res/sets/M13/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M13/_cards.dat
@@ -1,8 +1,9 @@
 [meta]
 author=Wagic Team
-name=Wagic 2013
+name=Magic 2013
 block=Core
 year=2012
+total=249
 [/meta]
 [card]
 primitive=Acidic Slime
@@ -10,31 +11,31 @@ id=265718
 rarity=U
 [/card]
 [card]
-primitive=Ajani, Caller of the Pride
-id=249695
-rarity=M
-[/card]
-[card]
 primitive=Ajani's Sunstriker
 id=259715
 rarity=C
 [/card]
 [card]
+primitive=Ajani, Caller of the Pride
+id=249695
+rarity=M
+[/card]
+[card]
 primitive=Akroma's Memorial
 id=279712
 rarity=M
 [/card]
 [card]
-primitive=Angelic Benediction
-id=279702
-rarity=U
-[/card]
-[card]
 primitive=Angel's Mercy
 id=259714
 rarity=C
 [/card]
 [card]
+primitive=Angelic Benediction
+id=279702
+rarity=U
+[/card]
+[card]
 primitive=Arbor Elf
 id=249840
 rarity=C
@@ -140,16 +141,16 @@ id=279993
 rarity=C
 [/card]
 [card]
-primitive=Chandra, the Firebrand
-id=259205
-rarity=M
-[/card]
-[card]
 primitive=Chandra's Fury
 id=249682
 rarity=C
 [/card]
 [card]
+primitive=Chandra, the Firebrand
+id=259205
+rarity=M
+[/card]
+[card]
 primitive=Chronomaton
 id=259698
 rarity=U
@@ -370,14 +371,19 @@ id=249712
 rarity=U
 [/card]
 [card]
+primitive=Fog Bank
+id=270314
+rarity=U
+[/card]
+[card]
 primitive=Fog
 id=253673
 rarity=C
 [/card]
 [card]
-primitive=Fog Bank
-id=270314
-rarity=U
+primitive=Forest
+id=249718
+rarity=L
 [/card]
 [card]
 primitive=Forest
@@ -391,11 +397,6 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=249718
-rarity=L
-[/card]
-[card]
-primitive=Forest
 id=249721
 rarity=L
 [/card]
@@ -410,16 +411,16 @@ id=288936
 rarity=U
 [/card]
 [card]
-primitive=Garruk, Primal Hunter
-id=253669
-rarity=M
-[/card]
-[card]
 primitive=Garruk's Packleader
 id=253687
 rarity=U
 [/card]
 [card]
+primitive=Garruk, Primal Hunter
+id=253669
+rarity=M
+[/card]
+[card]
 primitive=Gem of Becoming
 id=275727
 rarity=U
@@ -516,11 +517,6 @@ rarity=R
 [/card]
 [card]
 primitive=Island
-id=249725
-rarity=L
-[/card]
-[card]
-primitive=Island
 id=249723
 rarity=L
 [/card]
@@ -531,13 +527,13 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=249726
+id=249725
 rarity=L
 [/card]
 [card]
-primitive=Jace, Memory Adept
-id=254107
-rarity=M
+primitive=Island
+id=249726
+rarity=L
 [/card]
 [card]
 primitive=Jace's Phantasm
@@ -545,6 +541,11 @@ id=249672
 rarity=U
 [/card]
 [card]
+primitive=Jace, Memory Adept
+id=254107
+rarity=M
+[/card]
+[card]
 primitive=Jayemdae Tome
 id=275705
 rarity=U
@@ -575,16 +576,16 @@ id=279699
 rarity=C
 [/card]
 [card]
-primitive=Krenko, Mob Boss
-id=253712
-rarity=R
-[/card]
-[card]
 primitive=Krenko's Command
 id=259213
 rarity=C
 [/card]
 [card]
+primitive=Krenko, Mob Boss
+id=253712
+rarity=R
+[/card]
+[card]
 primitive=Liliana of the Dark Realms
 id=259695
 rarity=M
@@ -641,7 +642,12 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=249730
+id=249727
+rarity=L
+[/card]
+[card]
+primitive=Mountain
+id=249728
 rarity=L
 [/card]
 [card]
@@ -651,12 +657,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=249727
-rarity=L
-[/card]
-[card]
-primitive=Mountain
-id=249728
+id=249730
 rarity=L
 [/card]
 [card]
@@ -731,12 +732,12 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=249732
+id=249731
 rarity=L
 [/card]
 [card]
 primitive=Plains
-id=249734
+id=249732
 rarity=L
 [/card]
 [card]
@@ -746,7 +747,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=249731
+id=249734
 rarity=L
 [/card]
 [card]
@@ -1031,16 +1032,6 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=249740
-rarity=L
-[/card]
-[card]
-primitive=Swamp
-id=249739
-rarity=L
-[/card]
-[card]
-primitive=Swamp
 id=249737
 rarity=L
 [/card]
@@ -1050,21 +1041,31 @@ id=249738
 rarity=L
 [/card]
 [card]
+primitive=Swamp
+id=249739
+rarity=L
+[/card]
+[card]
+primitive=Swamp
+id=249740
+rarity=L
+[/card]
+[card]
 primitive=Switcheroo
 id=253704
 rarity=U
 [/card]
 [card]
+primitive=Talrand's Invocation
+id=254117
+rarity=U
+[/card]
+[card]
 primitive=Talrand, Sky Summoner
 id=253701
 rarity=R
 [/card]
 [card]
-primitive=Talrand's Invocation
-id=254117
-rarity=U
-[/card]
-[card]
 primitive=Thragtusk
 id=249685
 rarity=R
@@ -1235,17 +1236,17 @@ id=253728
 rarity=R
 [/card]
 [card]
-primitive=Yeva, Nature's Herald
-id=249680
-rarity=R
-[/card]
-[card]
 primitive=Yeva's Forcemage
 id=265840
 rarity=C
 [/card]
 [card]
+primitive=Yeva, Nature's Herald
+id=249680
+rarity=R
+[/card]
+[card]
 primitive=Zombie Goliath
 id=276299
 rarity=C
-[/card]
\ No newline at end of file
+[/card]
diff --git a/projects/mtg/bin/Res/sets/M14/_cards.dat b/projects/mtg/bin/Res/sets/M14/_cards.dat
index 8754907cd..ee9dcd082 100644
--- a/projects/mtg/bin/Res/sets/M14/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M14/_cards.dat
@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=Magic 2014
+name=Magic 2014 Core Set
 year=2013
+total=249
 [/meta]
 [card]
 primitive=Academy Raider
@@ -34,16 +35,16 @@ id=370688
 rarity=U
 [/card]
 [card]
-primitive=Ajani, Caller of the Pride
-id=370680
-rarity=M
-[/card]
-[card]
 primitive=Ajani's Chosen
 id=370750
 rarity=R
 [/card]
 [card]
+primitive=Ajani, Caller of the Pride
+id=370680
+rarity=M
+[/card]
+[card]
 primitive=Altar's Reap
 id=370677
 rarity=C
@@ -184,11 +185,6 @@ id=370666
 rarity=C
 [/card]
 [card]
-primitive=Chandra, Pyromaster
-id=370637
-rarity=M
-[/card]
-[card]
 primitive=Chandra's Outrage
 id=370659
 rarity=C
@@ -199,6 +195,11 @@ id=370691
 rarity=R
 [/card]
 [card]
+primitive=Chandra, Pyromaster
+id=370637
+rarity=M
+[/card]
+[card]
 primitive=Charging Griffin
 id=370768
 rarity=C
@@ -449,16 +450,16 @@ id=370590
 rarity=R
 [/card]
 [card]
-primitive=Garruk, Caller of Beasts
-id=370687
-rarity=M
-[/card]
-[card]
 primitive=Garruk's Horde
 id=370684
 rarity=R
 [/card]
 [card]
+primitive=Garruk, Caller of Beasts
+id=370687
+rarity=M
+[/card]
+[card]
 primitive=Giant Growth
 id=370788
 rarity=C
@@ -574,16 +575,16 @@ id=370773
 rarity=L
 [/card]
 [card]
-primitive=Jace, Memory Adept
-id=370728
-rarity=M
-[/card]
-[card]
 primitive=Jace's Mindseeker
 id=370638
 rarity=R
 [/card]
 [card]
+primitive=Jace, Memory Adept
+id=370728
+rarity=M
+[/card]
+[card]
 primitive=Kalonian Hydra
 id=370766
 rarity=M
@@ -829,7 +830,7 @@ id=370656
 rarity=M
 [/card]
 [card]
-primitive=Pyromancer's Guantlet
+primitive=Pyromancer's Gauntlet
 id=370686
 rarity=R
 [/card]
@@ -959,16 +960,16 @@ id=370631
 rarity=U
 [/card]
 [card]
-primitive=Shivan Dragon
-id=370825
-rarity=R
-[/card]
-[card]
 primitive=Shiv's Embrace
 id=370707
 rarity=U
 [/card]
 [card]
+primitive=Shivan Dragon
+id=370825
+rarity=R
+[/card]
+[card]
 primitive=Shock
 id=370654
 rarity=C
@@ -1039,13 +1040,13 @@ id=370676
 rarity=U
 [/card]
 [card]
-primitive=Staff of the Wild Magus
-id=370592
+primitive=Staff of the Sun Magus
+id=370635
 rarity=U
 [/card]
 [card]
-primitive=Staff of the Sun Magus
-id=370635
+primitive=Staff of the Wild Magus
+id=370592
 rarity=U
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/M15/_cards.dat b/projects/mtg/bin/Res/sets/M15/_cards.dat
index bf494208d..36e2f0008 100644
--- a/projects/mtg/bin/Res/sets/M15/_cards.dat
+++ b/projects/mtg/bin/Res/sets/M15/_cards.dat
@@ -1,9 +1,15 @@
 [meta]
 author=Wagic Team
-name=Magic 2015
+name=Magic 2015 Core Set
 year=2014
+total=284
 [/meta]
 [card]
+primitive=AEtherspouts
+id=383178
+rarity=R
+[/card]
+[card]
 primitive=Accursed Spirit
 id=383175
 rarity=C
@@ -24,11 +30,6 @@ id=383177
 rarity=C
 [/card]
 [card]
-primitive=AEtherspouts
-id=383178
-rarity=R
-[/card]
-[card]
 primitive=Aggressive Mining
 id=383179
 rarity=R
@@ -301,7 +302,7 @@ rarity=C
 [card]
 primitive=Elvish Mystic
 id=383229
-rarity=U
+rarity=C
 [/card]
 [card]
 primitive=Encrust
@@ -414,16 +415,16 @@ id=383250
 rarity=U
 [/card]
 [card]
-primitive=Garruk, Apex Predator
-id=383251
-rarity=M
-[/card]
-[card]
 primitive=Garruk's Packleader
 id=383165
 rarity=U
 [/card]
 [card]
+primitive=Garruk, Apex Predator
+id=383251
+rarity=M
+[/card]
+[card]
 primitive=Gather Courage
 id=383252
 rarity=U
@@ -599,16 +600,16 @@ id=383284
 rarity=L
 [/card]
 [card]
-primitive=Jace, the Living Guildpact
-id=383285
-rarity=M
-[/card]
-[card]
 primitive=Jace's Ingenuity
 id=383286
 rarity=U
 [/card]
 [card]
+primitive=Jace, the Living Guildpact
+id=383285
+rarity=M
+[/card]
+[card]
 primitive=Jalira, Master Polymorphist
 id=383287
 rarity=R
@@ -834,16 +835,16 @@ id=383327
 rarity=C
 [/card]
 [card]
-primitive=Nissa, Worldwaker
-id=383328
-rarity=M
-[/card]
-[card]
 primitive=Nissa's Expedition
 id=383329
 rarity=U
 [/card]
 [card]
+primitive=Nissa, Worldwaker
+id=383328
+rarity=M
+[/card]
+[card]
 primitive=Ob Nixilis, Unshackled
 id=383330
 rarity=R
@@ -1134,16 +1135,16 @@ id=383383
 rarity=C
 [/card]
 [card]
-primitive=Sliver Hive
-id=383384
-rarity=R
-[/card]
-[card]
 primitive=Sliver Hivelord
 id=383385
 rarity=M
 [/card]
 [card]
+primitive=Sliver Hive
+id=383384
+rarity=R
+[/card]
+[card]
 primitive=Solemn Offering
 id=383386
 rarity=C
diff --git a/projects/mtg/bin/Res/sets/ORI/_cards.dat b/projects/mtg/bin/Res/sets/ORI/_cards.dat
index cec4b6829..3f91fc559 100644
--- a/projects/mtg/bin/Res/sets/ORI/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ORI/_cards.dat
@@ -1,7 +1,8 @@
 [meta]
-author=Wagic Team 
-name=Magic Origins 
-year=2015 
+author=Wagic Team
+name=Magic Origins
+year=2015
+total=293
 [/meta]
 [card]
 primitive=Abbot of Keral Keep
@@ -19,6 +20,11 @@ id=398578
 rarity=C
 [/card]
 [card]
+primitive=Aegis Angel
+id=401452
+rarity=R
+[/card]
+[card]
 primitive=Aerial Volley
 id=398565
 rarity=C
@@ -39,16 +45,16 @@ id=398640
 rarity=C
 [/card]
 [card]
-primitive=Alhammarret, High Arbiter
-id=398436
-rarity=R
-[/card]
-[card]
 primitive=Alhammarret's Archive
 id=398564
 rarity=M
 [/card]
 [card]
+primitive=Alhammarret, High Arbiter
+id=398436
+rarity=R
+[/card]
+[card]
 primitive=Ampryn Tactician
 id=398603
 rarity=C
@@ -189,16 +195,6 @@ id=398488
 rarity=C
 [/card]
 [card]
-primitive=Chandra, Fire of Kaladesh
-id=398422
-rarity=M
-[/card]
-[card]
-primitive=Chandra, Roaring Flame
-id=398423
-rarity=T
-[/card]
-[card]
 primitive=Chandra's Fury
 id=398632
 rarity=C
@@ -209,6 +205,16 @@ id=398416
 rarity=R
 [/card]
 [card]
+primitive=Chandra, Fire of Kaladesh
+id=398422
+rarity=M
+[/card]
+[card]
+primitive=Chandra, Roaring Flame
+id=398423
+rarity=T
+[/card]
+[card]
 primitive=Charging Griffin
 id=398560
 rarity=C
@@ -319,6 +325,11 @@ id=398580
 rarity=R
 [/card]
 [card]
+primitive=Divine Verdict
+id=401453
+rarity=C
+[/card]
+[card]
 primitive=Dragon Fodder
 id=398647
 rarity=C
@@ -329,14 +340,19 @@ id=398405
 rarity=C
 [/card]
 [card]
+primitive=Dwynen's Elite
+id=398609
+rarity=U
+[/card]
+[card]
 primitive=Dwynen, Gilt-Leaf Daen
 id=398546
 rarity=R
 [/card]
 [card]
-primitive=Dwynen's Elite
-id=398609
-rarity=U
+primitive=Eagle of the Watch
+id=401454
+rarity=C
 [/card]
 [card]
 primitive=Elemental Bond
@@ -414,6 +430,11 @@ id=398497
 rarity=U
 [/card]
 [card]
+primitive=Fiery Hellhound
+id=401463
+rarity=C
+[/card]
+[card]
 primitive=Fiery Impulse
 id=398516
 rarity=C
@@ -429,6 +450,11 @@ id=398547
 rarity=R
 [/card]
 [card]
+primitive=Flesh to Dust
+id=401459
+rarity=C
+[/card]
+[card]
 primitive=Fleshbag Marauder
 id=398625
 rarity=U
@@ -479,16 +505,16 @@ id=398681
 rarity=C
 [/card]
 [card]
-primitive=Gideon, Battle-Forged
-id=398429
-rarity=T
-[/card]
-[card]
 primitive=Gideon's Phalanx
 id=398471
 rarity=R
 [/card]
 [card]
+primitive=Gideon, Battle-Forged
+id=398429
+rarity=T
+[/card]
+[card]
 primitive=Gilt-Leaf Winnower
 id=398495
 rarity=R
@@ -604,6 +630,11 @@ id=398503
 rarity=R
 [/card]
 [card]
+primitive=Into the Void
+id=401456
+rarity=U
+[/card]
+[card]
 primitive=Iroas's Champion
 id=398653
 rarity=U
@@ -629,6 +660,11 @@ id=398664
 rarity=L
 [/card]
 [card]
+primitive=Jace's Sanctum
+id=398614
+rarity=R
+[/card]
+[card]
 primitive=Jace, Telepath Unbound
 id=398435
 rarity=T
@@ -639,11 +675,6 @@ id=398434
 rarity=M
 [/card]
 [card]
-primitive=Jace's Sanctum
-id=398614
-rarity=R
-[/card]
-[card]
 primitive=Jayemdae Tome
 id=398530
 rarity=U
@@ -679,11 +710,6 @@ id=398443
 rarity=R
 [/card]
 [card]
-primitive=Kytheon, Hero of Akros
-id=398428
-rarity=M
-[/card]
-[card]
 primitive=Kytheon's Irregulars
 id=398561
 rarity=R
@@ -694,6 +720,11 @@ id=398470
 rarity=C
 [/card]
 [card]
+primitive=Kytheon, Hero of Akros
+id=398428
+rarity=M
+[/card]
+[card]
 primitive=Languish
 id=398597
 rarity=R
@@ -754,6 +785,11 @@ id=398496
 rarity=U
 [/card]
 [card]
+primitive=Mahamoti Djinn
+id=401457
+rarity=R
+[/card]
+[card]
 primitive=Malakir Cullblade
 id=398556
 rarity=U
@@ -789,6 +825,11 @@ id=398630
 rarity=C
 [/card]
 [card]
+primitive=Mind Rot
+id=401460
+rarity=C
+[/card]
+[card]
 primitive=Mizzium Meddler
 id=398596
 rarity=R
@@ -839,21 +880,16 @@ id=398629
 rarity=C
 [/card]
 [card]
+primitive=Nightmare
+id=401461
+rarity=R
+[/card]
+[card]
 primitive=Nightsnare
 id=398562
 rarity=C
 [/card]
 [card]
-primitive=Nissa, Sage Animist
-id=398432
-rarity=T
-[/card]
-[card]
-primitive=Nissa, Vastwood Seer
-id=398438
-rarity=M
-[/card]
-[card]
 primitive=Nissa's Pilgrimage
 id=398593
 rarity=C
@@ -864,6 +900,16 @@ id=398506
 rarity=R
 [/card]
 [card]
+primitive=Nissa, Sage Animist
+id=398432
+rarity=T
+[/card]
+[card]
+primitive=Nissa, Vastwood Seer
+id=398438
+rarity=M
+[/card]
+[card]
 primitive=Nivix Barrier
 id=398465
 rarity=C
@@ -919,6 +965,11 @@ id=398675
 rarity=L
 [/card]
 [card]
+primitive=Plummet
+id=401465
+rarity=C
+[/card]
+[card]
 primitive=Possessed Skaab
 id=398657
 rarity=U
@@ -939,6 +990,11 @@ id=398646
 rarity=U
 [/card]
 [card]
+primitive=Prized Unicorn
+id=401466
+rarity=U
+[/card]
+[card]
 primitive=Psychic Rebuttal
 id=398479
 rarity=U
@@ -1044,6 +1100,11 @@ id=398545
 rarity=C
 [/card]
 [card]
+primitive=Sengir Vampire
+id=401462
+rarity=U
+[/card]
+[card]
 primitive=Sentinel of the Eternal Watch
 id=398659
 rarity=U
@@ -1054,6 +1115,11 @@ id=398608
 rarity=C
 [/card]
 [card]
+primitive=Serra Angel
+id=401455
+rarity=U
+[/card]
+[card]
 primitive=Shadows of the Past
 id=398522
 rarity=U
@@ -1069,13 +1135,13 @@ id=398552
 rarity=C
 [/card]
 [card]
-primitive=Shivan Reef
-id=398444
+primitive=Shivan Dragon
+id=401464
 rarity=R
 [/card]
 [card]
-primitive=Sigil of the Empty Throne
-id=398524
+primitive=Shivan Reef
+id=398444
 rarity=R
 [/card]
 [card]
@@ -1084,6 +1150,11 @@ id=398515
 rarity=U
 [/card]
 [card]
+primitive=Sigil of the Empty Throne
+id=398524
+rarity=R
+[/card]
+[card]
 primitive=Sigiled Starfish
 id=398592
 rarity=U
@@ -1194,6 +1265,11 @@ id=398483
 rarity=R
 [/card]
 [card]
+primitive=Terra Stomper
+id=401467
+rarity=R
+[/card]
+[card]
 primitive=The Great Aurora
 id=398679
 rarity=M
@@ -1229,13 +1305,13 @@ id=398445
 rarity=C
 [/card]
 [card]
-primitive=Titanic Growth
-id=398648
+primitive=Titan's Strength
+id=398680
 rarity=C
 [/card]
 [card]
-primitive=Titan's Strength
-id=398680
+primitive=Titanic Growth
+id=398648
 rarity=C
 [/card]
 [card]
@@ -1339,6 +1415,11 @@ id=398540
 rarity=C
 [/card]
 [card]
+primitive=Weave Fate
+id=401458
+rarity=C
+[/card]
+[card]
 primitive=Weight of the Underworld
 id=398544
 rarity=C
diff --git a/projects/mtg/bin/Res/sets/RV/_cards.dat b/projects/mtg/bin/Res/sets/RV/_cards.dat
index 83bc031d6..3d2f79492 100644
--- a/projects/mtg/bin/Res/sets/RV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RV/_cards.dat
@@ -1,7 +1,8 @@
 [meta]
 author=Wagic Team
-name=3rd Edition
+name=Revised Edition
 year=1994
+total=306
 [/meta]
 [card]
 primitive=Air Elemental
@@ -39,13 +40,13 @@ id=1094
 rarity=R
 [/card]
 [card]
-primitive=Armageddon
-id=1328
+primitive=Armageddon Clock
+id=1095
 rarity=R
 [/card]
 [card]
-primitive=Armageddon Clock
-id=1095
+primitive=Armageddon
+id=1328
 rarity=R
 [/card]
 [card]
@@ -485,7 +486,7 @@ rarity=R
 [/card]
 [card]
 primitive=Forest
-id=1388
+id=1386
 rarity=L
 [/card]
 [card]
@@ -495,7 +496,7 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=1386
+id=1388
 rarity=L
 [/card]
 [card]
@@ -644,8 +645,18 @@ id=1253
 rarity=C
 [/card]
 [card]
+primitive=Island Fish Jasconius
+id=1203
+rarity=R
+[/card]
+[card]
+primitive=Island Sanctuary
+id=1351
+rarity=R
+[/card]
+[card]
 primitive=Island
-id=1394
+id=1392
 rarity=L
 [/card]
 [card]
@@ -655,20 +666,10 @@ rarity=L
 [/card]
 [card]
 primitive=Island
-id=1392
+id=1394
 rarity=L
 [/card]
 [card]
-primitive=Island Fish Jasconius
-id=1203
-rarity=R
-[/card]
-[card]
-primitive=Island Sanctuary
-id=1351
-rarity=R
-[/card]
-[card]
 primitive=Ivory Cup
 id=1114
 rarity=U
@@ -880,7 +881,7 @@ rarity=C
 [/card]
 [card]
 primitive=Mountain
-id=1391
+id=1389
 rarity=L
 [/card]
 [card]
@@ -890,7 +891,7 @@ rarity=L
 [/card]
 [card]
 primitive=Mountain
-id=1389
+id=1391
 rarity=L
 [/card]
 [card]
@@ -990,7 +991,7 @@ rarity=C
 [/card]
 [card]
 primitive=Plains
-id=1397
+id=1395
 rarity=L
 [/card]
 [card]
@@ -1000,7 +1001,7 @@ rarity=L
 [/card]
 [card]
 primitive=Plains
-id=1395
+id=1397
 rarity=L
 [/card]
 [card]
@@ -1129,13 +1130,13 @@ id=1364
 rarity=C
 [/card]
 [card]
-primitive=Savannah
-id=1379
+primitive=Savannah Lions
+id=1365
 rarity=R
 [/card]
 [card]
-primitive=Savannah Lions
-id=1365
+primitive=Savannah
+id=1379
 rarity=R
 [/card]
 [card]
@@ -1189,16 +1190,16 @@ id=1265
 rarity=C
 [/card]
 [card]
-primitive=Shatter
-id=1316
-rarity=C
-[/card]
-[card]
 primitive=Shatterstorm
 id=1317
 rarity=U
 [/card]
 [card]
+primitive=Shatter
+id=1316
+rarity=C
+[/card]
+[card]
 primitive=Shivan Dragon
 id=1318
 rarity=R
@@ -1275,7 +1276,7 @@ rarity=R
 [/card]
 [card]
 primitive=Swamp
-id=1375
+id=1373
 rarity=L
 [/card]
 [card]
@@ -1285,7 +1286,7 @@ rarity=L
 [/card]
 [card]
 primitive=Swamp
-id=1373
+id=1375
 rarity=L
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 3bfdb8c7a..d5c92eaf2 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -68947,7 +68947,7 @@ type=Sorcery
 [/card]
 [card]
 name=Mitotic Slime
-auto=@movedTo(this|graveyard) from(battlefield):token(66666666)*2
+auto=@movedTo(this|graveyard) from(battlefield):token(-2050321)*2
 text=When Mitotic Slime dies, put two 2/2 green Ooze creature tokens onto the battlefield. They have "When this creature is put into a graveyard, put two 1/1 green Ooze creature tokens onto the battlefield."
 mana={4}{G}
 type=Creature
@@ -75603,7 +75603,7 @@ type=Enchantment
 name=Ooze T1
 type=Creature
 subtype=Ooze
-auto=@movedTo(this|graveyard) from(battlefield):token(77777777)*2
+auto=@movedTo(this|graveyard) from(battlefield):token(-2050322)*2
 text=When this creature is put into a graveyard, put two 1/1 green Ooze creature tokens onto the battlefield.
 power=2
 toughness=2