diff --git a/projects/mtg/bin/Res/sets/BOK/_cards.dat b/projects/mtg/bin/Res/sets/BOK/_cards.dat
index 636c54ad6..3a09301db 100644
--- a/projects/mtg/bin/Res/sets/BOK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/BOK/_cards.dat
@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Betrayers of Kamigawa
+block=Kamigawa
 year=2005
-block=Kami
+total=165
 [/meta]
 [card]
 primitive=Akki Blizzard-Herder
@@ -609,13 +611,13 @@ id=74541
 rarity=C
 [/card]
 [card]
-primitive=Scour
-id=74640
+primitive=Scourge of Numai
+id=74488
 rarity=U
 [/card]
 [card]
-primitive=Scourge of Numai
-id=74488
+primitive=Scour
+id=74640
 rarity=U
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/CHK/_cards.dat b/projects/mtg/bin/Res/sets/CHK/_cards.dat
index b771de03f..1f589833b 100644
--- a/projects/mtg/bin/Res/sets/CHK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/CHK/_cards.dat
@@ -1,7 +1,9 @@
 [meta]
 author=Wagic Team
+name=Champions of Kamigawa
+block=Kamigawa
 year=2004
-block=Kami
+total=307
 [/meta]
 [card]
 primitive=Akki Avalanchers
@@ -100,12 +102,12 @@ rarity=R
 [/card]
 [card]
 primitive=Brothers Yamazaki
-id=85106
+id=78968
 rarity=U
 [/card]
 [card]
 primitive=Brothers Yamazaki
-id=78968
+id=85106
 rarity=U
 [/card]
 [card]
@@ -330,12 +332,12 @@ rarity=L
 [/card]
 [card]
 primitive=Forest
-id=79079
+id=79078
 rarity=L
 [/card]
 [card]
 primitive=Forest
-id=79078
+id=79079
 rarity=L
 [/card]
 [card]
@@ -459,11 +461,6 @@ id=50426
 rarity=U
 [/card]
 [card]
-primitive=Hisoka, Minamo Sensei
-id=50474
-rarity=R
-[/card]
-[card]
 primitive=Hisoka's Defiance
 id=50439
 rarity=C
@@ -474,6 +471,11 @@ id=79149
 rarity=C
 [/card]
 [card]
+primitive=Hisoka, Minamo Sensei
+id=50474
+rarity=R
+[/card]
+[card]
 primitive=Hold the Line
 id=79144
 rarity=R
@@ -654,6 +656,11 @@ id=79236
 rarity=U
 [/card]
 [card]
+primitive=Kami of Twisted Reflection
+id=50228
+rarity=C
+[/card]
+[card]
 primitive=Kami of the Hunt
 id=79198
 rarity=C
@@ -674,11 +681,6 @@ id=50311
 rarity=C
 [/card]
 [card]
-primitive=Kami of Twisted Reflection
-id=50228
-rarity=C
-[/card]
-[card]
 primitive=Kashi-Tribe Reaver
 id=76634
 rarity=U
@@ -699,11 +701,6 @@ id=50321
 rarity=R
 [/card]
 [card]
-primitive=Kiki's Cloning Object
-id=5032111
-rarity=T
-[/card]
-[card]
 primitive=Kiku, Night's Flower
 id=78962
 rarity=R
@@ -764,11 +761,6 @@ id=50445
 rarity=R
 [/card]
 [card]
-primitive=Konda, Lord of Eiganjo
-id=78594
-rarity=R
-[/card]
-[card]
 primitive=Konda's Banner
 id=76637
 rarity=R
@@ -779,8 +771,8 @@ id=79201
 rarity=U
 [/card]
 [card]
-primitive=Kumano, Master Yamabushi
-id=78964
+primitive=Konda, Lord of Eiganjo
+id=78594
 rarity=R
 [/card]
 [card]
@@ -789,6 +781,11 @@ id=75267
 rarity=U
 [/card]
 [card]
+primitive=Kumano, Master Yamabushi
+id=78964
+rarity=R
+[/card]
+[card]
 primitive=Kuro, Pitlord
 id=82423
 rarity=R
@@ -976,7 +973,7 @@ rarity=R
 [card]
 primitive=Stabwhisker the Odious
 id=7867911
-rarity=R
+rarity=T
 [/card]
 [card]
 primitive=Night Dealings
@@ -1484,16 +1481,16 @@ id=78606
 rarity=R
 [/card]
 [card]
-primitive=Time of Need
-id=78987
-rarity=U
-[/card]
-[card]
 primitive=Time Stop
 id=78184
 rarity=R
 [/card]
 [card]
+primitive=Time of Need
+id=78987
+rarity=U
+[/card]
+[card]
 primitive=Tranquil Garden
 id=79196
 rarity=U
@@ -1597,4 +1594,4 @@ rarity=R
 primitive=Zo-Zu the Punisher
 id=80274
 rarity=R
-[/card]
\ No newline at end of file
+[/card]
diff --git a/projects/mtg/bin/Res/sets/SOK/_cards.dat b/projects/mtg/bin/Res/sets/SOK/_cards.dat
index 7693448fc..dfa91bd38 100644
--- a/projects/mtg/bin/Res/sets/SOK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SOK/_cards.dat
@@ -1,19 +1,21 @@
 [meta]
 author=Wagic Team
+name=Saviors of Kamigawa
+block=Kamigawa
 year=2005
-block=Kami
+total=165
 [/meta]
 [card]
-primitive=Adamaro, First to Desire
-id=74187
-rarity=R
-[/card]
-[card]
 primitive=AEther Shockwave
 id=74208
 rarity=U
 [/card]
 [card]
+primitive=Adamaro, First to Desire
+id=74187
+rarity=R
+[/card]
+[card]
 primitive=Akki Drillmaster
 id=74393
 rarity=C
@@ -364,16 +366,16 @@ id=74047
 rarity=R
 [/card]
 [card]
-primitive=Kagemaro, First to Suffer
-id=74016
-rarity=R
-[/card]
-[card]
 primitive=Kagemaro's Clutch
 id=74560
 rarity=C
 [/card]
 [card]
+primitive=Kagemaro, First to Suffer
+id=74016
+rarity=R
+[/card]
+[card]
 primitive=Kaho, Minamo Historian
 id=74055
 rarity=R
@@ -544,6 +546,11 @@ id=84639
 rarity=U
 [/card]
 [card]
+primitive=O-Naginata
+id=74146
+rarity=U
+[/card]
+[card]
 primitive=Oboro Breezecaller
 id=88784
 rarity=C
@@ -564,11 +571,6 @@ id=74196
 rarity=C
 [/card]
 [card]
-primitive=O-Naginata
-id=74146
-rarity=U
-[/card]
-[card]
 primitive=One with Nothing
 id=88817
 rarity=R
@@ -693,12 +695,11 @@ primitive=Sasaya, Orochi Ascendant
 id=87595
 rarity=R
 [/card]
-#need to find a way to deal with multipart cards
-#[card]
-#primitive=Sasaya, Orochi Ascendant (Sasaya's Essence)
-#id=87595
-#rarity=R
-#[/card]
+[card]
+primitive=Sasaya's Essence
+id=8759511
+rarity=T
+[/card]
 [card]
 primitive=Scroll of Origins
 id=88811
diff --git a/projects/mtg/bin/Res/sets/primitives/unsupported.txt b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
index 361900cdd..ca102086c 100644
--- a/projects/mtg/bin/Res/sets/primitives/unsupported.txt
+++ b/projects/mtg/bin/Res/sets/primitives/unsupported.txt
@@ -15617,8 +15617,14 @@ type=Planeswalker
 subtype=Sarkhan
 [/card]
 [card]
+name=Sasaya's Essence
+text=Whenever a land you control is tapped for mana, for each other land you control with the same name, add one mana to your mana pool of any type that land produced.
+mana={1}{G}{G}
+type=Legendary Enchantment
+[/card]
+[card]
 name=Sasaya, Orochi Ascendant
-text=Reveal your hand: If you have seven or more land cards in your hand, flip Sasaya, Orochi Ascendant. --  -- ——— --  -- Sasaya's Essence -- Legendary Enchantment --  -- Whenever a land you control is tapped for mana, for each other land you control with the same name, add one mana to your mana pool of any type that land produced. -- 2/3
+text=Reveal your hand: If you have seven or more land cards in your hand, flip Sasaya, Orochi Ascendant.
 mana={1}{G}{G}
 type=Legendary Creature
 subtype=Snake Monk