diff --git a/forge-gui/res/adventure/Shandalar/decks/ape.json b/forge-gui/res/adventure/Shandalar/decks/animals/ape.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/ape.json
rename to forge-gui/res/adventure/Shandalar/decks/animals/ape.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/badger.dck b/forge-gui/res/adventure/Shandalar/decks/animals/badger.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/badger.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/badger.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/bat.dck b/forge-gui/res/adventure/Shandalar/decks/animals/bat.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/bat.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/bat.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/bear.json b/forge-gui/res/adventure/Shandalar/decks/animals/bear.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/bear.json
rename to forge-gui/res/adventure/Shandalar/decks/animals/bear.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/bird_blue.json b/forge-gui/res/adventure/Shandalar/decks/animals/bird_blue.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/bird_blue.json
rename to forge-gui/res/adventure/Shandalar/decks/animals/bird_blue.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/boar.json b/forge-gui/res/adventure/Shandalar/decks/animals/boar.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/boar.json
rename to forge-gui/res/adventure/Shandalar/decks/animals/boar.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/animals/boar_gruul.dck b/forge-gui/res/adventure/Shandalar/decks/animals/boar_gruul.dck
new file mode 100644
index 00000000000..934572a5bc4
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/animals/boar_gruul.dck
@@ -0,0 +1,28 @@
+[metadata]
+Name=boar_gruul
+[Avatar]
+
+[Main]
+4 Boar Umbra|UMA|1
+4 Boartusk Liege|2X2|1
+4 Brindle Shoat|2X2|1
+4 Carefree Swinemaster|CLB|1
+4 Diligent Farmhand|ODY|1
+4 Flinthoof Boar|EMA|1
+9 Forest|DMU|1
+4 Game Trail|CLB|1
+4 Krosan Tusker|DDU|1
+7 Mountain|DMU|1
+4 Outland Boar|KLR|1
+4 Rural Recruit|VOW|1
+4 Wooded Ridgeline|DMU|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/animals/boar_monogreenlifegain.dck b/forge-gui/res/adventure/Shandalar/decks/animals/boar_monogreenlifegain.dck
new file mode 100644
index 00000000000..d79835c2699
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/animals/boar_monogreenlifegain.dck
@@ -0,0 +1,26 @@
+[metadata]
+Name=boar_monogreenlifegain
+[Avatar]
+
+[Main]
+4 Brindle Boar|M14|1
+4 Bristling Boar|IKO|1
+2 End-Raze Forerunners|RNA|1
+24 Forest|M21|1
+4 Giant Warthog|JUD|1
+4 Gristleback|GPT|1
+2 Nessian Boar|THB|1
+4 Pygmy Razorback|PCY|1
+4 Territorial Boar|RNA|1
+4 Trufflesnout|M21|1
+4 Wolf's Quarry|ELD|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/bull.dck b/forge-gui/res/adventure/Shandalar/decks/animals/bull.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/bull.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/bull.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/camel.dck b/forge-gui/res/adventure/Shandalar/decks/animals/camel.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/camel.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/camel.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/cat.json b/forge-gui/res/adventure/Shandalar/decks/animals/cat.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/cat.json
rename to forge-gui/res/adventure/Shandalar/decks/animals/cat.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/animals/cat_greenblack.dck b/forge-gui/res/adventure/Shandalar/decks/animals/cat_greenblack.dck
new file mode 100644
index 00000000000..ddb683322ef
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/animals/cat_greenblack.dck
@@ -0,0 +1,28 @@
+[metadata]
+Name=cat_greenblack
+[Avatar]
+
+[Main]
+4 Black Cat|J21|1
+2 Deathreap Ritual|2XM|1
+4 Dreadmalkin|WAR|1
+4 Echoing Decay|FMB1|1
+4 Feral Prowler|AKR|1
+9 Forest|NEO|1
+4 Hungry Lynx|C17|1
+4 Initiate's Companion|AKR|1
+3 Song of Freyalise|J21|1
+12 Swamp|NEO|1
+4 Tribute to Horobi|NEO|1
+3 Waiting in the Weeds|6ED|1
+3 Yavimaya, Cradle of Growth|MH2|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/animals/cat_greenwhite.dck b/forge-gui/res/adventure/Shandalar/decks/animals/cat_greenwhite.dck
new file mode 100644
index 00000000000..e064e3321c6
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/animals/cat_greenwhite.dck
@@ -0,0 +1,29 @@
+[metadata]
+Name=cat_greenwhite
+[Avatar]
+
+[Main]
+3 Ajani's Welcome|M19|1
+3 Attended Healer|ZNR|1
+4 Charmed Stray|ANB|1
+3 Chrome Cat|SNC|1
+4 Ephemerate|MB1|1
+4 Feline Sovereign|M21|1
+12 Forest|SNC|1
+3 Generous Stray|ANB|1
+3 Long Road Home|JMP|1
+4 Maned Serval|IKO|1
+12 Plains|SNC|1
+3 Pridemalkin|M21|1
+3 Rabid Bite|ZNR|1
+3 Regal Caracal|PLIST|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/animals/cat_greenwhite2.dck b/forge-gui/res/adventure/Shandalar/decks/animals/cat_greenwhite2.dck
new file mode 100644
index 00000000000..caed4da7d4a
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/animals/cat_greenwhite2.dck
@@ -0,0 +1,27 @@
+[metadata]
+Name=cat_greenwhite2
+[Avatar]
+
+[Main]
+4 Adorned Pouncer|MB1|1
+1 Colossification|IKO|1
+3 Enlarge|2XM|1
+4 Feral Invocation|JMP|1
+12 Forest|ZNR|1
+4 Lynx|S99|1
+4 Mesa Lynx|ZNR|1
+4 Monstrous Growth|8ED|1
+12 Plains|ZNR|2
+4 Pouncing Lynx|WAR|1
+4 Sanctuary Cat|ANB|1
+4 Trained Caracal|RTR|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/chicken.dck b/forge-gui/res/adventure/Shandalar/decks/animals/chicken.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/chicken.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/chicken.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/crab.json b/forge-gui/res/adventure/Shandalar/decks/animals/crab.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/crab.json
rename to forge-gui/res/adventure/Shandalar/decks/animals/crab.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/dog.dck b/forge-gui/res/adventure/Shandalar/decks/animals/dog.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dog.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/dog.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/dog.json b/forge-gui/res/adventure/Shandalar/decks/animals/dog.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dog.json
rename to forge-gui/res/adventure/Shandalar/decks/animals/dog.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/elephant.json b/forge-gui/res/adventure/Shandalar/decks/animals/elephant.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/elephant.json
rename to forge-gui/res/adventure/Shandalar/decks/animals/elephant.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/elk.dck b/forge-gui/res/adventure/Shandalar/decks/animals/elk.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/elk.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/elk.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/fox.json b/forge-gui/res/adventure/Shandalar/decks/animals/fox.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/fox.json
rename to forge-gui/res/adventure/Shandalar/decks/animals/fox.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/animals/fox_greenwhite.dck b/forge-gui/res/adventure/Shandalar/decks/animals/fox_greenwhite.dck
new file mode 100644
index 00000000000..48dab203383
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/animals/fox_greenwhite.dck
@@ -0,0 +1,27 @@
+[metadata]
+Name=fox_greenwhite
+[Avatar]
+
+[Main]
+4 Devilthorn Fox|SOI|1
+3 Farfinder|IKO|1
+4 Filigree Familiar|GNT|1
+4 Flutterfox|ELD|1
+12 Forest|ELD|1
+4 Glass Casket|ELD|1
+3 Oakhame Ranger|ELD|1
+12 Plains|ELD|1
+2 Silverchase Fox|BBD|1
+4 Vulpine Goliath|THS|1
+4 Wildborn Preserver|ELD|1
+4 Wildwood Tracker|ELD|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/frog.json b/forge-gui/res/adventure/Shandalar/decks/animals/frog.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/frog.json
rename to forge-gui/res/adventure/Shandalar/decks/animals/frog.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/giant_crab.dck b/forge-gui/res/adventure/Shandalar/decks/animals/giant_crab.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/giant_crab.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/giant_crab.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/gorilla.dck b/forge-gui/res/adventure/Shandalar/decks/animals/gorilla.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/gorilla.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/gorilla.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/griffin.json b/forge-gui/res/adventure/Shandalar/decks/animals/griffin.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/griffin.json
rename to forge-gui/res/adventure/Shandalar/decks/animals/griffin.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/hippo.dck b/forge-gui/res/adventure/Shandalar/decks/animals/hippo.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/hippo.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/hippo.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/horse.dck b/forge-gui/res/adventure/Shandalar/decks/animals/horse.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/horse.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/horse.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/infectrat.dck b/forge-gui/res/adventure/Shandalar/decks/animals/infectrat.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/infectrat.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/infectrat.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/jellyfish.dck b/forge-gui/res/adventure/Shandalar/decks/animals/jellyfish.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/jellyfish.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/jellyfish.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/octopus.dck b/forge-gui/res/adventure/Shandalar/decks/animals/octopus.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/octopus.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/octopus.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/owl.dck b/forge-gui/res/adventure/Shandalar/decks/animals/owl.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/owl.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/owl.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/rat.json b/forge-gui/res/adventure/Shandalar/decks/animals/rat.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/rat.json
rename to forge-gui/res/adventure/Shandalar/decks/animals/rat.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/ratswarm.dck b/forge-gui/res/adventure/Shandalar/decks/animals/ratswarm.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/ratswarm.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/ratswarm.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/raven.dck b/forge-gui/res/adventure/Shandalar/decks/animals/raven.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/raven.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/raven.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/squirrel.dck b/forge-gui/res/adventure/Shandalar/decks/animals/squirrel.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/squirrel.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/squirrel.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/straycat.dck b/forge-gui/res/adventure/Shandalar/decks/animals/straycat.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/straycat.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/straycat.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/turtle.json b/forge-gui/res/adventure/Shandalar/decks/animals/turtle.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/turtle.json
rename to forge-gui/res/adventure/Shandalar/decks/animals/turtle.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/unicorn.dck b/forge-gui/res/adventure/Shandalar/decks/animals/unicorn.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/unicorn.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/unicorn.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/vulture.dck b/forge-gui/res/adventure/Shandalar/decks/animals/vulture.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/vulture.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/vulture.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/wolfboss.dck b/forge-gui/res/adventure/Shandalar/decks/animals/wolfboss.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/wolfboss.dck
rename to forge-gui/res/adventure/Shandalar/decks/animals/wolfboss.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/cave_spider.dck b/forge-gui/res/adventure/Shandalar/decks/arachnida/cave_spider.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/cave_spider.dck
rename to forge-gui/res/adventure/Shandalar/decks/arachnida/cave_spider.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/insect.dck b/forge-gui/res/adventure/Shandalar/decks/arachnida/insect.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/insect.dck
rename to forge-gui/res/adventure/Shandalar/decks/arachnida/insect.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/scarab.dck b/forge-gui/res/adventure/Shandalar/decks/arachnida/scarab.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/scarab.dck
rename to forge-gui/res/adventure/Shandalar/decks/arachnida/scarab.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/scorpion.dck b/forge-gui/res/adventure/Shandalar/decks/arachnida/scorpion.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/scorpion.dck
rename to forge-gui/res/adventure/Shandalar/decks/arachnida/scorpion.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/spider.json b/forge-gui/res/adventure/Shandalar/decks/arachnida/spider.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/spider.json
rename to forge-gui/res/adventure/Shandalar/decks/arachnida/spider.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/spider_token.dck b/forge-gui/res/adventure/Shandalar/decks/arachnida/spider_token.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/spider_token.dck
rename to forge-gui/res/adventure/Shandalar/decks/arachnida/spider_token.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/black_good.json b/forge-gui/res/adventure/Shandalar/decks/black_good.json
deleted file mode 100644
index 033354c28d6..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/black_good.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{                                    
-"name":"Black good",
-  "template":
-  {
-   "count":60,
-   "colors":["Black"],  
-   "rares":0.8
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/black_mid.json b/forge-gui/res/adventure/Shandalar/decks/black_mid.json
deleted file mode 100644
index 442989e8d60..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/black_mid.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{                                    
-"name":"Black mid",
-  "template":
-  {
-   "count":60,
-   "colors":["Black"], 
-   "rares":0.5
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/blue_good.json b/forge-gui/res/adventure/Shandalar/decks/blue_good.json
deleted file mode 100644
index ac7de7a22b6..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/blue_good.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{                                    
-"name":"Blue good",
-  "template":
-  {
-   "count":60,
-   "colors":["Blue"],  
-   "rares":0.8
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/blue_mid.json b/forge-gui/res/adventure/Shandalar/decks/blue_mid.json
deleted file mode 100644
index ef1c2d8a22e..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/blue_mid.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{                                    
-"name":"Blue mid",
-  "template":
-  {
-   "count":60,
-   "colors":["Blue"], 
-   "tribeCards":1.0,
-   "rares":0.5
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/challenger_20_allied_fires.dck b/forge-gui/res/adventure/Shandalar/decks/challenger/challenger_20_allied_fires.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/challenger_20_allied_fires.dck
rename to forge-gui/res/adventure/Shandalar/decks/challenger/challenger_20_allied_fires.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/challenger_20_cavalcade_charge.dck b/forge-gui/res/adventure/Shandalar/decks/challenger/challenger_20_cavalcade_charge.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/challenger_20_cavalcade_charge.dck
rename to forge-gui/res/adventure/Shandalar/decks/challenger/challenger_20_cavalcade_charge.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/challenger_20_final_adventure.dck b/forge-gui/res/adventure/Shandalar/decks/challenger/challenger_20_final_adventure.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/challenger_20_final_adventure.dck
rename to forge-gui/res/adventure/Shandalar/decks/challenger/challenger_20_final_adventure.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/challenger_20_flash_of_ferocity.dck b/forge-gui/res/adventure/Shandalar/decks/challenger/challenger_20_flash_of_ferocity.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/challenger_20_flash_of_ferocity.dck
rename to forge-gui/res/adventure/Shandalar/decks/challenger/challenger_20_flash_of_ferocity.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/challenger_21_azorius_control.dck b/forge-gui/res/adventure/Shandalar/decks/challenger/challenger_21_azorius_control.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/challenger_21_azorius_control.dck
rename to forge-gui/res/adventure/Shandalar/decks/challenger/challenger_21_azorius_control.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/challenger_21_dimir_rogue.dck b/forge-gui/res/adventure/Shandalar/decks/challenger/challenger_21_dimir_rogue.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/challenger_21_dimir_rogue.dck
rename to forge-gui/res/adventure/Shandalar/decks/challenger/challenger_21_dimir_rogue.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/challenger_21_mono-green_stompy.dck b/forge-gui/res/adventure/Shandalar/decks/challenger/challenger_21_mono-green_stompy.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/challenger_21_mono-green_stompy.dck
rename to forge-gui/res/adventure/Shandalar/decks/challenger/challenger_21_mono-green_stompy.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/challenger_21_mono-red_aggro.dck b/forge-gui/res/adventure/Shandalar/decks/challenger/challenger_21_mono-red_aggro.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/challenger_21_mono-red_aggro.dck
rename to forge-gui/res/adventure/Shandalar/decks/challenger/challenger_21_mono-red_aggro.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/challenger_22_dimir_control.dck b/forge-gui/res/adventure/Shandalar/decks/challenger/challenger_22_dimir_control.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/challenger_22_dimir_control.dck
rename to forge-gui/res/adventure/Shandalar/decks/challenger/challenger_22_dimir_control.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/challenger_22_gruul_stompy.dck b/forge-gui/res/adventure/Shandalar/decks/challenger/challenger_22_gruul_stompy.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/challenger_22_gruul_stompy.dck
rename to forge-gui/res/adventure/Shandalar/decks/challenger/challenger_22_gruul_stompy.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/challenger_22_mono_white_aggro.dck b/forge-gui/res/adventure/Shandalar/decks/challenger/challenger_22_mono_white_aggro.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/challenger_22_mono_white_aggro.dck
rename to forge-gui/res/adventure/Shandalar/decks/challenger/challenger_22_mono_white_aggro.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/challenger_22_rakdos_vampires.dck b/forge-gui/res/adventure/Shandalar/decks/challenger/challenger_22_rakdos_vampires.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/challenger_22_rakdos_vampires.dck
rename to forge-gui/res/adventure/Shandalar/decks/challenger/challenger_22_rakdos_vampires.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/artifactwarrior.dck b/forge-gui/res/adventure/Shandalar/decks/constructs/artifactwarrior.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/artifactwarrior.dck
rename to forge-gui/res/adventure/Shandalar/decks/constructs/artifactwarrior.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/construct.json b/forge-gui/res/adventure/Shandalar/decks/constructs/construct.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/construct.json
rename to forge-gui/res/adventure/Shandalar/decks/constructs/construct.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/golem.dck b/forge-gui/res/adventure/Shandalar/decks/constructs/golem.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/golem.dck
rename to forge-gui/res/adventure/Shandalar/decks/constructs/golem.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/golem.json b/forge-gui/res/adventure/Shandalar/decks/constructs/golem.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/golem.json
rename to forge-gui/res/adventure/Shandalar/decks/constructs/golem.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/golem_good.json b/forge-gui/res/adventure/Shandalar/decks/constructs/golem_good.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/golem_good.json
rename to forge-gui/res/adventure/Shandalar/decks/constructs/golem_good.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/axgard_dwarf.dck b/forge-gui/res/adventure/Shandalar/decks/dwarves/axgard_dwarf.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/axgard_dwarf.dck
rename to forge-gui/res/adventure/Shandalar/decks/dwarves/axgard_dwarf.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/bandit.dck b/forge-gui/res/adventure/Shandalar/decks/dwarves/bandit.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/bandit.dck
rename to forge-gui/res/adventure/Shandalar/decks/dwarves/bandit.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/berserker.json b/forge-gui/res/adventure/Shandalar/decks/dwarves/berserker.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/berserker.json
rename to forge-gui/res/adventure/Shandalar/decks/dwarves/berserker.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/dwarf.json b/forge-gui/res/adventure/Shandalar/decks/dwarves/dwarf.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dwarf.json
rename to forge-gui/res/adventure/Shandalar/decks/dwarves/dwarf.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/dwarfdemolisher.dck b/forge-gui/res/adventure/Shandalar/decks/dwarves/dwarfdemolisher.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dwarfdemolisher.dck
rename to forge-gui/res/adventure/Shandalar/decks/dwarves/dwarfdemolisher.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/dwarfmercenary.dck b/forge-gui/res/adventure/Shandalar/decks/dwarves/dwarfmercenary.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dwarfmercenary.dck
rename to forge-gui/res/adventure/Shandalar/decks/dwarves/dwarfmercenary.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/dwarfpilot.dck b/forge-gui/res/adventure/Shandalar/decks/dwarves/dwarfpilot.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dwarfpilot.dck
rename to forge-gui/res/adventure/Shandalar/decks/dwarves/dwarfpilot.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/white_dwarf.dck b/forge-gui/res/adventure/Shandalar/decks/dwarves/white_dwarf.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/white_dwarf.dck
rename to forge-gui/res/adventure/Shandalar/decks/dwarves/white_dwarf.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/br_elemental.dck b/forge-gui/res/adventure/Shandalar/decks/elementals/br_elemental.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/br_elemental.dck
rename to forge-gui/res/adventure/Shandalar/decks/elementals/br_elemental.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/elemental_blue.json b/forge-gui/res/adventure/Shandalar/decks/elementals/elemental_blue.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/elemental_blue.json
rename to forge-gui/res/adventure/Shandalar/decks/elementals/elemental_blue.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/fire_elemental.dck b/forge-gui/res/adventure/Shandalar/decks/elementals/fire_elemental.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/fire_elemental.dck
rename to forge-gui/res/adventure/Shandalar/decks/elementals/fire_elemental.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/fireelemental.dck b/forge-gui/res/adventure/Shandalar/decks/elementals/fireelemental.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/fireelemental.dck
rename to forge-gui/res/adventure/Shandalar/decks/elementals/fireelemental.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/flame_elemental.dck b/forge-gui/res/adventure/Shandalar/decks/elementals/flame_elemental.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/flame_elemental.dck
rename to forge-gui/res/adventure/Shandalar/decks/elementals/flame_elemental.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/lightning_elemental.dck b/forge-gui/res/adventure/Shandalar/decks/elementals/lightning_elemental.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/lightning_elemental.dck
rename to forge-gui/res/adventure/Shandalar/decks/elementals/lightning_elemental.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/magma_elemental.dck b/forge-gui/res/adventure/Shandalar/decks/elementals/magma_elemental.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/magma_elemental.dck
rename to forge-gui/res/adventure/Shandalar/decks/elementals/magma_elemental.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/sandgolem.dck b/forge-gui/res/adventure/Shandalar/decks/elementals/sandgolem.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/sandgolem.dck
rename to forge-gui/res/adventure/Shandalar/decks/elementals/sandgolem.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/water_elemental.dck b/forge-gui/res/adventure/Shandalar/decks/elementals/water_elemental.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/water_elemental.dck
rename to forge-gui/res/adventure/Shandalar/decks/elementals/water_elemental.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/elf_bad.json b/forge-gui/res/adventure/Shandalar/decks/elves/elf_bad.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/elf_bad.json
rename to forge-gui/res/adventure/Shandalar/decks/elves/elf_bad.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/elf_golgari.dck b/forge-gui/res/adventure/Shandalar/decks/elves/elf_golgari.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/elf_golgari.dck
rename to forge-gui/res/adventure/Shandalar/decks/elves/elf_golgari.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/elf_good.json b/forge-gui/res/adventure/Shandalar/decks/elves/elf_good.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/elf_good.json
rename to forge-gui/res/adventure/Shandalar/decks/elves/elf_good.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/elf_mid.json b/forge-gui/res/adventure/Shandalar/decks/elves/elf_mid.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/elf_mid.json
rename to forge-gui/res/adventure/Shandalar/decks/elves/elf_mid.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/golgari_elf.dck b/forge-gui/res/adventure/Shandalar/decks/elves/golgari_elf.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/golgari_elf.dck
rename to forge-gui/res/adventure/Shandalar/decks/elves/golgari_elf.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/dimir_faerie.dck b/forge-gui/res/adventure/Shandalar/decks/faeries/dimir_faerie.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dimir_faerie.dck
rename to forge-gui/res/adventure/Shandalar/decks/faeries/dimir_faerie.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/eldraine_faerie.dck b/forge-gui/res/adventure/Shandalar/decks/faeries/eldraine_faerie.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/eldraine_faerie.dck
rename to forge-gui/res/adventure/Shandalar/decks/faeries/eldraine_faerie.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/faerie.json b/forge-gui/res/adventure/Shandalar/decks/faeries/faerie.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/faerie.json
rename to forge-gui/res/adventure/Shandalar/decks/faeries/faerie.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/fear.dck b/forge-gui/res/adventure/Shandalar/decks/fear.dck
deleted file mode 100644
index e29e2ff7330..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/fear.dck
+++ /dev/null
@@ -1,38 +0,0 @@
-[metadata]
-Name=fear
-[Main]
-1 Abnormal Endurance|M19|1
-1 Alchemist's Gift|M21|1
-1 Avatar of Woe|PCY|1
-1 Commander Greven il-Vec|TPR|1
-1 Corpse Churn|CMR|1
-1 Demonic Gifts|KHM|1
-1 Drag to the Underworld|THB|1
-1 Dread|LRW|1
-1 Dross Prowler|MRD|1
-2 Duskwalker|INV|1
-2 Frightcrawler|ODY|1
-1 Guiltfeeder|JUD|1
-1 Hero's Downfall|VOW|1
-1 Malefic Scythe|M21|1
-1 Mind Rake|MB1|1
-1 Murder|MB1|1
-2 Nezumi Cutthroat|A25|1
-2 Phobian Phantasm|CSP|1
-1 Poison the Cup|KHM|1
-2 Prickly Boggart|MOR|1
-2 Razortooth Rats|WTH|1
-1 Severed Legion|ONS|1
-2 Squeaking Pie Sneak|LRW|1
-2 Squirming Mass|UDS|1
-3 Swamp|MBS|1
-5 Swamp|MBS|2
-8 Swamp|ONS|4
-1 Swamp|SHM|1
-1 Swamp|SHM|2
-3 Swamp|SHM|3
-3 Swamp|SHM|4
-1 Tourach's Canticle|MH2|1
-1 Unburial Rites|AFC|1
-1 Undercity Shade|RAV|1
-1 Woebearer|MRD|1
diff --git a/forge-gui/res/adventure/Shandalar/decks/firegiant.dck b/forge-gui/res/adventure/Shandalar/decks/giants/firegiant.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/firegiant.dck
rename to forge-gui/res/adventure/Shandalar/decks/giants/firegiant.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/firegiantboss.dck b/forge-gui/res/adventure/Shandalar/decks/giants/firegiantboss.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/firegiantboss.dck
rename to forge-gui/res/adventure/Shandalar/decks/giants/firegiantboss.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/foresttitan.dck b/forge-gui/res/adventure/Shandalar/decks/giants/foresttitan.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/foresttitan.dck
rename to forge-gui/res/adventure/Shandalar/decks/giants/foresttitan.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/frost_titan.dck b/forge-gui/res/adventure/Shandalar/decks/giants/frost_titan.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/frost_titan.dck
rename to forge-gui/res/adventure/Shandalar/decks/giants/frost_titan.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/gravetitan.dck b/forge-gui/res/adventure/Shandalar/decks/giants/gravetitan.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/gravetitan.dck
rename to forge-gui/res/adventure/Shandalar/decks/giants/gravetitan.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/stormtitan.dck b/forge-gui/res/adventure/Shandalar/decks/giants/stormtitan.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/stormtitan.dck
rename to forge-gui/res/adventure/Shandalar/decks/giants/stormtitan.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/sun titan.dck b/forge-gui/res/adventure/Shandalar/decks/giants/sun titan.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/sun titan.dck
rename to forge-gui/res/adventure/Shandalar/decks/giants/sun titan.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/eyeblight.dck b/forge-gui/res/adventure/Shandalar/decks/goblins/eyeblight.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/eyeblight.dck
rename to forge-gui/res/adventure/Shandalar/decks/goblins/eyeblight.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/goblin_artificer.dck b/forge-gui/res/adventure/Shandalar/decks/goblins/goblin_artificer.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/goblin_artificer.dck
rename to forge-gui/res/adventure/Shandalar/decks/goblins/goblin_artificer.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/goblin_bad.json b/forge-gui/res/adventure/Shandalar/decks/goblins/goblin_bad.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/goblin_bad.json
rename to forge-gui/res/adventure/Shandalar/decks/goblins/goblin_bad.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/goblin_good.json b/forge-gui/res/adventure/Shandalar/decks/goblins/goblin_good.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/goblin_good.json
rename to forge-gui/res/adventure/Shandalar/decks/goblins/goblin_good.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/goblin_mid.json b/forge-gui/res/adventure/Shandalar/decks/goblins/goblin_mid.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/goblin_mid.json
rename to forge-gui/res/adventure/Shandalar/decks/goblins/goblin_mid.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/goblins.dck b/forge-gui/res/adventure/Shandalar/decks/goblins/goblins.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/goblins.dck
rename to forge-gui/res/adventure/Shandalar/decks/goblins/goblins.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/green_good.json b/forge-gui/res/adventure/Shandalar/decks/green_good.json
deleted file mode 100644
index f750fda115b..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/green_good.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{                                    
-"name":"Green good",
-  "template":
-  {
-   "count":60,
-   "colors":["Green"], 
-   "rares":0.8
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/holy/Akroma's Angelfire 1.dck b/forge-gui/res/adventure/Shandalar/decks/holy/Akroma's Angelfire 1.dck
new file mode 100644
index 00000000000..e6ba348aeb7
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/holy/Akroma's Angelfire 1.dck	
@@ -0,0 +1,39 @@
+[duel]
+[metadata]
+Name=Akroma's Angelfire 1
+Title=Akroma, Angel of Wrath
+Difficulty=easy
+Description=RW aggressive angel tribal theme deck
+Icon=Akroma 1.jpg
+Deck Type=constructed
+[Main]
+2 Akroma's Blessing
+1 Akroma's Vengeance
+1 Akroma's Will
+1 Akroma, Angel of Fury
+1 Akroma, Angel of Wrath
+1 Akroma, Vision of Ixidor
+1 Angelfire Ignition
+2 Angelheart Protector
+1 Angelic Guardian
+1 Angelic Skirmisher
+1 Anya, Merciless Angel
+1 Aurelia, Exemplar of Justice
+3 Boros Guildgate
+1 Elixir of Immortality
+2 Emancipation Angel
+1 Feather, the Redeemed
+1 Firemane Avenger
+1 Giada, Font of Hope
+3 Lightning Helix
+7 Mountain
+7 Plains
+3 Punishing Fire
+2 Segovian Angel
+2 Slayers' Stronghold
+2 Starnheim Aspirant
+3 Temple of Triumph
+2 Valkyrie's Sword
+2 Voice of All
+2 Warleader's Helix
+2 Youthful Valkyrie
diff --git a/forge-gui/res/adventure/Shandalar/decks/holy/Akroma's Angelfire 3.dck b/forge-gui/res/adventure/Shandalar/decks/holy/Akroma's Angelfire 3.dck
new file mode 100644
index 00000000000..31b4da83ab4
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/holy/Akroma's Angelfire 3.dck	
@@ -0,0 +1,47 @@
+[duel]
+[metadata]
+Name=Akroma's Angelfire 3
+Title=Akroma, Angel of Wrath
+Difficulty=hard
+Description=RW aggressive angel tribal theme deck
+Icon=Akroma 3.jpg
+Deck Type=constructed
+[Main]
+1 Akroma's Will
+1 Akroma, Angel of Fury
+1 Akroma, Angel of Wrath
+1 Akroma, Vision of Ixidor
+2 Angel of Jubilation
+3 Angelfire Ignition
+1 Angelic Skirmisher
+1 Anya, Merciless Angel
+4 Arid Mesa
+1 Aurelia, Exemplar of Justice
+1 Beacon of Destruction
+2 Brightflame
+2 Defy Death
+2 Elixir of Immortality
+1 Emeria, the Sky Ruin
+1 Feather, the Redeemed
+2 Firemane Avenger
+1 Flameblade Angel
+1 Giada, Font of Hope
+1 Gisela, Blade of Goldnight
+2 Herald of War
+3 Lightning Helix
+2 Mistveil Plains
+9 Mountain
+7 Plains
+4 Plateau
+1 Red Sun's Zenith
+2 Righteous Valkyrie
+4 Sacred Foundry
+1 Sephara, Sky's Blade
+2 Slayers' Stronghold
+2 Starnheim Aspirant
+1 Valakut, the Molten Pinnacle
+2 Voice of All
+2 Warleader's Helix
+3 Wear // Tear
+1 Wrath of God
+2 Youthful Valkyrie
diff --git a/forge-gui/res/adventure/Shandalar/decks/aether_channeler.dck b/forge-gui/res/adventure/Shandalar/decks/holy/aether_channeler.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/aether_channeler.dck
rename to forge-gui/res/adventure/Shandalar/decks/holy/aether_channeler.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/angel.json b/forge-gui/res/adventure/Shandalar/decks/holy/angel.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/angel.json
rename to forge-gui/res/adventure/Shandalar/decks/holy/angel.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/angelcontrol.dck b/forge-gui/res/adventure/Shandalar/decks/holy/angelcontrol.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/angelcontrol.dck
rename to forge-gui/res/adventure/Shandalar/decks/holy/angelcontrol.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/angelwarrior.dck b/forge-gui/res/adventure/Shandalar/decks/holy/angelwarrior.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/angelwarrior.dck
rename to forge-gui/res/adventure/Shandalar/decks/holy/angelwarrior.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/armored_knight.dck b/forge-gui/res/adventure/Shandalar/decks/holy/armored_knight.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/armored_knight.dck
rename to forge-gui/res/adventure/Shandalar/decks/holy/armored_knight.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/cleric.json b/forge-gui/res/adventure/Shandalar/decks/holy/cleric.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/cleric.json
rename to forge-gui/res/adventure/Shandalar/decks/holy/cleric.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/cleric_orzhov.dck b/forge-gui/res/adventure/Shandalar/decks/holy/cleric_orzhov.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/cleric_orzhov.dck
rename to forge-gui/res/adventure/Shandalar/decks/holy/cleric_orzhov.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/disciple_of_teferi.dck b/forge-gui/res/adventure/Shandalar/decks/holy/disciple_of_teferi.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/disciple_of_teferi.dck
rename to forge-gui/res/adventure/Shandalar/decks/holy/disciple_of_teferi.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/eldraine_knight.dck b/forge-gui/res/adventure/Shandalar/decks/holy/eldraine_knight.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/eldraine_knight.dck
rename to forge-gui/res/adventure/Shandalar/decks/holy/eldraine_knight.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/knight.json b/forge-gui/res/adventure/Shandalar/decks/holy/knight.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/knight.json
rename to forge-gui/res/adventure/Shandalar/decks/holy/knight.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/monk.json b/forge-gui/res/adventure/Shandalar/decks/holy/monk.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/monk.json
rename to forge-gui/res/adventure/Shandalar/decks/holy/monk.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/adventurer.dck b/forge-gui/res/adventure/Shandalar/decks/humans/adventurer.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/adventurer.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/adventurer.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/archeologist.dck b/forge-gui/res/adventure/Shandalar/decks/humans/archeologist.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/archeologist.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/archeologist.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/archerelite.dck b/forge-gui/res/adventure/Shandalar/decks/humans/archerelite.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/archerelite.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/archerelite.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/artificer.dck b/forge-gui/res/adventure/Shandalar/decks/humans/artificer.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/artificer.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/artificer.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/barbarian.dck b/forge-gui/res/adventure/Shandalar/decks/humans/barbarian.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/barbarian.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/barbarian.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/beastmaster.dck b/forge-gui/res/adventure/Shandalar/decks/humans/beastmaster.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/beastmaster.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/beastmaster.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/cathar.dck b/forge-gui/res/adventure/Shandalar/decks/humans/cathar.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/cathar.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/cathar.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/farmer.dck b/forge-gui/res/adventure/Shandalar/decks/humans/farmer.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/farmer.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/farmer.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/gladiator.dck b/forge-gui/res/adventure/Shandalar/decks/humans/gladiator.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/gladiator.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/gladiator.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/horsemanship.dck b/forge-gui/res/adventure/Shandalar/decks/humans/horsemanship.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/horsemanship.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/horsemanship.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/human_archer.dck b/forge-gui/res/adventure/Shandalar/decks/humans/human_archer.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/human_archer.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/human_archer.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/human_bad.json b/forge-gui/res/adventure/Shandalar/decks/humans/human_bad.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/human_bad.json
rename to forge-gui/res/adventure/Shandalar/decks/humans/human_bad.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/human_good.json b/forge-gui/res/adventure/Shandalar/decks/humans/human_good.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/human_good.json
rename to forge-gui/res/adventure/Shandalar/decks/humans/human_good.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/human_mid.json b/forge-gui/res/adventure/Shandalar/decks/humans/human_mid.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/human_mid.json
rename to forge-gui/res/adventure/Shandalar/decks/humans/human_mid.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/human_soldier_token.dck b/forge-gui/res/adventure/Shandalar/decks/humans/human_soldier_token.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/human_soldier_token.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/human_soldier_token.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/humanmercenary.dck b/forge-gui/res/adventure/Shandalar/decks/humans/humanmercenary.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/humanmercenary.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/humanmercenary.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/knightmercenary.dck b/forge-gui/res/adventure/Shandalar/decks/humans/knightmercenary.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/knightmercenary.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/knightmercenary.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/mardu.dck b/forge-gui/res/adventure/Shandalar/decks/humans/mardu.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/mardu.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/mardu.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/pirate.dck b/forge-gui/res/adventure/Shandalar/decks/humans/pirate.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/pirate.dck
rename to forge-gui/res/adventure/Shandalar/decks/humans/pirate.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/rogue.json b/forge-gui/res/adventure/Shandalar/decks/humans/rogue.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/rogue.json
rename to forge-gui/res/adventure/Shandalar/decks/humans/rogue.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/kobold.dck b/forge-gui/res/adventure/Shandalar/decks/kobolds/kobold.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/kobold.dck
rename to forge-gui/res/adventure/Shandalar/decks/kobolds/kobold.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/green_mid.json b/forge-gui/res/adventure/Shandalar/decks/kobolds/kobold.json
similarity index 60%
rename from forge-gui/res/adventure/Shandalar/decks/green_mid.json
rename to forge-gui/res/adventure/Shandalar/decks/kobolds/kobold.json
index b8bff53849b..ff6bae5c0ee 100644
--- a/forge-gui/res/adventure/Shandalar/decks/green_mid.json
+++ b/forge-gui/res/adventure/Shandalar/decks/kobolds/kobold.json
@@ -1,9 +1,10 @@
 {                                    
-"name":"Green mid",
+"name":"Kobold",
   "template":
   {
    "count":60,
-   "colors":["Green"], 
+   "colors":["Red"],
+   "tribe":"Kobold",
    "rares":0.5
   }
 }
diff --git a/forge-gui/res/adventure/Shandalar/decks/kobolds/kobolddragoncaller.dck b/forge-gui/res/adventure/Shandalar/decks/kobolds/kobolddragoncaller.dck
new file mode 100644
index 00000000000..3a2b98f9fab
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/kobolds/kobolddragoncaller.dck
@@ -0,0 +1,41 @@
+[metadata]
+Name=kobold_dragoncaller
+[Avatar]
+
+[Main]
+2 Abrupt Decay|GK1|1
+1 Ancient Brass Dragon|CLB|1
+1 Ancient Copper Dragon|CLB|1
+2 Animate Dead|TD0|1
+3 Badlands|OLGC|1
+1 Balefire Dragon|UMA|1
+4 Bloodstained Mire|KTK|1
+4 Chaos Dragon|AFC|1
+4 Decimate|C18|1
+2 Dragonborn Champion|AFC|1
+4 Dragonskull Summit|C16|1
+2 Dragonspeaker Shaman|C17|1
+2 Farseek|DMC|1
+1 Feed the Swarm|SCD|1
+1 Forest|GN3|3
+4 Minion of the Mighty|AFR|1
+1 Mountain|GN3|1
+2 Mountain|GN3|2
+3 Nogi, Draco-Zealot|GN3|1
+2 Prossh, Skyraider of Kher|PLIST|1
+2 Rivaz of the Claw|DMU|1
+2 Rohgahh, Kher Keep Overlord|DMC|1
+2 Swamp|GN3|1
+2 Taiga|OLGC|1
+2 Town-Razer Tyrant|YMID|1
+4 Ziatora's Proving Ground|SNC|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/kobolds/koboldtrapmaster.dck b/forge-gui/res/adventure/Shandalar/decks/kobolds/koboldtrapmaster.dck
new file mode 100644
index 00000000000..3675fce4fb1
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/kobolds/koboldtrapmaster.dck
@@ -0,0 +1,26 @@
+[metadata]
+Name=kobold_trapmaster
+[Avatar]
+
+[Main]
+4 Goblin Trapfinder|HBG|1
+4 Inferno Trap|DDN|1
+2 Kher Keep|CLB|1
+3 Mountain|HBG|1
+5 Mountain|HBG|2
+7 Mountain|HBG|3
+5 Mountain|HBG|4
+4 Ricochet Trap|WWK|1
+4 Runeflare Trap|ZEN|1
+4 Springjaw Trap|IKO|1
+4 Taunting Kobold|CLB|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/kobolds/koboldwarrior.dck b/forge-gui/res/adventure/Shandalar/decks/kobolds/koboldwarrior.dck
new file mode 100644
index 00000000000..053f5d2a133
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/kobolds/koboldwarrior.dck
@@ -0,0 +1,34 @@
+[metadata]
+Name=kobold_warrior
+[Avatar]
+
+[Main]
+3 Adaptive Automaton|E02|1
+1 Cover of Darkness|ONS|1
+4 Crimson Kobolds|ME3|1
+2 Crippling Fear|CLB|1
+4 Crookshank Kobolds|MED|1
+1 Door of Destinies|C17|1
+2 Icon of Ancestry|M20|1
+2 Kher Keep|CLB|1
+3 Kobold Drill Sergeant|ME3|1
+2 Kobold Overlord|ME3|1
+3 Kobold Taskmaster|TSB|1
+4 Kobolds of Kher Keep|LEG|1
+2 Metallic Mimic|AER|1
+16 Mountain|LRW|1
+4 Mutavault|PGPX|1
+2 Rograkh, Son of Rohgahh|CMR|1
+1 Shared Animosity|E02|1
+2 Taunting Kobold|CLB|1
+2 Vanquisher's Banner|MOC|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/kobolds/koboldworker.dck b/forge-gui/res/adventure/Shandalar/decks/kobolds/koboldworker.dck
new file mode 100644
index 00000000000..328182c1720
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/kobolds/koboldworker.dck
@@ -0,0 +1,44 @@
+[metadata]
+Name=Kobolds Mid
+[Avatar]
+
+[Main]
+1 Ancient Brass Dragon|CLB|1
+1 Bladewing, Deathless Tyrant|DMC|1
+2 Darigaaz's Whelp|YDMU|1
+2 Draconic Destiny|BRO|1
+4 Dragonskull Summit|C16|1
+2 Geothermal Bog|DMU|1
+4 Haunted Ridge|MID|1
+2 Heraldic Banner|ELD|1
+1 Kher Keep|TSR|1
+2 Kobold Overlord|ME3|1
+2 Kobold Taskmaster|TSB|1
+1 Kobold Warcaller|HBG|1
+4 Kobolds of Kher Keep|ME3|1
+2 Minion of the Mighty|AFR|1
+5 Mountain|DMU|4
+1 Nogi, Draco-Zealot|GN3|1
+2 Rakdos Charm|AFC|1
+1 Rograkh, Son of Rohgahh|CMR|1
+1 Rohgahh of Kher Keep|ME3|1
+2 Rohgahh, Kher Keep Overlord|DMC|1
+1 Rosnakht, Heir of Rohgahh|DMC|1
+1 Shivan Dragon|DMR|1
+2 Shock|DDN|1
+2 Slumbering Dragon|M13|1
+4 Smoldering Marsh|DMC|1
+4 Swamp|DMU|4
+1 Taunting Kobold|CLB|1
+2 Terminate|DMC|1
+1 Vanquisher's Banner|XLN|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/kobolds/roshnakhtheroic.dck b/forge-gui/res/adventure/Shandalar/decks/kobolds/roshnakhtheroic.dck
new file mode 100644
index 00000000000..61643140448
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/kobolds/roshnakhtheroic.dck
@@ -0,0 +1,32 @@
+[metadata]
+Name=roshnakht_heroic
+[Avatar]
+
+[Main]
+4 Akroan Crusader|UMA|1
+2 Bravado|USG|1
+4 Brute Strength|GN2|1
+4 Castle Embereth|NCC|1
+1 Den of the Bugbear|AFR|1
+4 Dragon Mantle|CMR|1
+4 Expedite|OGW|1
+1 Kher Keep|TSR|1
+2 Madcap Skills|MB1|1
+2 Mob Mentality|VIS|1
+16 Mountain|DMU|4
+4 Raze the Effigy|MID|1
+4 Rosnakht, Heir of Rohgahh|DMC|1
+2 Shock|DDN|1
+2 Sticky Fingers|SNC|1
+2 Unleash Fury|M21|1
+2 Wild Magic Surge|CLB|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/kor_warrior.dck b/forge-gui/res/adventure/Shandalar/decks/kor/kor_warrior.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/kor_warrior.dck
rename to forge-gui/res/adventure/Shandalar/decks/kor/kor_warrior.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/darkenchanter.dck b/forge-gui/res/adventure/Shandalar/decks/lizards/darkenchanter.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/darkenchanter.dck
rename to forge-gui/res/adventure/Shandalar/decks/lizards/darkenchanter.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/dinosaur_w_r.dck b/forge-gui/res/adventure/Shandalar/decks/lizards/dinosaur_w_r.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dinosaur_w_r.dck
rename to forge-gui/res/adventure/Shandalar/decks/lizards/dinosaur_w_r.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/dinosaurs.json b/forge-gui/res/adventure/Shandalar/decks/lizards/dinosaurs.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dinosaurs.json
rename to forge-gui/res/adventure/Shandalar/decks/lizards/dinosaurs.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/loamspeaker.dck b/forge-gui/res/adventure/Shandalar/decks/lizards/loamspeaker.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/loamspeaker.dck
rename to forge-gui/res/adventure/Shandalar/decks/lizards/loamspeaker.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/mindclaw_shaman.dck b/forge-gui/res/adventure/Shandalar/decks/lizards/mindclaw_shaman.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/mindclaw_shaman.dck
rename to forge-gui/res/adventure/Shandalar/decks/lizards/mindclaw_shaman.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/shaman.json b/forge-gui/res/adventure/Shandalar/decks/lizards/shaman.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/shaman.json
rename to forge-gui/res/adventure/Shandalar/decks/lizards/shaman.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/shamanelite.dck b/forge-gui/res/adventure/Shandalar/decks/lizards/shamanelite.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/shamanelite.dck
rename to forge-gui/res/adventure/Shandalar/decks/lizards/shamanelite.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/snake.dck b/forge-gui/res/adventure/Shandalar/decks/lizards/snake.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/snake.dck
rename to forge-gui/res/adventure/Shandalar/decks/lizards/snake.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/snake.json b/forge-gui/res/adventure/Shandalar/decks/lizards/snake.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/snake.json
rename to forge-gui/res/adventure/Shandalar/decks/lizards/snake.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/symbiote.dck b/forge-gui/res/adventure/Shandalar/decks/lizards/symbiote.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/symbiote.dck
rename to forge-gui/res/adventure/Shandalar/decks/lizards/symbiote.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/viashino.dck b/forge-gui/res/adventure/Shandalar/decks/lizards/viashino.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/viashino.dck
rename to forge-gui/res/adventure/Shandalar/decks/lizards/viashino.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/merfolk_bad.json b/forge-gui/res/adventure/Shandalar/decks/merfolk/merfolk_bad.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/merfolk_bad.json
rename to forge-gui/res/adventure/Shandalar/decks/merfolk/merfolk_bad.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/merfolk_good.json b/forge-gui/res/adventure/Shandalar/decks/merfolk/merfolk_good.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/merfolk_good.json
rename to forge-gui/res/adventure/Shandalar/decks/merfolk/merfolk_good.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/merfolk_lord2.dck b/forge-gui/res/adventure/Shandalar/decks/merfolk/merfolk_lord2.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/merfolk_lord2.dck
rename to forge-gui/res/adventure/Shandalar/decks/merfolk/merfolk_lord2.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/merfolk_lords.dck b/forge-gui/res/adventure/Shandalar/decks/merfolk/merfolk_lords.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/merfolk_lords.dck
rename to forge-gui/res/adventure/Shandalar/decks/merfolk/merfolk_lords.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/merfolk_mid.json b/forge-gui/res/adventure/Shandalar/decks/merfolk/merfolk_mid.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/merfolk_mid.json
rename to forge-gui/res/adventure/Shandalar/decks/merfolk/merfolk_mid.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/merfolk_v_goblins.dck b/forge-gui/res/adventure/Shandalar/decks/merfolk/merfolk_v_goblins.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/merfolk_v_goblins.dck
rename to forge-gui/res/adventure/Shandalar/decks/merfolk/merfolk_v_goblins.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/conjure.dck b/forge-gui/res/adventure/Shandalar/decks/miniboss/conjure.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/conjure.dck
rename to forge-gui/res/adventure/Shandalar/decks/miniboss/conjure.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/torturer.dck b/forge-gui/res/adventure/Shandalar/decks/miniboss/torturer.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/torturer.dck
rename to forge-gui/res/adventure/Shandalar/decks/miniboss/torturer.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/warlockmaster.dck b/forge-gui/res/adventure/Shandalar/decks/miniboss/warlockmaster.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/warlockmaster.dck
rename to forge-gui/res/adventure/Shandalar/decks/miniboss/warlockmaster.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/amonkhet_minotaur.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/amonkhet_minotaur.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/amonkhet_minotaur.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/amonkhet_minotaur.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/beast_green.json b/forge-gui/res/adventure/Shandalar/decks/monsters/beast_green.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/beast_green.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/beast_green.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/beast_red.json b/forge-gui/res/adventure/Shandalar/decks/monsters/beast_red.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/beast_red.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/beast_red.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/beholder.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/beholder.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/beholder.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/beholder.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/centaur.json b/forge-gui/res/adventure/Shandalar/decks/monsters/centaur.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/centaur.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/centaur.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/centaur_warrior.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/centaur_warrior.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/centaur_warrior.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/centaur_warrior.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/cephalid.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/cephalid.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/cephalid.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/cephalid.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/cyclops.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/cyclops.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/cyclops.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/cyclops.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/djinn.json b/forge-gui/res/adventure/Shandalar/decks/monsters/djinn.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/djinn.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/djinn.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/djinn_tarkir.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/djinn_tarkir.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/djinn_tarkir.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/djinn_tarkir.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/dragon.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/dragon.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dragon.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/dragon.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/efreet.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/efreet.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/efreet.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/efreet.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/eldrazi.json b/forge-gui/res/adventure/Shandalar/decks/monsters/eldrazi.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/eldrazi.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/eldrazi.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/eye.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/eye.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/eye.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/eye.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/firedragon.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/firedragon.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/firedragon.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/firedragon.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/fungus.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/fungus.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/fungus.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/fungus.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/fungus.json b/forge-gui/res/adventure/Shandalar/decks/monsters/fungus.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/fungus.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/fungus.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/fungus_golgari.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/fungus_golgari.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/fungus_golgari.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/fungus_golgari.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/gargoyle.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/gargoyle.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/gargoyle.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/gargoyle.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/gargoyle.json b/forge-gui/res/adventure/Shandalar/decks/monsters/gargoyle.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/gargoyle.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/gargoyle.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/golgari_treefolk.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/golgari_treefolk.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/golgari_treefolk.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/golgari_treefolk.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/gorgon.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/gorgon.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/gorgon.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/gorgon.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/gorgon_2.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/gorgon_2.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/gorgon_2.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/gorgon_2.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/harpy.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/harpy.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/harpy.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/harpy.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/harpy_2.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/harpy_2.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/harpy_2.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/harpy_2.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/homarid.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/homarid.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/homarid.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/homarid.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/horror.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/horror.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/horror.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/horror.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/hydra.json b/forge-gui/res/adventure/Shandalar/decks/monsters/hydra.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/hydra.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/hydra.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/jackal.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/jackal.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/jackal.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/jackal.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/kavu.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/kavu.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/kavu.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/kavu.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/mimic.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/mimic.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/mimic.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/mimic.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/minotaur.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/minotaur.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/minotaur.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/minotaur.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/minotaur.json b/forge-gui/res/adventure/Shandalar/decks/monsters/minotaur.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/minotaur.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/minotaur.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/monsters/minotaurblackredmadness.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/minotaurblackredmadness.dck
new file mode 100644
index 00000000000..cba848009f1
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/monsters/minotaurblackredmadness.dck
@@ -0,0 +1,28 @@
+[metadata]
+Name=minotaurblackredmadness
+[Avatar]
+
+[Main]
+4 Bloodrage Brawler|JMP|1
+4 Burning-Fist Minotaur|AKR|1
+4 Fiery Temper|MB1|1
+3 Font of Return|JOU|1
+2 Glint-Horn Buccaneer|M20|1
+4 Grisly Survivor|HOU|1
+3 Minotaur Explorer|ODY|1
+12 Mountain|MH2|1
+4 Pitiless Vizier|AKR|1
+2 Senseless Rage|SOI|1
+4 Skophos Reaver|MH2|1
+2 Strength of Lunacy|TOR|1
+12 Swamp|MH2|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/monsters/minotaurmid.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/minotaurmid.dck
new file mode 100644
index 00000000000..952147606f1
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/monsters/minotaurmid.dck
@@ -0,0 +1,27 @@
+[metadata]
+Name=minotaurmid
+[Avatar]
+
+[Main]
+4 Angrath's Rampage|WAR|1
+2 Cursed Minotaur|AKH|1
+4 Deathbellow Raider|THS|1
+4 Felhide Brawler|BNG|1
+4 Felhide Petrifier|JOU|1
+4 Gnarled Scarhide|JOU|1
+4 Grand Melee|ONS|1
+3 Kragma Warcaller|THS|1
+12 Mountain|WAR|1
+3 Rage-Scarred Berserker|THB|1
+4 Ragemonger|BNG|1
+12 Swamp|WAR|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/monsters/minotaurmonored.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/minotaurmonored.dck
new file mode 100644
index 00000000000..db7c6962b98
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/monsters/minotaurmonored.dck
@@ -0,0 +1,26 @@
+[metadata]
+Name=minotaurmonored
+[Avatar]
+
+[Main]
+4 Anaba Ancestor|ME3|1
+2 Barrage of Boulders|MB1|1
+2 Fanatic of Mogis|AJMP|1
+4 Felhide Spiritbinder|BNG|1
+4 Furious Rise|M21|1
+4 Kragma Butcher|BNG|1
+4 Minotaur Skullcleaver|JMP|1
+24 Mountain|BRO|1
+4 Rageblood Shaman|JMP|1
+4 Sardian Cliffstomper|BRO|1
+4 Wild Slash|Q06|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/ooze.json b/forge-gui/res/adventure/Shandalar/decks/monsters/ooze.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/ooze.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/ooze.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/monsters/ooze_greenblackred.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/ooze_greenblackred.dck
new file mode 100644
index 00000000000..6fc7679d689
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/monsters/ooze_greenblackred.dck
@@ -0,0 +1,29 @@
+[metadata]
+Name=ooze_greenblackred
+[Avatar]
+
+[Main]
+3 Biogenic Ooze|RNA|1
+4 Bloodhall Ooze|CFX|1
+4 Experiment One|MB1|1
+8 Forest|CLB|1
+3 Gelatinous Cube|AFR|1
+4 Gluttonous Slug|MH1|1
+3 Jund Charm|C13|1
+4 Lava Coil|J21|1
+8 Mountain|CLB|1
+2 Ooze Flux|GTC|1
+4 Oran-Rief Ooze|J21|1
+2 Scavenging Ooze|NCC|1
+8 Swamp|CLB|1
+3 Uchuulon|CLB|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/monsters/ooze_greenblue.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/ooze_greenblue.dck
new file mode 100644
index 00000000000..49797dce05b
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/monsters/ooze_greenblue.dck
@@ -0,0 +1,29 @@
+[metadata]
+Name=ooze_greenblue
+[Avatar]
+
+[Main]
+2 Acidic Slime|CMR|1
+2 Acidic Slime|NEC|1
+2 Consuming Blob|MID|1
+4 Corrosive Ooze|DOM|1
+12 Forest|CLB|1
+2 Glimmerbell|J21|1
+4 Growth Spiral|STA|1
+12 Island|CLB|1
+4 Man-o'-War|J21|1
+4 Manaplasm|CN2|1
+2 Mystic Genesis|MM3|1
+2 Plasm Capture|DDO|1
+4 Slimebind|RNA|1
+4 Voidslime|PCMP|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/monsters/ooze_monogreen.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/ooze_monogreen.dck
new file mode 100644
index 00000000000..83fd08a673c
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/monsters/ooze_monogreen.dck
@@ -0,0 +1,26 @@
+[metadata]
+Name=ooze_monogreen
+[Avatar]
+
+[Main]
+4 Druid's Deliverance|C19|1
+24 Forest|AFR|1
+4 Gelatinous Genesis|2XM|1
+4 Miming Slime|GK2|1
+4 Mitotic Slime|TD2|1
+4 Ochre Jelly|AFR|1
+4 Prey Upon|AJMP|1
+2 Rampant Growth|AFC|1
+4 Slime Molding|MM3|1
+2 Splitting Slime|PZ2|1
+4 Wild Growth|AFC|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/phoenix.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/phoenix.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/phoenix.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/phoenix.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/plant.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/plant.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/plant.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/plant.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/plant.json b/forge-gui/res/adventure/Shandalar/decks/monsters/plant.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/plant.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/plant.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/sandwurm.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/sandwurm.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/sandwurm.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/sandwurm.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/satyr.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/satyr.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/satyr.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/satyr.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/scarecrow.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/scarecrow.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/scarecrow.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/scarecrow.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/scarecrowcaptain.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/scarecrowcaptain.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/scarecrowcaptain.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/scarecrowcaptain.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/sea_monster.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/sea_monster.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/sea_monster.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/sea_monster.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/sliver.json b/forge-gui/res/adventure/Shandalar/decks/monsters/sliver.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/sliver.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/sliver.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/sliver_black.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/sliver_black.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/sliver_black.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/sliver_black.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/swamptroll.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/swamptroll.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/swamptroll.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/swamptroll.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/treefolk.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/treefolk.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/treefolk.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/treefolk.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/treefolk.json b/forge-gui/res/adventure/Shandalar/decks/monsters/treefolk.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/treefolk.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/treefolk.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/treefolk_golgari.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/treefolk_golgari.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/treefolk_golgari.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/treefolk_golgari.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/troll.json b/forge-gui/res/adventure/Shandalar/decks/monsters/troll.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/troll.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/troll.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/walkingbrain.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/walkingbrain.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/walkingbrain.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/walkingbrain.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/werewolf.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/werewolf.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/werewolf.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/werewolf.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/wurm.json b/forge-gui/res/adventure/Shandalar/decks/monsters/wurm.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/wurm.json
rename to forge-gui/res/adventure/Shandalar/decks/monsters/wurm.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/yeti.dck b/forge-gui/res/adventure/Shandalar/decks/monsters/yeti.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/yeti.dck
rename to forge-gui/res/adventure/Shandalar/decks/monsters/yeti.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/humanoidrat.dck b/forge-gui/res/adventure/Shandalar/decks/nezumi/humanoidrat.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/humanoidrat.dck
rename to forge-gui/res/adventure/Shandalar/decks/nezumi/humanoidrat.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/copperhostbrutalizer.dck b/forge-gui/res/adventure/Shandalar/decks/phyrexians/copperhostbrutalizer.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/copperhostbrutalizer.dck
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/copperhostbrutalizer.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/copperhostbrutalizer.json b/forge-gui/res/adventure/Shandalar/decks/phyrexians/copperhostbrutalizer.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/copperhostbrutalizer.json
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/copperhostbrutalizer.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/copperhostinfector.json b/forge-gui/res/adventure/Shandalar/decks/phyrexians/copperhostinfector.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/copperhostinfector.json
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/copperhostinfector.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/drossgladiator.json b/forge-gui/res/adventure/Shandalar/decks/phyrexians/drossgladiator.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/drossgladiator.json
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/drossgladiator.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/drossgrimnarch.dck b/forge-gui/res/adventure/Shandalar/decks/phyrexians/drossgrimnarch.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/drossgrimnarch.dck
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/drossgrimnarch.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/drossgrimnarch.json b/forge-gui/res/adventure/Shandalar/decks/phyrexians/drossgrimnarch.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/drossgrimnarch.json
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/drossgrimnarch.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/furnacegoblin.json b/forge-gui/res/adventure/Shandalar/decks/phyrexians/furnacegoblin.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/furnacegoblin.json
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/furnacegoblin.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/furnacetormentor.dck b/forge-gui/res/adventure/Shandalar/decks/phyrexians/furnacetormentor.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/furnacetormentor.dck
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/furnacetormentor.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/furnacetormentor.json b/forge-gui/res/adventure/Shandalar/decks/phyrexians/furnacetormentor.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/furnacetormentor.json
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/furnacetormentor.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/gitaxianscientist.dck b/forge-gui/res/adventure/Shandalar/decks/phyrexians/gitaxianscientist.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/gitaxianscientist.dck
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/gitaxianscientist.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/gitaxianscientist.json b/forge-gui/res/adventure/Shandalar/decks/phyrexians/gitaxianscientist.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/gitaxianscientist.json
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/gitaxianscientist.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/gitaxianunderling.json b/forge-gui/res/adventure/Shandalar/decks/phyrexians/gitaxianunderling.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/gitaxianunderling.json
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/gitaxianunderling.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/phyrexianangel.dck b/forge-gui/res/adventure/Shandalar/decks/phyrexians/phyrexianangel.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/phyrexianangel.dck
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/phyrexianangel.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/phyrexianangel.json b/forge-gui/res/adventure/Shandalar/decks/phyrexians/phyrexianangel.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/phyrexianangel.json
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/phyrexianangel.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/phyrexianduelist.json b/forge-gui/res/adventure/Shandalar/decks/phyrexians/phyrexianduelist.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/phyrexianduelist.json
rename to forge-gui/res/adventure/Shandalar/decks/phyrexians/phyrexianduelist.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/ramp.dck b/forge-gui/res/adventure/Shandalar/decks/ramp.dck
deleted file mode 100644
index 6e43168fea0..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/ramp.dck
+++ /dev/null
@@ -1,38 +0,0 @@
-[metadata]
-Name=ramp
-[Main]
-1 Aggressive Mammoth|M19|1
-2 Blighted Woodland|MIC|1
-2 Bramble Wurm|VOW|1
-1 Celebrate the Harvest|MIC|1
-1 Crack Open|MH2|1
-2 Cultivate|AFC|1
-1 Elder Gargaroth|M21|1
-5 Forest|M10|1
-1 Forest|M10|2
-2 Forest|M10|3
-2 Forest|M10|4
-2 Forest|M20|1
-3 Forest|M20|2
-3 Forest|M20|3
-4 Forest|M20|4
-1 Gigantosaurus|M19|1
-1 Humble Naturalist|IKO|1
-1 Ilysian Caryatid|THB|1
-1 Impervious Greatwurm|GRN|1
-2 Incubation Druid|RNA|1
-1 Jaspera Sentinel|KHM|1
-2 Lifespring Druid|MB1|1
-1 Naga Vitalist|AKR|1
-3 Nature's Lore|AFC|1
-1 Panglacial Wurm|CSP|1
-1 Paradise Druid|J22|1
-1 Ram Through|IKO|1
-2 Rampant Growth|AFC|1
-1 Reclusive Taxidermist|VOW|1
-3 Rift Sower|MH2|1
-2 Rosethorn Acolyte|ELD|1
-1 Selvala, Heart of the Wilds|JMP|1
-1 Titanic Growth|M21|1
-1 Titanoth Rex|IKO|1
-1 Wild Endeavor|AFC|1
diff --git a/forge-gui/res/adventure/Shandalar/decks/red_bad[1].json b/forge-gui/res/adventure/Shandalar/decks/red_bad[1].json
deleted file mode 100644
index 219eb059c95..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/red_bad[1].json
+++ /dev/null
@@ -1,9 +0,0 @@
-{                                    
-"name":"Red bad",
-  "template":
-  {
-   "count":70,
-   "colors":["Red"], 
-   "rares":0.3
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/red_bad[2].json b/forge-gui/res/adventure/Shandalar/decks/red_bad[2].json
deleted file mode 100644
index 83f1e2d1e34..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/red_bad[2].json
+++ /dev/null
@@ -1,9 +0,0 @@
-{                                    
-"name":"Red bad",
-  "template":
-  {
-   "count":60,
-   "colors":["Red"], 
-   "rares":0.5
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/red_bad[3].json b/forge-gui/res/adventure/Shandalar/decks/red_bad[3].json
deleted file mode 100644
index 6b1cf7a8406..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/red_bad[3].json
+++ /dev/null
@@ -1,9 +0,0 @@
-{                                    
-"name":"Red bad",
-  "template":
-  {
-   "count":60,
-   "colors":["Red"], 
-   "rares":0.8
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/red_bad[4].json b/forge-gui/res/adventure/Shandalar/decks/red_bad[4].json
deleted file mode 100644
index 5ffe006966a..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/red_bad[4].json
+++ /dev/null
@@ -1,9 +0,0 @@
-{                                    
-"name":"Red bad",
-  "template":
-  {
-   "count":50,
-   "colors":["Red"], 
-   "rares":1
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/red_good.json b/forge-gui/res/adventure/Shandalar/decks/red_good.json
deleted file mode 100644
index 3ac9f5d47b8..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/red_good.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{                                    
-"name":"Red good",
-  "template":
-  {
-   "count":60,
-   "colors":["Red"], 
-   "rares":0.8
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/red_mid.json b/forge-gui/res/adventure/Shandalar/decks/red_mid.json
deleted file mode 100644
index 821c4802e18..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/red_mid.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{                                    
-"name":"Red mid",
-  "template":
-  {
-   "count":60,
-   "colors":["Red"], 
-   "rares":0.5
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/ashmouth_devil.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/ashmouth_devil.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/ashmouth_devil.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/ashmouth_devil.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/dark_spirit.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/dark_spirit.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dark_spirit.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/dark_spirit.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/dawnhart_witch.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/dawnhart_witch.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dawnhart_witch.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/dawnhart_witch.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/death_knight.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/death_knight.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/death_knight.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/death_knight.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/death_knight.json b/forge-gui/res/adventure/Shandalar/decks/unholy/death_knight.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/death_knight.json
rename to forge-gui/res/adventure/Shandalar/decks/unholy/death_knight.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/demon.json b/forge-gui/res/adventure/Shandalar/decks/unholy/demon.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/demon.json
rename to forge-gui/res/adventure/Shandalar/decks/unholy/demon.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/unholy/demonblackred.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/demonblackred.dck
new file mode 100644
index 00000000000..37e91563c82
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/unholy/demonblackred.dck
@@ -0,0 +1,28 @@
+[metadata]
+Name=demonblackred
+[Avatar]
+
+[Main]
+3 Blood Speaker|CHK|1
+4 Demon Bolt|KHM|1
+2 Demonic Embrace|M21|1
+3 Gutwrencher Oni|CHK|1
+4 Immersturm Raider|KHM|1
+2 Mark of the Oni|BOK|1
+12 Mountain|CHK|1
+3 Ogre Marauder|BOK|1
+4 Ogre Sentry|ROE|1
+3 Painwracker Oni|CHK|1
+4 Raving Oni-Slave|SOK|1
+12 Swamp|CHK|1
+4 Villainous Ogre|CHK|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/unholy/demonmonoblack.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/demonmonoblack.dck
new file mode 100644
index 00000000000..8cf519fe3a3
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/unholy/demonmonoblack.dck
@@ -0,0 +1,26 @@
+[metadata]
+Name=demonmonoblack
+[Avatar]
+
+[Main]
+4 Daggerdrome Imp|BBD|1
+3 Demon's Due|SNC|1
+2 Demon's Grasp|MB1|1
+3 Demon's Horn|DVD|1
+4 Indulgent Tormentor|IMA|1
+4 Pilfering Imp|GRN|1
+4 Scroll of Griselbrand|AVR|1
+4 Soulcage Fiend|AVR|1
+24 Swamp|BRC|1
+4 Thraxodemon|BRO|1
+4 Unholy Strength|DVD|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/unholy/demonshard.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/demonshard.dck
new file mode 100644
index 00000000000..00d3834c157
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/unholy/demonshard.dck
@@ -0,0 +1,48 @@
+[metadata]
+Name=Demons
+[Avatar]
+
+[Main]
+2 Argoth, Sanctum of Nature|BRO|1
+4 Badlands|VMA|1
+3 Be'lakor, the Dark Master|40K|1
+1 Bloodcrusher of Khorne|40K|1
+4 Bloodstained Mire|KTK|1
+1 Decree of Pain|40K|1
+1 Demon of Death's Gate|PLIST|1
+1 Exalted Flamer of Tzeentch|40K|1
+1 Griselbrand|SLD|2
+4 Herald of Slaanesh|40K|1
+1 Heralds of Tzeentch|40K|1
+1 Island|DMU|3
+1 Kuro, Pitlord|DVD|1
+2 Lightning Bolt|2X2|1
+4 Lord of Change|40K|1
+4 Mana Crypt|MPS_KLD|1
+1 Mortarion, Daemon Primarch|40K|1
+1 Mountain|DMU|1
+1 Orca, Siege Demon|DMC|1
+2 Polluted Delta|KTK|1
+1 Prince of Thralls|ALA|1
+1 Rakdos, the Showstopper|RNA|1
+1 Razaketh, the Foulblooded|SLD|1
+1 Reaper from the Abyss|C14|1
+1 Reiver Demon|DVD|1
+4 Scalding Tarn|MH2|1
+1 Sire of Insanity|SLD|1
+4 Sol Ring|40K|1
+1 Swamp|DMU|3
+2 Titania, Voice of Gaea|BRO|1
+2 Underground Sea|VMA|1
+1 Vilis, Broker of Blood|M20|1
+4 Xander's Lounge|SNC|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/devil.json b/forge-gui/res/adventure/Shandalar/decks/unholy/devil.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/devil.json
rename to forge-gui/res/adventure/Shandalar/decks/unholy/devil.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/ghost.json b/forge-gui/res/adventure/Shandalar/decks/unholy/ghost.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/ghost.json
rename to forge-gui/res/adventure/Shandalar/decks/unholy/ghost.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/ghost_blue.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/ghost_blue.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/ghost_blue.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/ghost_blue.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/ghoul.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/ghoul.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/ghoul.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/ghoul.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/hellhound.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/hellhound.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/hellhound.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/hellhound.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/hellhound2.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/hellhound2.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/hellhound2.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/hellhound2.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/immersturm_demon.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/immersturm_demon.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/immersturm_demon.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/immersturm_demon.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/lich.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/lich.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/lich.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/lich.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/mummy.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/mummy.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/mummy.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/mummy.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/rakdos_devil.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/rakdos_devil.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/rakdos_devil.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/rakdos_devil.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/reassemblingskeleton.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/reassemblingskeleton.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/reassemblingskeleton.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/reassemblingskeleton.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/skeleton.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/skeleton.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/skeleton.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/skeleton.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/skeleton_2.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/skeleton_2.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/skeleton_2.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/skeleton_2.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/skeleton_champion.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/skeleton_champion.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/skeleton_champion.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/skeleton_champion.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/vampire.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/vampire.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/vampire.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/vampire.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/vampire.json b/forge-gui/res/adventure/Shandalar/decks/unholy/vampire.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/vampire.json
rename to forge-gui/res/adventure/Shandalar/decks/unholy/vampire.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/vampire_blood_token_fly.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/vampire_blood_token_fly.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/vampire_blood_token_fly.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/vampire_blood_token_fly.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/witch.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/witch.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/witch.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/witch.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/zombie.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/zombie.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/zombie.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/zombie.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/zombie_bad.json b/forge-gui/res/adventure/Shandalar/decks/unholy/zombie_bad.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/zombie_bad.json
rename to forge-gui/res/adventure/Shandalar/decks/unholy/zombie_bad.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/zombie_good.json b/forge-gui/res/adventure/Shandalar/decks/unholy/zombie_good.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/zombie_good.json
rename to forge-gui/res/adventure/Shandalar/decks/unholy/zombie_good.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/zombie_greater.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/zombie_greater.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/zombie_greater.dck
rename to forge-gui/res/adventure/Shandalar/decks/unholy/zombie_greater.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/zombie_mid.json b/forge-gui/res/adventure/Shandalar/decks/unholy/zombie_mid.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/zombie_mid.json
rename to forge-gui/res/adventure/Shandalar/decks/unholy/zombie_mid.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/white_bad.json b/forge-gui/res/adventure/Shandalar/decks/white_bad.json
deleted file mode 100644
index 0e7c11ffb25..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/white_bad.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{                                    
-"name":"White bad",
-  "template":
-  {
-   "count":80,
-   "colors":["White"], 
-   "rares":0.1
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/white_good.json b/forge-gui/res/adventure/Shandalar/decks/white_good.json
deleted file mode 100644
index ebfcddd9e29..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/white_good.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{                                    
-"name":"White good",
-  "template":
-  {
-   "count":60,
-   "colors":["White"], 
-   "rares":0.8
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/white_mid.json b/forge-gui/res/adventure/Shandalar/decks/white_mid.json
deleted file mode 100644
index d94381d7ce5..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/white_mid.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{                                    
-"name":"White mid",
-  "template":
-  {
-   "count":60,
-   "colors":["White"],  
-   "rares":0.5
-  }
-}
diff --git a/forge-gui/res/adventure/Shandalar/decks/black_bad.json b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_easy.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/black_bad.json
rename to forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_easy.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_easy_artifact.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_easy_artifact.dck
new file mode 100644
index 00000000000..45b0476df1b
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_easy_artifact.dck
@@ -0,0 +1,34 @@
+[duel]
+[metadata]
+Name=Chucky 1
+Title=Chucky
+Difficulty=easy
+Description=Mono-black construct artifact theme deck with Pestilence
+Icon=Chucky 1.jpg
+[Main]
+1 Akroma's Memorial
+2 Buried Ruin
+3 Cabal Ritual
+2 Chief of the Foundry
+1 Creepy Doll
+3 Crypt Rats
+1 Darksteel Forge
+1 Dollhouse of Horrors
+3 Drain Life
+3 Executioner's Capsule
+2 Famine
+3 Foundry of the Consuls
+2 Heap Doll
+2 Memnite
+2 Mindless Automaton
+1 Pariah's Shield
+2 Pestilence
+1 Pestilence Demon
+3 Phyrexia's Core
+3 Snapsail Glider
+1 Stuffy Doll
+14 Swamp
+1 Sword of Feast and Famine
+1 Sword of Light and Shadow
+1 Sword of Sinew and Steel
+1 Voodoo Doll
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_easy_badmoon.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_easy_badmoon.dck
new file mode 100644
index 00000000000..afabab0518e
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_easy_badmoon.dck
@@ -0,0 +1,42 @@
+[duel]
+[metadata]
+Name=Da Vinci 1
+Title=Da Vinci
+Difficulty=easy
+Description=Mono B deck with Ashenmoor Cohort, Bad Moon and Crowd of Cinders
+Icon=Da Vinci.jpg
+Deck Type=constructed
+[main]
+22 Swamp|M12
+4 Ashenmoor Cohort
+1 Bad Moon
+3 Corrosive Mentor
+3 Crowd of Cinders
+1 Corrupt
+1 Intimidation
+1 Mind Sludge
+1 Nightmare
+1 Tendrils of Corruption
+1 Black Knight
+1 Dauthi Slayer
+1 Death Stroke
+1 Enfeeblement
+1 Hand of Cruelty
+1 Distress
+1 Nantuko Shade
+1 Nether Traitor
+1 Sign in Blood
+1 Hideous End
+1 Nocturnal Raid
+1 Vicious Hunger
+1 Cosmic Horror
+1 Cruel Bargain
+1 Ihsan's Shade
+1 Underworld Dreams
+1 Devour in Shadow
+1 Dunerider Outlaw
+1 Fear
+1 Fog of Gnats
+1 Foul Imp
+1 Ring of Xathrid
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_easy_mill.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_easy_mill.dck
new file mode 100644
index 00000000000..d897196e8bd
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_easy_mill.dck
@@ -0,0 +1,27 @@
+[duel]
+[metadata]
+Name=Agent K 1
+Title=Agent K
+Difficulty=easy
+Description=Mono B mill deck
+Icon=Agent K.jpg
+Deck Type=constructed
+[main]
+23 Swamp
+1 Bojuka Bog
+1 Altar of the Brood
+1 Shriekhorn
+1 Trepanation Blade
+1 Millstone
+1 Mindcrank
+4 Culling Drone
+4 Balustrade Spy
+4 Destroy the Evidence
+4 Grisly Spectacle
+4 Horrifying Revelation
+4 Returned Centaur
+2 Dominator Drone
+2 Nightveil Specter
+2 Extractor Demon
+1 Lord of the Void
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_hard_gravepact.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_hard_gravepact.dck
new file mode 100644
index 00000000000..d8ee5d77d74
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_hard_gravepact.dck
@@ -0,0 +1,29 @@
+[duel]
+[metadata]
+Name=Black Flame 3
+Title=Black Flame
+Difficulty=hard
+Description=Mono B Sacrifice deck with Shirei, Shizo's Caretaker, Harvester of Souls and Grave Pact
+Icon=Black Flame.jpg
+Deck Type=constructed
+[main]
+1 Black Market
+3 Blood Artist
+3 Zulaport Cutthroat
+1 Butcher of Malakir
+4 Death Cultist
+3 Deathgreeter
+1 Falkenrath Noble
+1 Fume Spitter
+1 Grave Betrayal
+4 Grave Pact
+3 Harvester of Souls
+1 Massacre Wurm
+1 Mox Jet
+1 Ogre Slumlord
+2 Royal Assassin
+1 Sangromancer
+4 Shirei, Shizo's Caretaker
+2 Skirsdag High Priest
+23 Swamp
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_hard_knight.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_hard_knight.dck
new file mode 100644
index 00000000000..a3dee9f56e8
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_hard_knight.dck
@@ -0,0 +1,46 @@
+[duel]
+[metadata]
+Name=Silas's Faithful 3
+Title=Silas Kane, Witch Knight of the Death-Hand
+Difficulty=hard
+Description=Mono-black knight theme deck with reanimation
+Icon=Silas Kane 3.jpg
+Deck Type=constructed
+[Main]
+1 Archetype of Finality
+1 Beacon of Unrest
+2 Belle of the Brawl
+2 Black Knight
+2 Blacklance Paragon
+2 Blighted Fen
+2 Bloodsworn Squire
+2 Call the Bloodline
+1 Champion of Dusk
+2 Corrupt
+2 Crypt of Agadeem
+1 Death Pit Offering
+2 Diamond Knight
+2 Dregs of Sorrow
+1 Endless Obedience
+2 Entreat the Dead
+2 Field of the Dead
+2 Forsworn Paladin
+1 Gate to Phyrexia
+1 Haakon, Stromgald Scourge
+1 Ihsan's Shade
+1 Intimidation
+1 Josu Vess, Lich Knight
+2 Knight of Dusk
+2 Knight of the Ebon Legion
+2 Leechridden Swamp
+2 Markov Dreadknight
+2 Memorial to Folly
+2 Murderous Rider
+21 Swamp
+1 Syr Konrad, the Grim
+2 Tendrils of Corruption
+2 Vampiric Embrace
+1 Volrath's Stronghold
+2 Vraska's Contempt
+1 Whip of Erebos
+2 Witch's Cottage
diff --git a/forge-gui/res/adventure/Shandalar/decks/black_wiz3.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_hard_liliana.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/black_wiz3.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_hard_liliana.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_hard_sacrifice.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_hard_sacrifice.dck
new file mode 100644
index 00000000000..0612d236d3b
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_hard_sacrifice.dck
@@ -0,0 +1,29 @@
+[duel]
+[metadata]
+Name=Black Abott 3
+Title=Black Abott
+Difficulty=hard
+Description=Mono B Sacrifice deck with Reassembling Skeleton and Vampiric Rites
+Icon=Black Abott.jpg
+Deck Type=constructed
+[main]
+23 Swamp|ONS
+1 Mox Jet
+4 Nether Traitor
+4 Reassembling Skeleton
+4 Bloodghast
+4 Endless Cockroaches
+4 Krovikan Horror
+1 Geralf's Messenger
+1 Attrition
+1 Malevolent Awakening
+4 Vampiric Rites
+1 Stronghold Assassin
+1 Nezumi Bone-Reader
+1 Plagued Rusalka
+1 Grim Haruspex
+1 Grave Pact
+2 Go for the Throat
+1 Geth's Verdict
+1 Hymn to Tourach
+[sideboard]
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_medium_demonicpact.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_medium_demonicpact.dck
new file mode 100644
index 00000000000..0f58a6e0639
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_medium_demonicpact.dck
@@ -0,0 +1,32 @@
+[duel]
+[metadata]
+Name=Demonic Pact 2
+Title=Diablo, Lord of Terror
+Difficulty=medium
+Description=Mono-black demon theme deck with Lord of the Pit and Grave Pact
+Icon=Diablo2 2.jpg
+Deck Type=constructed
+[Main]
+2 Abhorrent Overlord
+2 Abyssal Persecutor
+1 Beacon of Unrest
+3 Blood Speaker
+2 Breeding Pit
+3 Dark Ritual
+1 Demon of Catastrophes
+2 Demonic Torment
+2 Desecration Demon
+2 Drain Life
+2 Grave Pact
+2 Liege of the Pit
+2 Lord of the Pit
+2 Master of the Feast
+2 Memorial to Folly
+3 Sign in Blood
+2 Skirsdag High Priest
+2 Spawn of Mayhem
+16 Swamp
+2 Tendrils of Corruption
+1 Varragoth, Bloodsky Sire
+1 Volrath's Stronghold
+3 Witch's Cottage
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_medium_fear.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_medium_fear.dck
new file mode 100644
index 00000000000..c9d48ef4751
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_medium_fear.dck
@@ -0,0 +1,31 @@
+[duel]
+[metadata]
+Name=Ratbert 2
+Title=Ratbert
+Difficulty=medium
+Description=Mono B Fear deck with Thran Lens
+Icon=Ratbert.jpg
+Deck Type=constructed
+[main]
+23 Swamp|M11
+4 Thran Lens
+1 Dread
+1 Gluttonous Zombie
+1 Guiltfeeder
+1 Lingering Tormentor
+3 Nezumi Cutthroat
+2 Order of Yawgmoth
+2 Prickly Boggart
+2 Severed Legion
+1 Dross Prowler
+1 Razortooth Rats
+3 Shriekmaw
+1 Woebearer
+3 Halo Hunter
+1 Crowd of Cinders
+4 Dross Golem
+1 Geth, Lord of the Vault
+2 Wrench Mind
+2 Death Stroke
+1 Grasp of Darkness
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_medium_goblins.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_medium_goblins.dck
new file mode 100644
index 00000000000..a0c3315b29b
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/blackwizard_medium_goblins.dck
@@ -0,0 +1,24 @@
+[duel]
+[metadata]
+Name=Nelson Muntz 2
+Title=Nelson Muntz
+Difficulty=medium
+Description=Mono B Goblin Rogue deck
+Icon=Nelson Muntz.jpg
+Deck Type=constructed
+[main]
+4 Auntie's Snitch
+4 Frogtosser Banneret
+1 Squeaking Pie Grubfellows
+4 Prickly Boggart
+4 Squeaking Pie Sneak
+4 Stinkdrinker Bandit
+4 Warren Pilferers
+2 Knucklebone Witch
+4 Mad Auntie
+4 Murder
+2 Door of Destinies
+2 Cloak and Dagger
+17 Swamp
+4 Cavern of Souls
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/blue_bad.json b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_easy.json.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/blue_bad.json
rename to forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_easy.json.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_easy_artifact.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_easy_artifact.dck
new file mode 100644
index 00000000000..5428646cbd9
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_easy_artifact.dck
@@ -0,0 +1,36 @@
+[duel]
+[metadata]
+Name=Tezzeret's Reinforged 1
+Title=Tezzeret, Master Artificer
+Difficulty=easy
+Description=Mono-blue artifact and equipment theme deck
+Icon=Tezzeret, Master Artificer 1.jpg
+Deck Type=constructed
+[Main]
+2 Acquisition Octopus
+2 Armguard Familiar
+1 Armory Automaton
+2 Banshee's Blade
+2 Bladed Pinions
+2 Brass Squire
+1 Broodstar
+2 Chief of the Foundry
+1 Chromescale Drake
+2 Contagion Clasp
+3 Darksteel Citadel
+1 Darksteel Plate
+2 Deadeye Quartermaster
+1 Etched Champion
+3 Foundry of the Consuls
+1 Hammer of Nazahn
+12 Island
+1 Magebane Armor
+2 Master of Etherium
+1 Masterwork of Ingenuity
+3 Metallic Rebuke
+2 Myr Adapter
+2 Rusted Relic
+4 Seat of the Synod
+2 Snapsail Glider
+1 The Reality Chip
+2 Towashi Guide-Bot
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_easy_control.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_easy_control.dck
new file mode 100644
index 00000000000..1e187c2bd3f
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_easy_control.dck
@@ -0,0 +1,33 @@
+[duel]
+[metadata]
+Name=Kojak 1
+Title=Kojak
+Difficulty=easy
+Description=Mono U deck with Sunken City, Inundate, counterspells and bounce
+Icon=Kojak.jpg
+Deck Type=constructed
+[main]
+4 Merrow Levitator
+1 Spire Golem
+4 Briarberry Cohort
+2 Concentrate
+2 Muddle the Mixture
+1 Kami of the Crescent Moon
+1 Sunken City
+22 Island|M12
+1 Inundate
+2 Boomerang
+2 Eye of Nowhere
+1 Dandan
+4 Faerie Swarm
+1 Manta Ray
+2 Invisibility
+1 Thalakos Seer
+1 Flow of Ideas
+1 Counterspell
+1 Deepchannel Mentor
+2 Serpent of the Endless Sea
+2 Tidings
+1 Amnesia
+1 Harbor Serpent
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_easy_thassa.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_easy_thassa.dck
new file mode 100644
index 00000000000..4f653fb107a
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_easy_thassa.dck
@@ -0,0 +1,34 @@
+[duel]
+[metadata]
+Name=Thassa's Rising Tide 1
+Title=Thassa, God of the Sea
+Difficulty=easy
+Description=Mono-blue Quest for Ula's Temple theme deck
+Icon=Thassa 1.jpg
+Deck Type=constructed
+[Main]
+2 Apprentice Wizard
+1 Breaching Leviathan
+1 Deep-Sea Kraken
+3 Dissolve
+2 Foresee
+4 Halimar Depths
+14 Island
+3 Kraken Hatchling
+1 Kraken of the Straits
+2 Levitation
+3 Merfolk Wayfinder
+2 Octoprophet
+3 Perilous Voyage
+2 Quest for Ula's Temple
+1 Scourge of Fleets
+2 Serpent of the Endless Sea
+1 Slinn Voda, the Rising Deep
+2 Spreading Seas
+1 Stormtide Leviathan
+1 Thassa, Deep-Dwelling
+1 Thassa, God of the Sea
+1 Tromokratis
+1 Whelming Wave
+2 Wormhole Serpent
+4 Zhalfirin Void
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_hard_artifact.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_hard_artifact.dck
new file mode 100644
index 00000000000..ac8db027062
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_hard_artifact.dck
@@ -0,0 +1,30 @@
+[duel]
+[metadata]
+Name=Nox 3
+Title=Nox
+Difficulty=hard
+Description=Mono Blue Artifacts deck with Mirror Gallery, Tezzeret, Artifice Master, Tezzeret, Cruel Machinist, and Karn, Scion of Urza.
+Deck Type=constructed
+Icon=Nox.jpg
+[main]
+1 Ancestral Recall|LEA
+1 Ancestral Vision|TSP
+1 Black Lotus|LEA
+2 Depths of Desire|XLN
+3 Hornswoggle|RIX
+18 Island
+4 Karn, Scion of Urza|DOM
+3 Mirror Gallery|BOK
+4 Mishra's Self-Replicator|DOM
+1 Mox Emerald|LEA
+1 Mox Jet|LEA
+1 Mox Pearl|LEA
+1 Mox Ruby|LEA
+1 Mox Sapphire|LEA
+2 One with the Machine|M19
+4 Sai, Master Thopterist|M19
+4 Tezzeret, Artifice Master|M19
+4 Tezzeret, Cruel Machinist|M19
+2 The Antiquities War|DOM
+1 Time Walk|LEA
+1 Timetwister|LEA
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_hard_bounce.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_hard_bounce.dck
new file mode 100644
index 00000000000..caced634902
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_hard_bounce.dck
@@ -0,0 +1,27 @@
+[duel]
+[metadata]
+Name=R2-D2 3
+Title=R2-D2
+Difficulty=hard
+Description=Mono U Black Vise deck with bounce spells and Howling Mine
+Icon=R2-D2.jpg
+Deck Type=constructed
+[main]
+20 Island|M11
+1 The Tabernacle at Pendrell Vale
+1 Mox Sapphire
+4 Evacuation
+4 Upheaval
+4 Trinket Mage
+4 Black Vise
+1 Echoing Truth
+3 Boomerang
+1 Repulse
+4 Hoodwink
+3 Words of Wisdom
+1 Ancestral Recall
+4 Vision Skeins
+3 Howling Mine
+1 Remand
+1 Frozen AEther
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_hard_control.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_hard_control.dck
new file mode 100644
index 00000000000..7e74e868391
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_hard_control.dck
@@ -0,0 +1,34 @@
+[duel]
+[metadata]
+Name=Kojak 3
+Title=Kojak
+Difficulty=hard
+Description=Mono U deck with Sunken City, Inundate, counterspells and bounce
+Icon=Kojak.jpg
+Deck Type=constructed
+[main]
+21 Island|M10
+1 Mox Sapphire
+1 Sapphire Medallion
+1 Ancestral Recall
+1 Time Walk
+2 Boomerang
+2 Eye of Nowhere
+4 Counterspell
+1 Tidings
+2 Concentrate
+1 Kami of the Crescent Moon
+1 Thalakos Seer
+4 Briarberry Cohort
+2 Deepchannel Mentor
+3 Faerie Swarm
+3 Inundate
+1 Merrow Levitator
+1 Sunken City
+2 Flow of Ideas
+1 Arcanis the Omnipotent
+2 Sphinx of Magosi
+1 Spire Golem
+1 Dungeon Geists
+1 Master of Waves
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/counter.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_hard_control2.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/counter.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_hard_control2.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_medium_donate.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_medium_donate.dck
new file mode 100644
index 00000000000..5d79651e712
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_medium_donate.dck
@@ -0,0 +1,27 @@
+[duel]
+[metadata]
+Name=The Great and Powerful Trixie 2
+Title=The Great and Powerful Trixie
+Difficulty=hard
+Description=U splash W Trix combo deck with Illusions of Grandeur and Donate
+Icon=The Great and Powerful Trixie.jpg
+Deck Type=constructed
+Profile=Cautious
+[main]
+3 Arcane Denial
+2 Cancel
+3 Disdainful Stroke
+4 Donate
+1 Enlightened Tutor
+3 Essence Scatter
+4 Glacial Fortress
+4 Illusions of Grandeur
+14 Island
+3 Mana Leak
+1 Mystical Tutor
+1 Plains
+4 Sapphire Medallion
+2 Seachrome Coast
+3 Unsummon
+4 Vapor Snag
+4 Wrath of God
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_medium_dragons.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_medium_dragons.dck
new file mode 100644
index 00000000000..c57f31e74e5
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_medium_dragons.dck
@@ -0,0 +1,37 @@
+[duel]
+[metadata]
+Name=Keiga's Forged Alliance 2
+Title=Keiga, the Tide Star
+Difficulty=medium
+Description=Mono-blue dragons and artifacts theme deck
+Icon=Keiga, the Tide Star 2.jpg
+Deck Type=constructed
+[Main]
+2 Belltoll Dragon
+1 Clockwork Dragon
+1 Cloud Dragon
+3 Counterspell
+3 Courier's Capsule
+1 Coveted Jewel
+3 Cumber Stone
+3 Darksteel Citadel
+1 Dragon Turtle
+2 Dragon's Hoard
+2 Dragonloft Idol
+3 Haven of the Spirit Dragon
+2 Henge Guardian
+3 Heraldic Banner
+1 Icefall Regent
+10 Island
+1 Keiga, the Tide Star
+1 Mirrorworks
+2 Phyrexian Metamorph
+2 Propaganda
+1 Quicksilver Dragon
+4 Seat of the Synod
+1 Shimmer Dragon
+2 Skyblinder Staff
+1 Steel Hellkite
+1 Teeka's Dragon
+2 Treasure Vault
+1 Vanquisher's Banner
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_medium_midrange.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_medium_midrange.dck
new file mode 100644
index 00000000000..b94cf75bf75
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_medium_midrange.dck
@@ -0,0 +1,26 @@
+[duel]
+[metadata]
+Name=Tinkerbell 2
+Title=Tinkerbell
+Difficulty=medium
+Description=Mono U Faeries midrange deck with flying creatures
+Icon=Tinkerbell.jpg
+Deck Type=constructed
+[main]
+2 Curiosity
+4 Faerie Conclave
+4 Faerie Miscreant
+2 Faerie Swarm
+2 Faerie Trickery
+4 Favorable Winds
+2 Glen Elendra Liege
+2 Gravitational Shift
+20 Island
+2 Mistbind Clique
+2 Oona, Queen of the Fae
+2 Robe of Mirrors
+4 Scion of Oona
+4 Spellstutter Sprite
+2 Vapor Snag
+2 Void Snare
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/mill.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_medium_mill.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/mill.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/bluewizard_medium_mill.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/chandra1.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/chandra1.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/chandra1.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/chandra1.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/chandra2.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/chandra2.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/chandra2.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/chandra2.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/chandra3.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/chandra3.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/chandra3.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/chandra3.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/chandra4.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/chandra4.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/chandra4.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/chandra4.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/chandra5.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/chandra5.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/chandra5.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/chandra5.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/chandra6.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/chandra6.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/chandra6.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/chandra6.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/curselord.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/curselord.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/curselord.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/curselord.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/dimir_ninja.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/dimir_ninja.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dimir_ninja.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/dimir_ninja.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/dimir_poison.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/dimir_poison.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/dimir_poison.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/dimir_poison.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/green_bad.json b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_easy.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/green_bad.json
rename to forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_easy.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_easy_elf.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_easy_elf.dck
new file mode 100644
index 00000000000..477dc9c3ecd
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_easy_elf.dck
@@ -0,0 +1,24 @@
+[duel]
+[metadata]
+Name=Princess Zelda 1
+Title=Princess Zelda
+Difficulty=easy
+Description=Mono G Dominaria Standard-legal Elves deck with Verdant Force.
+Icon=Princess Zelda.jpg
+Deck Type=constructed
+[main]
+2 Blackblade Reforged
+2 Elfhame Druid
+21 Forest|DOM
+4 Gift of Growth
+2 Grow from the Ashes
+2 Helm of the Host
+4 Llanowar Elves
+3 Marwyn, the Nurturer
+3 Memorial to Unity
+3 Song of Freyalise
+3 Steel Leaf Champion
+3 Untamed Kavu
+4 Verdant Force
+4 Wild Onslaught
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_easy_enchantment.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_easy_enchantment.dck
new file mode 100644
index 00000000000..a0708c80476
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_easy_enchantment.dck
@@ -0,0 +1,36 @@
+[duel]
+[metadata]
+Name=Nylea's Enchanted Assault 1
+Title=Nylea, God of the Hunt
+Difficulty=easy
+Description=Mono-green enchantment creatures theme deck
+Icon=Nylea 1.jpg
+Deck Type=constructed
+[Main]
+1 Arasta of the Endless Web
+2 Archetype of Endurance
+2 Blanchwood Armor
+1 Bow of Nylea
+2 Colossal Majesty
+2 Courser of Kruphix
+2 Destiny Spinner
+14 Forest
+2 Gaea's Anthem
+4 Gingerbread Cabin
+3 Gleeful Sabotage
+2 Leafcrown Dryad
+1 Nylea's Colossus
+2 Nylea's Disciple
+2 Nylea's Emissary
+2 Nylea's Forerunner
+2 Nylea's Huntmaster
+1 Nylea's Intervention
+1 Nylea, God of the Hunt
+1 Nylea, Keen-Eyed
+1 Nyxbloom Ancient
+2 Ordeal of Nylea
+1 Renata, Called to the Hunt
+1 Sanctum Weaver
+4 Sapseep Forest
+1 Verduran Enchantress
+1 Weaver of Harmony
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_easy_vanilla.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_easy_vanilla.dck
new file mode 100644
index 00000000000..1cf74bbeee6
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_easy_vanilla.dck
@@ -0,0 +1,28 @@
+[duel]
+[metadata]
+Name=Radagast 2
+Title=Radagast
+Difficulty=medium
+Description=Mono G Muraganda Petroglyphs deck with vanilla creatures and a few tokens
+Icon=Radagast.jpg
+Deck Type=constructed
+[main]
+23 Forest|M11
+4 Muraganda Petroglyphs
+2 Hornet Sting
+2 Hurricane
+1 Needle Storm
+1 Momentous Fall
+4 Elvish Warrior
+4 Leatherback Baloth
+3 Gnarled Mass
+3 Trained Armodon
+3 Call of the Herd
+1 Beacon of Creation
+3 Imperiosaur
+2 Bestial Menace
+1 Beast Attack
+1 Moss Monster
+1 Silverback Ape
+1 Craw Wurm
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_hard_ramp.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_hard_ramp.dck
new file mode 100644
index 00000000000..cd467fdc575
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_hard_ramp.dck
@@ -0,0 +1,35 @@
+[duel]
+[metadata]
+Name=Boromir 3
+Title=Boromir
+Difficulty=hard
+Description=Mono G Elvish Piper deck with Quicksilver Amulet and huge creatures
+Icon=Boromir.jpg
+Deck Type=constructed
+[main]
+19 Snow-Covered Forest
+4 Bayou
+4 Elvish Piper
+3 Quicksilver Amulet
+1 Harmonize
+3 Rampant Growth
+2 Into the North
+4 Wall of Blossoms
+1 Elvish Visionary
+3 Dramatic Entrance
+2 Lure of Prey
+1 Naturalize
+1 Nourish
+1 Defense of the Heart
+1 Autochthon Wurm
+1 Empyrial Archangel
+1 Godsire
+1 Hellkite Overlord
+1 Khalni Hydra
+1 Liege of the Tangle
+1 Pelakka Wurm
+1 Progenitus
+1 Verdant Force
+1 Vorinclex, Voice of Hunger
+1 Woodfall Primus
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_hard_rampbiss.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_hard_rampbiss.dck
new file mode 100644
index 00000000000..3b67ad98126
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_hard_rampbiss.dck
@@ -0,0 +1,25 @@
+[duel]
+[metadata]
+Name=Chewbacca 3
+Title=Chewbacca
+Difficulty=hard
+Description=Mono G Essence of the Wild deck
+Icon=Chewbacca.jpg
+Deck Type=constructed
+[main]
+4 Awakening Zone
+4 Birds of Paradise
+1 Concordant Crossroads
+4 Dryad Arbor
+4 Essence of the Wild
+4 Fierce Empath
+2 Fists of Ironwood
+15 Forest
+4 Fyndhorn Elves
+4 Growth Spasm
+4 Khalni Garden
+4 Llanowar Elves
+1 Nest Invader
+4 Noble Hierarch
+1 Mox Emerald
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_hard_sapproling.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_hard_sapproling.dck
new file mode 100644
index 00000000000..813489d50ae
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_hard_sapproling.dck
@@ -0,0 +1,42 @@
+[duel]
+[metadata]
+Name=Tendershoot Dryad 3
+Title=Tendershoot Dryad
+Difficulty=hard
+Description=Mono-green saproling tokens, enchantments, and legends deck
+Icon=Tendershoot Dryad 3.jpg
+Deck Type=constructed
+[Main]
+1 Anointed Procession
+2 Aura Shards
+4 Canopy Vista
+1 Cathars' Crusade
+2 Contagion Clasp
+1 Contagion Engine
+1 Doubling Season
+1 Eldrazi Monument
+9 Forest
+2 Fungal Plots
+3 Krosan Verge
+2 Marshal's Anthem
+2 Mirari's Wake
+2 Mycoloth
+1 Nemata, Grove Guardian
+3 Oran-Rief, the Vastwood
+1 Parallel Lives
+10 Plains
+3 Pollenbright Wings
+1 Primal Vigor
+1 Privileged Position
+2 Psychotrope Thallid
+3 Rebuff the Wicked
+2 Sporecrown Thallid
+3 Sporesower Thallid
+2 Sporoloth Ancient
+3 Sprout Swarm
+4 Sunpetal Grove
+2 Utopia Mycon
+2 Verdant Embrace
+2 Verdant Force
+1 Verdeloth the Ancient
+1 Yavimaya Hollow
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_medium_cheatramp.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_medium_cheatramp.dck
new file mode 100644
index 00000000000..05d8e9e0446
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_medium_cheatramp.dck
@@ -0,0 +1,30 @@
+[duel]
+[metadata]
+Name=Amalia Sheran Sharm 2
+Title=Amalia Sheran Sharm
+Difficulty=medium
+Description=Mono Green Ramp deck with Elves synergy, Gigantosaurus, and Impervious Greatwurm.
+Deck Type=constructed
+Icon=Amalia Sheran Sharm.jpg
+[main]
+2 Aggressive Mammoth|M19
+1 Arboretum Elemental|GRN
+4 Beast Whisperer|GRN
+2 Blackblade Reforged|DOM
+3 Druid of the Cowl|M19
+4 Elvish Clancaller|M19
+5 Forest|DOM|1
+5 Forest|DOM|2
+5 Forest|DOM|3
+5 Forest|DOM|4
+2 Forest|GRN
+2 Gigantosaurus|M19
+1 Impervious Greatwurm|GRN
+4 Llanowar Elves|DOM
+3 Marwyn, the Nurturer|DOM
+2 Pelt Collector|GRN
+3 Song of Freyalise|DOM
+3 Steel Leaf Champion|DOM
+2 Vivien of the Arkbow|M19
+2 Vivien Reid|M19
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_medium_nissa.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_medium_nissa.dck
new file mode 100644
index 00000000000..bd20174c8c4
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_medium_nissa.dck
@@ -0,0 +1,38 @@
+[duel]
+[metadata]
+Name=Nissa Revane 2
+Title=Nissa Revane
+Difficulty=medium
+Description=Mono-green elemental and lands theme deck with Nissa planeswalkers
+Icon=Nissa Revane 2.jpg
+Deck Type=constructed
+[Main]
+1 Ancient Greenwarden
+1 Ashaya, Soul of the Wild
+1 Avenger of Zendikar
+1 Brambleweft Behemoth
+2 Dryad Arbor
+1 Endurance
+3 Evolving Wilds
+12 Forest
+2 Guardian of the Great Conduit
+3 Harmonize
+2 Hunting Wilds
+1 Liege of the Tangle
+2 Naturalize
+1 Nissa's Encouragement
+1 Nissa's Pilgrimage
+2 Nissa's Zendikon
+1 Nissa, Genesis Mage
+1 Nissa, Vastwood Seer
+1 Nissa, Vital Force
+2 Oracle of Mul Daya
+2 Ring of Kalonia
+2 Sapseep Forest
+2 Spidersilk Armor
+2 Staff of the Wild Magus
+3 Sylvan Advocate
+1 Timber Protector
+4 Tranquil Thicket
+2 Undergrowth Champion
+1 Yavimaya Hollow
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_medium_snakes.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_medium_snakes.dck
new file mode 100644
index 00000000000..b28d08fa665
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_medium_snakes.dck
@@ -0,0 +1,35 @@
+[duel]
+[metadata]
+Name=Nagini 2
+Title=Nagini
+Difficulty=medium
+Description=Mono G Snake deck
+Icon=Nagini.jpg
+Deck Type=constructed
+[main]
+2 Tangle Asp|5DN
+2 River Boa|ZEN
+2 Mire Boa|PLC
+2 Ohran Viper|CSP
+2 Kashi-Tribe Elite|SOK
+1 Orochi Ranger|CHK
+2 Sosuke's Summons|BOK
+2 Kashi-Tribe Warriors|CHK
+2 Death-Hood Cobra|NPH
+1 Overwhelming Stampede|M11
+1 Needle Storm|9ED
+2 Stonewood Invocation|TSP
+2 Seshiro the Anointed|CHK
+2 Sakura-Tribe Elder|CHK
+1 Sachi, Daughter of Seshiro|CHK
+1 Boa Constrictor|MMQ
+1 Hornet Cobra|LEG
+20 Forest|MBS
+1 Kashi-Tribe Reaver|CHK
+1 Whirlwind|S99
+4 Verdant Catacombs|ZEN
+3 Sosuke, Son of Seshiro|CHK
+1 Ambush Viper
+1 Hooded Hydra
+1 Lotus Cobra
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/trample.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_medium_trample.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/trample.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/greenwizard_medium_trample.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/illusion.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/illusion.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/illusion.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/illusion.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/lilianas_herbalist.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/lilianas_herbalist.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/lilianas_herbalist.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/lilianas_herbalist.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/pyromancer.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/pyromancer.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/pyromancer.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/pyromancer.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/rakdos_vamps.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/rakdos_vamps.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/rakdos_vamps.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/rakdos_vamps.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/reanimator.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/reanimator.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/reanimator.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/reanimator.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/reanimator_cycling_rbu.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/reanimator_cycling_rbu.dck
new file mode 100644
index 00000000000..6dd53342f84
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/reanimator_cycling_rbu.dck
@@ -0,0 +1,43 @@
+[duel]
+[metadata]
+Name=Belial's Devious Dealings 3
+Title=Belial, Hells's Adjudicator
+Difficulty=hard
+Description=RBU cycling and reanimate theme deck
+Icon=Belial 3.jpg
+Deck Type=constructed
+[Main]
+2 Archfiend of Ifnir
+2 Architects of Will
+4 Badlands
+2 Baleful Mastery
+2 Beacon of Unrest
+2 By Force
+2 Counterflux
+3 Crumbling Necropolis
+2 Curator of Mysteries
+2 Decree of Silence
+4 Dragonskull Summit
+2 Drake Haven
+2 Drannith Stinger
+4 Drowned Catacomb
+2 Flameblade Adept
+2 Flayer of the Hatebound
+2 Hex Parasite
+2 Lightning Rift
+1 Living Death
+1 Living End
+3 Mirrorpool
+2 Nimble Obstructionist
+2 Rooting Moloch
+2 Sanctuary Smasher
+1 Scion of Darkness
+2 Shark Typhoon
+2 Spellpyre Phoenix
+4 Sulfur Falls
+4 Underground Sea
+1 Unpredictable Cyclone
+2 Vile Manifestation
+2 Void Beckoner
+4 Volcanic Island
+4 Xander's Lounge
diff --git a/forge-gui/res/adventure/Shandalar/decks/red_bad.json b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_easy.json
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/red_bad.json
rename to forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_easy.json
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_easy_burn.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_easy_burn.dck
new file mode 100644
index 00000000000..d5837e22306
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_easy_burn.dck
@@ -0,0 +1,34 @@
+[duel]
+[metadata]
+Name=Jaya's Conflagration 1
+Title=Jaya Ballard
+Difficulty=easy
+Description=Mono-red elemental and burn themed deck
+Icon=Jaya Ballard 1.jpg
+Deck Type=constructed
+[Main]
+2 Ball Lightning
+2 Browbeat
+3 Castle Embereth
+1 Chandra's Incinerator
+2 Cinder Elemental
+2 Cinder Pyromancer
+1 Comet Storm
+2 Disintegrate
+2 Elixir of Immortality
+2 Fire Servant
+2 Hammer of Bogardan
+1 Harmonic Prodigy
+2 Incandescent Soulstoke
+3 Incinerate
+1 Increasing Vengeance
+2 Kiln Fiend
+2 Mimic Vat
+16 Mountain
+3 Pyretic Ritual
+2 Soul-Scar Mage
+1 Spinerock Knoll
+2 Valakut, the Molten Pinnacle
+2 Wildfire Elemental
+2 Young Pyromancer
+[Sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_easy_dragons.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_easy_dragons.dck
new file mode 100644
index 00000000000..1079d286a1e
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_easy_dragons.dck
@@ -0,0 +1,36 @@
+[duel]
+[metadata]
+Name=Ryusei's Fiery Fall 1
+Title=Ryusei, the Falling Star
+Difficulty=easy
+Description=Mono-red dragons and artifacts theme deck
+Icon=Ryusei, the Falling Star 1.jpg
+Deck Type=constructed
+Profile=Reckless
+[main]
+2 Amethyst Dragon
+2 Arcbound Whelp
+2 Buried Ruin
+1 Covetous Dragon
+4 Darksteel Citadel
+3 Draconic Roar
+1 Dragon's Hoard
+3 Dragonlord's Servant
+2 Dragonspark Reactor
+3 Feedback Bolt
+1 Ganax, Astral Hunter
+1 Goldspan Dragon
+4 Great Furnace
+1 Hellkite Igniter
+1 Hellkite Tyrant
+1 Hoarding Dragon
+1 Moltensteel Dragon
+12 Mountain
+1 Opportunistic Dragon
+1 Orb of Dragonkind
+2 Ore-Scale Guardian
+3 Pristine Talisman
+2 Rapacious Dragon
+2 Ryusei, the Falling Star
+1 Steel Hellkite
+3 Welding Sparks
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_easy_gauntletofmight.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_easy_gauntletofmight.dck
new file mode 100644
index 00000000000..abb99aa9a5f
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_easy_gauntletofmight.dck
@@ -0,0 +1,22 @@
+[duel]
+[metadata]
+Name=Firestorm 2
+Title=Firestorm
+Difficulty=medium
+Description=Mono R Gauntlet of Might deck with pumpable creatures
+Icon=Firestorm.jpg
+Deck Type=constructed
+[main]
+2 Blood Moon
+4 Bloodmark Mentor
+4 Dragon Hatchling
+4 Flamekin Brawler
+4 Gauntlet of Might
+2 Molten Ravager
+4 Moonveil Dragon
+24 Mountain
+4 Pyre Charger
+4 Rage Reflection
+2 Volcanic Strength
+2 Whispersilk Cloak
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_hard_burn.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_hard_burn.dck
new file mode 100644
index 00000000000..00d0aa3ca53
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_hard_burn.dck
@@ -0,0 +1,34 @@
+[duel]
+[metadata]
+Name=Jaya's Conflagration 3
+Title=Jaya Ballard
+Difficulty=hard
+Description=Mono-red elemental and burn themed deck
+Icon=Jaya Ballard 3.jpg
+Deck Type=constructed
+[Main]
+3 Browbeat
+2 Chandra's Incinerator
+4 Dwarven Mine
+2 Electrodominance
+2 Elixir of Immortality
+3 Exquisite Firecraft
+3 Fire Servant
+1 Flame Wave
+4 Forgotten Cave
+2 Hammer of Bogardan
+1 Hostility
+3 Incandescent Soulstoke
+2 Increasing Vengeance
+3 Kiln Fiend
+2 Lightning Serpent
+2 Living Inferno
+21 Mountain
+3 Pyretic Ritual
+2 Pyromancer Ascension
+3 Seething Song
+2 Soul-Scar Mage
+1 Spinerock Knoll
+2 Stalking Vengeance
+4 Valakut, the Molten Pinnacle
+3 Young Pyromancer
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_hard_dragons.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_hard_dragons.dck
new file mode 100644
index 00000000000..1026c6a7134
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_hard_dragons.dck
@@ -0,0 +1,35 @@
+[duel]
+[metadata]
+Name=Sarkhan Vol 3
+Title=Sarkhan Vol
+Difficulty=hard
+Description=Mono-red dragons with Sarkhan planeswalkers, mana ramp, and Dragonstorm
+Icon=Sarkhan Vol 3.jpg
+Deck Type=constructed
+[Main]
+1 Balefire Dragon
+4 Castle Embereth
+2 Dragon Tempest
+2 Dragonmaster Outcast
+3 Dragonspeaker Shaman
+2 Dragonstorm
+3 Gauntlet of Might
+1 Lathliss, Dragon Queen
+2 Moonveil Dragon
+26 Mountain
+4 Rite of Flame
+2 Sarkhan's Triumph
+1 Sarkhan, Dragonsoul
+1 Sarkhan, Fireblood
+2 Scourge of Valkas
+3 Seething Song
+1 Skyline Despot
+2 Skyship Stalker
+3 Spit Flame
+2 Steel Hellkite
+2 Thunderbreak Regent
+2 Thundermaw Hellkite
+1 Utvara Hellkite
+4 Valakut, the Molten Pinnacle
+3 Vanquisher's Banner
+1 Verix Bladewing
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_hard_fight.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_hard_fight.dck
new file mode 100644
index 00000000000..fddbc40653b
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_hard_fight.dck
@@ -0,0 +1,30 @@
+[duel]
+[metadata]
+Name=Crocodile Dundee 3
+Title=Crocodile Dundee
+Difficulty=hard
+Description=Mono R deck with Mudbrawler Cohort and Bloodmark Mentor
+Icon=Crocodile Dundee.jpg
+Deck Type=constructed
+[main]
+21 Mountain|M10
+1 Mox Ruby
+1 Ruby Medallion
+3 Bloodmark Mentor
+2 Cinder Pyromancer
+2 Mudbrawler Cohort
+2 Rockslide Ambush
+2 Spitting Earth
+3 Spire Barrage
+3 Flame Javelin
+2 Blood Knight
+4 Kargan Dragonlord
+1 Slith Firewalker
+1 Pyre Charger
+1 Feral Lightning
+4 Ball Lightning
+1 Blistering Firecat
+1 Kiki-Jiki, Mirror Breaker
+1 Rorix Bladewing
+4 Tarox Bladewing
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/lava_axe.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_hard_lavaaxe.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/lava_axe.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_hard_lavaaxe.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_artifact.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_artifact.dck
new file mode 100644
index 00000000000..9ebc40ba93c
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_artifact.dck
@@ -0,0 +1,49 @@
+[duel]
+[metadata]
+Name=Iron Man 2
+Title=Iron Man
+Difficulty=medium
+Description=Mono R Artifact deck
+Icon=Iron Man.jpg
+Deck Type=constructed
+[main]
+12 Mountain
+4 Great Furnace
+4 Darksteel Citadel
+1 Memnite
+1 Frogmite
+1 Arcbound Worker
+1 Brass Gnat
+1 Flayer Husk
+1 Leonin Scimitar
+1 Pyrite Spellbomb
+1 Tablet of Epityr
+1 Urza's Chalice
+1 Iron Myr
+1 Arcbound Stinger
+1 Executioner's Hood
+1 Golem's Heart
+1 Jhoira's Toolbox
+1 Myr Sire
+1 Golem Foundry
+1 Snapsail Glider
+1 Oxidda Golem
+1 Battered Golem
+1 Yotian Soldier
+1 Myr Enforcer
+1 Junk Diver
+1 Chrome Steed
+1 Rusted Relic
+1 Drill-Skimmer
+1 Synod Centurion
+1 Razorfield Rhino
+1 Hammer of Purphoros
+1 Moltensteel Dragon
+1 Slash Panther
+3 Whipflare
+3 Galvanic Blast
+1 Blade-Tribe Berserkers
+1 Concussive Bolt
+1 Kuldotha Phoenix
+1 Feedback Bolt
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_cirleofflame.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_cirleofflame.dck
new file mode 100644
index 00000000000..b3f38ef1530
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_cirleofflame.dck
@@ -0,0 +1,35 @@
+[duel]
+[metadata]
+Name=Carnage 2
+Title=Carnage
+Difficulty=medium
+Description=Mono R Grand Melee deck with Circle of Flame
+Icon=Carnage.jpg
+Deck Type=constructed
+[main]
+23 Mountain
+4 Grand Melee
+1 Bedlam
+4 Circle of Flame
+4 Fire at Will
+1 Ashen Monstrosity
+1 Avatar of Slaughter
+4 Battle-Mad Ronin
+1 Berserkers of Blood Ridge
+1 Bloodcrazed Neonate
+1 Bloodrock Cyclops
+1 Craven Giant
+1 Crazed Goblin
+1 Flameborn Hellion
+1 Galvanic Juggernaut
+1 Goblin Brigand
+1 Juggernaut
+2 Kuldotha Ringleader
+1 Orgg
+1 Reckless Brute
+1 Slumbering Dragon
+1 Tattermunge Maniac
+1 Thran War Machine
+1 Ulamog's Crusher
+1 Utvara Scalper
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_giant.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_giant.dck
new file mode 100644
index 00000000000..bbf055dcdf3
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_giant.dck
@@ -0,0 +1,28 @@
+[duel]
+[metadata]
+Name=Hagrid 2
+Title=Hagrid
+Difficulty=medium
+Description=Mono R Giants deck
+Icon=Hagrid.jpg
+Deck Type=constructed
+[main]
+4 Pyroclasm|M11
+20 Mountain|MBS
+1 Sunrise Sovereign|LRW
+4 Lash Out|LRW
+4 Arid Mesa|ZEN
+4 Blind-Spot Giant|LRW
+1 Craven Giant|STH
+1 Giant's Ire|LRW
+4 Fire Diamond|7ED
+2 Shatterskull Giant|ZEN
+1 Magma Giant|5DN
+4 Thundercloud Shaman|LRW
+4 Stinkdrinker Daredevil|LRW
+4 Spitting Earth|10E
+1 Borderland Behemoth|MOR
+1 Inferno Titan|M11
+[sideboard]
+
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/haste_burn.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_hasteburn.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/haste_burn.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_hasteburn.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_ralburn.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_ralburn.dck
new file mode 100644
index 00000000000..6c012959763
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/redwizard_medium_ralburn.dck
@@ -0,0 +1,27 @@
+[duel]
+[metadata]
+Name=Rambo 2
+Title=Rambo
+Difficulty=medium
+Description=Mono R Aggro deck
+Icon=Rambo.jpg
+Deck Type=constructed
+Profile=Reckless
+[main]
+21 Mountain
+4 Vexing Devil
+4 Tattermunge Maniac
+4 Goblin Guide
+3 Jackal Pup
+4 Zurgo Bellstriker
+4 Keldon Marauders
+4 Ash Zealot
+1 Lightning Mauler
+1 Reckless Bushwhacker
+1 Goblin Freerunner
+1 Oxidda Golem
+2 Flame Slash
+2 Mizzium Mortars
+2 Shock
+2 Ghostfire
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/runelord.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/runelord.dck
new file mode 100644
index 00000000000..2da7cc5bb35
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/runelord.dck
@@ -0,0 +1,25 @@
+[metadata]
+Name=runelord
+[Main]
+1 Bruna, Light of Alabaster|C18|1
+2 Canopy Vista|ONC|1
+3 Elspeth Conquers Death|THB|1
+2 Forest|KHM|1
+2 Galea, Kindler of Hope|AFC|1
+4 Giver of Runes|PLIST|1
+1 Glacial Fortress|XLN|1
+4 Grasslands|C17|1
+2 Halvar, God of Battle|KHM|1
+1 Irrigated Farmland|AKR|1
+1 Island|KHM|1
+4 Kor Spiritdancer|JMP|1
+1 Mantle of the Ancients|AFC|1
+2 Plains|KHM|1
+4 Rune of Flight|KHM|1
+4 Rune of Might|KHM|1
+4 Rune of Sustenance|KHM|1
+4 Runeforge Champion|KHM|1
+4 Seaside Citadel|CMA|1
+4 Spara's Headquarters|SNC|1
+2 Sunpetal Grove|XLN|1
+4 Wild Growth|MB1|1
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/simicwizard_evolve.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/simicwizard_evolve.dck
new file mode 100644
index 00000000000..d1770746326
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/simicwizard_evolve.dck
@@ -0,0 +1,33 @@
+[duel]
+[metadata]
+Name=The Very Hungry Caterpillar 3
+Title=The Very Hungry Caterpillar
+Difficulty=hard
+Description=BUG Evolve deck with Corpsejack Menace and Master Biomancer
+Icon=The Very Hungry Caterpillar.jpg
+Deck Type=constructed
+[main]
+4 Bayou
+2 Bramblewood Paragon
+2 Bred for the Hunt
+2 Cloudfin Raptor
+4 Corpsejack Menace
+2 Cytoplast Root-Kin
+4 Drowned Catacomb
+2 Elusive Krasis
+2 Experiment One
+2 Fathom Mage
+4 Hinterland Harbor
+4 Master Biomancer
+2 Oona's Blackguard
+1 Prime Speaker Zegana
+4 Renegade Krasis
+2 Sapphire Drake
+2 Shambleshark
+1 Tree of Redemption
+4 Tropical Island
+4 Underground Sea
+1 Varolz, the Scar-Striped
+1 Vigean Hydropon
+4 Woodland Cemetery
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/simicwizard_intruderalarm.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/simicwizard_intruderalarm.dck
new file mode 100644
index 00000000000..d179eee2403
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/simicwizard_intruderalarm.dck
@@ -0,0 +1,27 @@
+[duel]
+[metadata]
+Name=Mister Fantastic 3
+Title=Mister Fantastic
+Difficulty=hard
+Description=UG Intruder Alarm deck with Imperious Perfect and mana elves
+Icon=Mister Fantastic.jpg
+Deck Type=constructed
+[main]
+4 Misty Rainforest
+4 Tropical Island
+7 Island|M12
+5 Forest|M12
+4 Dryad Arbor
+4 Intruder Alarm
+4 Seedborn Muse
+4 Murkfiend Liege
+4 Imperious Perfect
+2 Ant Queen
+1 Rhys the Redeemed
+4 Noble Hierarch
+3 Llanowar Elves
+3 Fyndhorn Elves
+4 Dormant Gomazoa
+2 Apes of Rath
+1 Walking Dream
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_easy_ajani.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_easy_ajani.dck
new file mode 100644
index 00000000000..11cff194032
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_easy_ajani.dck
@@ -0,0 +1,37 @@
+[duel]
+[metadata]
+Name=Ajani's Enchanted Ascension 1
+Title=Ajani Goldmane
+Difficulty=easy
+Description=Mono-white life gain, enchantments, and Ajani planeswalkers theme deck
+Icon=Ajani Goldmane 1.jpg
+Deck Type=constructed
+[Main]
+1 Ajani Goldmane
+1 Ajani Steadfast
+2 Ajani's Chosen
+2 Ajani's Mantra
+3 Ajani's Pridemate
+2 Ajani's Sunstriker
+2 Ajani's Welcome
+1 Ajani, Adversary of Tyrants
+1 Ajani, Caller of the Pride
+1 Ajani, Inspiring Leader
+1 Ajani, Strength of the Pride
+2 Armored Ascension
+2 Blessed Spirits
+3 Court Cleric
+1 Daybreak Coronet
+2 Eidolon of Countless Battles
+1 Emeria, the Sky Ruin
+4 Flagstones of Trokair
+2 Ghostblade Eidolon
+2 Goldmane Griffin
+2 Griffin Aerie
+1 Hall of Heliod's Generosity
+1 Heliod, Sun-Crowned
+2 Land Tax
+2 Mesa Enchantress
+2 Path of Bravery
+13 Plains
+1 Serra's Sanctum
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_easy_angelhuman.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_easy_angelhuman.dck
new file mode 100644
index 00000000000..bd708202c90
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_easy_angelhuman.dck
@@ -0,0 +1,31 @@
+[duel]
+[metadata]
+Name=Sigismund's Avacyn's Glory 1
+Title=Sigismund, Avacyn's Faithful
+Difficulty=easy
+Description=Mono-white humans and angels theme deck
+Icon=Sigismund 1.jpg
+Deck Type=constructed
+[Main]
+1 Angelic Overseer
+1 Archangel
+1 Champion of the Parish
+2 Doomed Traveler
+2 Elder Cathar
+2 Elgaud Inquisitor
+2 Fiend Hunter
+3 Gather the Townsfolk
+1 Geist-Honored Monk
+2 Goldnight Commander
+2 Hallow
+1 Honor of the Pure
+1 Mentor of the Meek
+1 Midnight Guard
+2 Oblivion Ring
+2 Path to Exile
+25 Plains
+1 Requiem Angel
+2 Selfless Cathar
+3 Thraben Valiant
+2 Unruly Mob
+1 Voice of the Provinces
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_easy_wanderer.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_easy_wanderer.dck
new file mode 100644
index 00000000000..cd0fda264a8
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_easy_wanderer.dck
@@ -0,0 +1,33 @@
+[duel]
+[metadata]
+Name=The Wanderer's Entourage 1
+Title=The Wanderer
+Difficulty=easy
+Description=Mono-white counters and proliferate theme deck with Wanderer planeswalkers
+Icon=The Wanderer 1.jpg
+Deck Type=constructed
+[Main]
+3 Armored Ascension
+3 Blighted Steppe
+2 Caravan Escort
+1 Champion of the Parish
+2 Contagion Clasp
+4 Flagstones of Trokair
+2 Grateful Apparition
+1 Herald of War
+2 Hopeful Initiate
+2 Ikiral Outrider
+2 Kabira Vindicator
+1 Kjeldoran Outpost
+1 Kor Haven
+3 Mana Tithe
+2 Martyr for the Cause
+1 Mikaeus, the Lunarch
+13 Plains
+2 Resilient Wanderer
+1 Savior of Ollenbock
+3 Soul Tithe
+3 The Wanderer
+2 Unbounded Potential
+1 Victory's Envoy
+3 Wanderer's Strike
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_armaggedon.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_armaggedon.dck
new file mode 100644
index 00000000000..e873369788f
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_armaggedon.dck
@@ -0,0 +1,41 @@
+[duel]
+[metadata]
+Name=Surtr 3
+Title=Surtr
+Difficulty=hard
+Description=Mono W Armageddon deck
+Icon=Surtr.jpg
+Deck Type=constructed
+[main]
+5 Plains
+4 Flagstones of Trokair
+4 Darksteel Citadel
+4 Wasteland
+1 Strip Mine
+1 Mox Emerald
+1 Mox Ruby
+1 Mox Pearl
+1 Mox Jet
+1 Mox Sapphire
+1 Sol Ring
+4 Crucible of Worlds
+4 Armageddon
+4 Ravages of War
+1 Mana Tithe
+1 Disenchant
+4 Swords to Plowshares
+1 Limited Resources
+3 Dryad Militant
+2 Student of Warfare
+1 Grand Abolisher
+1 Spirit of the Labyrinth
+1 Ethersworn Canonist
+1 True Believer
+1 Knight of the White Orchid
+1 Porcelain Legionnaire
+2 Aven Mindcensor
+1 Archetype of Courage
+1 Brimaz, King of Oreskos
+1 Fiend Hunter
+1 Elspeth, Knight-Errant
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_enchantments.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_enchantments.dck
new file mode 100644
index 00000000000..4f1d30a8b0d
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_enchantments.dck
@@ -0,0 +1,25 @@
+[duel]
+[metadata]
+Name=Casper 3
+Title=Casper
+Difficulty=hard
+Description=Mono W Enchantment deck with Blessed Spirits and Sigil of the Empty Throne
+Icon=Casper.jpg
+Deck Type=constructed
+[main]
+22 Plains
+1 Serra's Sanctum
+1 Archetype of Courage
+4 Blessed Spirits
+2 Celestial Ancient
+3 Hopeful Eidolon
+4 Mesa Enchantress
+1 Nyx-Fleece Ram
+4 Ethereal Armor
+1 Heliod, God of the Sun
+4 Journey to Nowhere
+3 Oblivion Ring
+4 Pacifism
+4 Sigil of the Empty Throne
+2 Replenish
+[sideboard]
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_hatebears.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_hatebears.dck
new file mode 100644
index 00000000000..45e75d982a2
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_hatebears.dck
@@ -0,0 +1,40 @@
+[duel]
+[metadata]
+Name=Odysseus 3
+Title=Odysseus
+Difficulty=hard
+Description=Mono W Hate Bear deck
+Icon=Odysseus.jpg
+Deck Type=constructed
+[main]
+21 Plains
+1 Karakas
+1 Soul's Attendant
+4 Dryad Militant
+1 Icatian Javelineers
+2 Thalia, Guardian of Thraben
+1 Grand Abolisher
+1 True Believer
+1 Kataki, War's Wage
+1 Leonin Relic-Warder
+1 Samurai of the Pale Curtain
+2 Knight of the White Orchid
+1 Veteran Armorer
+1 Kitchen Finks
+1 Glowrider
+2 Vryn Wingmare
+4 Fiend Hunter
+2 Mentor of the Meek
+1 Mirran Crusader
+1 Archetype of Courage
+1 Silverblade Paladin
+1 Soltari Champion
+1 Linvala, Keeper of Silence
+1 Angel of Jubilation
+1 Celestial Crusader
+1 Loxodon Gatekeeper
+1 Hero of Bladehold
+1 Crovax, Ascendant Hero
+1 Elesh Norn, Grand Cenobite
+1 Imposing Sovereign
+[sideboard]
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_humansoldier.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_humansoldier.dck
new file mode 100644
index 00000000000..22990e95eda
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_humansoldier.dck
@@ -0,0 +1,43 @@
+[metadata]
+Name=human_soldier_token
+[Main]
+1 Adamant Will|VOW|1
+1 Angelic Quartermaster|VOW|1
+1 Captain of the Watch|M10|1
+1 Cemetery Protector|VOW|1
+1 Commanding Presence|THB|1
+1 Darien, King of Kjeldor|CSP|1
+1 Dawn of Hope|GRN|1
+1 Field Marshal|CSP|1
+1 Fierce Retribution|VOW|1
+1 First Response|M15|1
+1 Flare of Faith|MID|1
+1 God-Favored General|BNG|1
+1 Haazda Marshal|GRN|1
+1 Heirloom Blade|AFC|1
+1 Herald of War|AVR|1
+1 Hero of Bladehold|MBS|1
+1 Iona's Judgment|CMR|1
+1 Keeper of the Accord|CMR|1
+1 Mobilization|10E|1
+1 Moment of Heroism|JMP|1
+2 Perimeter Sergeant|IKO|1
+1 Plains|IKO|1
+3 Plains|IKO|2
+2 Plains|IKO|3
+3 Plains|ISD|1
+2 Plains|ISD|2
+1 Plains|ISD|3
+3 Plains|RTR|2
+1 Plains|RTR|3
+1 Plains|RTR|4
+1 Plains|RTR|5
+2 Plains|THS|1
+2 Plains|THS|3
+3 Plains|THS|4
+1 Precinct Captain|RTR|1
+1 Rhox Pikemaster|M10|1
+2 Sanctuary Lockdown|IKO|1
+1 Thraben Standard Bearer|EMN|1
+4 Veteran Armorsmith|M10|1
+4 Veteran Swordsmith|M10|1
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_humility.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_humility.dck
new file mode 100644
index 00000000000..f008a1bbacf
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_hard_humility.dck
@@ -0,0 +1,21 @@
+[duel]
+[metadata]
+Name=Nac Mac Feegle 3
+Title=Nac Mac Feegle
+Difficulty=hard
+Description=Mono W 1/1 token Deck with Humility, Increasing Devotion and Intangible Virtue
+Icon=Nac Mac Feegle 3.jpg
+Deck Type=constructed
+[main]
+1 Elspeth, Knight-Errant
+4 Gather the Townsfolk
+3 Godhead of Awe
+4 Humility
+4 Increasing Devotion
+4 Intangible Virtue
+4 Leyline of the Meek
+1 Martial Coup
+3 Mobilization
+24 Plains
+4 Porphyry Nodes
+4 Reverence
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_medium_aggro.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_medium_aggro.dck
new file mode 100644
index 00000000000..82cfc943fec
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_medium_aggro.dck
@@ -0,0 +1,35 @@
+[duel]
+[metadata]
+Name=Blackbeard 3
+Title=Blackbeard
+Difficulty=hard
+Description=Mono W Soldiers deck with Preeminent Captain, Captain of the Watch and Daru Warchief
+Icon=Blackbeard.jpg
+Deck Type=constructed
+[main]
+18 Plains|M11
+1 Daru Encampment
+1 Mox Pearl
+2 Tithe
+4 Preeminent Captain
+4 Veteran Armorsmith
+3 Ballyrush Banneret
+3 Veteran Swordsmith
+3 Daru Warchief
+3 Field Marshal
+2 Captain of the Watch
+1 Ranger of Eos
+1 Aven Brigadier
+1 Rhox Pikemaster
+1 Veteran Armorer
+1 Aven Riftwatcher
+1 Soltari Foot Soldier
+1 Raise the Alarm
+1 Mobilization
+1 Elspeth, Knight-Errant
+2 Path to Exile
+2 Valorous Stance
+1 Conqueror's Pledge
+1 Enlistment Officer
+1 Thalia, Guardian of Thraben
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/basri.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_medium_basri.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/basri.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_medium_basri.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_medium_control.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_medium_control.dck
new file mode 100644
index 00000000000..38804abf25a
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_medium_control.dck
@@ -0,0 +1,41 @@
+[duel]
+[metadata]
+Name=Colossus 2
+Title=Colossus
+Difficulty=medium
+Description=Mono W control
+Icon=Colossus.jpg
+Deck Type=constructed
+[main]
+21 Plains|ISD
+1 Kjeldoran Outpost
+1 Flagstones of Trokair
+1 Karakas
+2 Abeyance
+2 Due Respect
+2 Silence
+1 Disenchant
+1 Revoke Existence
+2 Mana Tithe
+1 Rebuff the Wicked
+1 Ghostly Prison
+2 Condemn
+2 Exile
+2 Rebuke
+2 Swords to Plowshares
+2 Grand Abolisher
+1 Blind Obedience
+1 Serra Avenger
+1 True Believer
+1 Kataki, War's Wage
+1 Leonin Relic-Warder
+1 Kitchen Finks
+1 Fiend Hunter
+1 Commander Eesha
+1 Dawn Elemental
+1 Guardian Seraph
+1 Linvala, Keeper of Silence
+1 Windborn Muse
+1 Oversoul of Dusk
+1 Serra Angel
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_medium_knight.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_medium_knight.dck
new file mode 100644
index 00000000000..44fe39a0108
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/whitewizard_medium_knight.dck
@@ -0,0 +1,29 @@
+[duel]
+[metadata]
+Name=White Knight 2
+Title=White Knight
+Difficulty=medium
+Description=Mono W Knights deck
+Icon=White Knight.jpg
+Deck Type=constructed
+[main]
+3 Veteran Cavalier
+3 Kabira Vindicator
+4 Lionheart Maverick
+2 Knight of Cliffhaven
+2 Knight Errant
+2 Benalish Cavalry
+2 Accorder Paladin
+1 Hero of Bladehold
+1 Knight Exemplar
+2 Leonin Skyhunter
+1 Mirran Crusader
+2 Student of Warfare
+2 White Knight
+2 Caravan Escort
+2 Oust
+2 Saltblast
+2 Path of Peace
+1 War Falcon
+24 Plains|MBS
+[sideboard]
diff --git a/forge-gui/res/adventure/Shandalar/decks/wild-magic_sorcerer.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/wild-magic_sorcerer.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/wild-magic_sorcerer.dck
rename to forge-gui/res/adventure/Shandalar/decks/wizards/wild-magic_sorcerer.dck
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castle_plains_3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castle_plains_3.tmx
index 1cb43dbbf2e..1bab110583e 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/castle_plains_3.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castle_plains_3.tmx
@@ -60,7 +60,7 @@
   <object id="56" template="../obj/gold.tx" x="271" y="49"/>
   <object id="57" template="../obj/enemy.tx" x="153" y="134.333">
    <properties>
-    <property name="enemy" value="White Wiz1"/>
+    <property name="enemy" value="Apprentice White Wizard"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/catlair_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/catlair_1.tmx
index d41c489fa21..0c95bd2fb67 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/catlair_1.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/catlair_1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="63">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -32,23 +32,23 @@
   <object id="48" template="../obj/treasure.tx" x="368.136" y="55.0834"/>
   <object id="50" template="../obj/enemy.tx" x="47.4997" y="48.8337" visible="1">
    <properties>
-    <property name="enemy" value="Cat"/>
+    <property name="enemy" value="Leonin Warrior"/>
    </properties>
   </object>
   <object id="52" template="../obj/gold.tx" x="48.6663" y="28.5"/>
   <object id="54" template="../obj/enemy.tx" x="368.364" y="79.8334" visible="1">
    <properties>
-    <property name="enemy" value="Cat"/>
+    <property name="enemy" value="Leonin Warrior"/>
    </properties>
   </object>
   <object id="56" template="../obj/enemy.tx" x="185" y="112.667">
    <properties>
-    <property name="enemy" value="Cat"/>
+    <property name="enemy" value="Leonin Warrior"/>
    </properties>
   </object>
   <object id="62" template="../obj/enemy.tx" x="208.167" y="230.333" visible="1">
    <properties>
-    <property name="enemy" value="Cat"/>
+    <property name="enemy" value="Leonin Warrior"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/catlair_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/catlair_2.tmx
index c57759d9c16..876fa8d9c14 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/catlair_2.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/catlair_2.tmx
@@ -30,21 +30,21 @@
    </properties>
   </object>
   <object id="48" template="../obj/treasure.tx" x="174.5" y="98.6667"/>
-  <object id="50" template="../obj/enemy.tx" x="216.333" y="46.1667">
+  <object id="50" template="../obj/enemy.tx" x="213.685" y="67.348">
    <properties>
-    <property name="enemy" value="Cat"/>
+    <property name="enemy" value="Leonin Warrior"/>
    </properties>
   </object>
   <object id="51" template="../obj/treasure.tx" x="255.833" y="81.5"/>
   <object id="52" template="../obj/gold.tx" x="160" y="143.167"/>
   <object id="53" template="../obj/enemy.tx" x="216.333" y="27.1667">
    <properties>
-    <property name="enemy" value="Cat"/>
+    <property name="enemy" value="Leonin Warrior"/>
    </properties>
   </object>
-  <object id="54" template="../obj/enemy.tx" x="216.167" y="68.6663">
+  <object id="54" template="../obj/enemy.tx" x="199.84" y="96.0255">
    <properties>
-    <property name="enemy" value="Cat"/>
+    <property name="enemy" value="Leonin Warrior"/>
    </properties>
   </object>
   <object id="56" template="../obj/collision.tx" x="-16" y="0" width="16" height="272"/>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/catlair_3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/catlair_3.tmx
index 4ed746c4d88..c1c50517bc3 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/catlair_3.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/catlair_3.tmx
@@ -31,18 +31,18 @@
   </object>
   <object id="50" template="../obj/enemy.tx" x="232.333" y="90.2576">
    <properties>
-    <property name="enemy" value="Cat"/>
+    <property name="enemy" value="Leonin Warrior"/>
    </properties>
   </object>
-  <object id="51" template="../obj/treasure.tx" x="216.151" y="95.0455"/>
+  <object id="51" template="../obj/treasure.tx" x="215.71" y="92.3978"/>
   <object id="53" template="../obj/enemy.tx" x="207.833" y="225.167">
    <properties>
     <property name="enemy" value="Cat"/>
    </properties>
   </object>
-  <object id="54" template="../obj/enemy.tx" x="200.167" y="90.7572">
+  <object id="54" template="../obj/enemy.tx" x="199.284" y="90.7572">
    <properties>
-    <property name="enemy" value="Cat"/>
+    <property name="enemy" value="Leonin Warrior"/>
    </properties>
   </object>
   <object id="56" template="../obj/collision.tx" x="-16" y="0" width="16" height="272"/>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_1..tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_1..tmx
deleted file mode 100644
index 1ba027cac64..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_1..tmx
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="60">
- <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
- <layer id="1" name="Background" width="30" height="30">
-  <data encoding="base64" compression="zlib">
-   eJzz42Rg8BvFo3gUj+JRPIqHINbghuCRYi/M7uEa1gMZnwMRxgPh17wBtpfecZyHZvdgsDePTm4YqeXUSLOXGvEMABb/Ltw=
-  </data>
- </layer>
- <layer id="6" name="BackgroundBlend" width="30" height="30">
-  <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUjIJRMApGwVAA6tz0secE0J4uLvrbO5CgB+pfevmVD2jfRQ4GBi2ofUeB9DE62Z3PiYjjbi7C6qkFYH4GAU06pymQn0EAFt7nge64wIFwD60AzM+g8AaFdS4nqntoBfI4Uf3MDbSbB4h56RjfWgNUbgyUvejl5lACAE8hEqc=
-  </data>
- </layer>
- <layer id="2" name="Ground" width="30" height="30">
-  <data encoding="base64" compression="zlib">
-   eJztlE0KgCAQRl2OB8uii1rWrfqhY2SoIGK1aT4IZuAtZvX8RkejlTKCIAiC8AMcKTXTfc9F6+kfek7v4pkosAG91vuGjAPkReR7mvOqMW/KxfvMqwFlLQuRveYtz8DhfvNyzX3XYW9Gqjst806Vfgvc4+S/CuVLuJgXscM5XcyL/r++8p7+7h8J
-  </data>
- </layer>
- <layer id="7" name="Foreground" width="30" height="30">
-  <properties>
-   <property name="spriteLayer" type="bool" value="true"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztwQEBAAAAgiD/r25IQAEAAPBoDhAAAQ==
-  </data>
- </layer>
- <objectgroup id="4" name="Objects">
-  <object id="38" template="../obj/entry_up.tx" x="196" y="480" width="40" height="8">
-   <properties>
-    <property name="teleport" value=""/>
-   </properties>
-  </object>
-  <object id="48" template="../obj/treasure.tx" x="240" y="400">
-   <properties>
-    <property name="reward">[{
-  &quot;type&quot;: &quot;randomCard&quot;,
-  &quot;count&quot;: 2,
-  &quot;colors&quot;: [ &quot;colorID&quot; ]
-},{
-  &quot;type&quot;: &quot;randomCard&quot;,
-  &quot;count&quot;: 1,
-  &quot;probability&quot;: 0.5,
-  &quot;rarity&quot;: [ &quot;rare&quot; ],
-  &quot;colors&quot;: [ &quot;colorID&quot; ]
-},{
-  &quot;type&quot;: &quot;randomCard&quot;,
-  &quot;colors&quot;: [ &quot;green&quot; ],
-  &quot;count&quot;: 3,
-  &quot;addMaxCount&quot;: 2
-}]</property>
-   </properties>
-  </object>
-  <object id="49" template="../obj/gold.tx" x="144" y="384"/>
-  <object id="50" template="../obj/enemy.tx" x="208" y="448">
-   <properties>
-    <property name="enemy" value="Wurm"/>
-   </properties>
-  </object>
-  <object id="55" template="../obj/enemy.tx" x="152" y="288.333">
-   <properties>
-    <property name="enemy" value="Wurm"/>
-   </properties>
-  </object>
-  <object id="56" template="../obj/enemy.tx" x="194.333" y="283">
-   <properties>
-    <property name="effect">{
- &quot;lifeModifier&quot;: 4,
- &quot;startBattleWithCard&quot;: [ &quot;Forest&quot;, &quot;Forest&quot; ]
-}</property>
-    <property name="enemy" value="Wurm"/>
-   </properties>
-  </object>
-  <object id="57" template="../obj/enemy.tx" x="216.667" y="255">
-   <properties>
-    <property name="effect">{
- &quot;lifeModifier&quot;: 10,
- &quot;startBattleWithCard&quot;: [ &quot;Sandwurm Convergence&quot; ]
-}</property>
-    <property name="enemy" value="Wurm"/>
-    <property name="spawn.Easy" type="bool" value="false"/>
-    <property name="spawn.Hard" type="bool" value="true"/>
-    <property name="spawn.Normal" type="bool" value="false"/>
-   </properties>
-  </object>
-  <object id="51" template="../obj/treasure.tx" x="152" y="256.333"/>
-  <object id="58" template="../obj/treasure.tx" x="216.333" y="272.333">
-   <properties>
-    <property name="reward">[{
-  &quot;type&quot;: &quot;randomCard&quot;,
-  &quot;count&quot;: 1,
-  &quot;rarity&quot;: [ &quot;rare&quot;, &quot;mythic rare&quot; ],
-  &quot;colors&quot;: [ &quot;colorID&quot; ]
-},{
-  &quot;type&quot;: &quot;randomCard&quot;,
-  &quot;count&quot;: 4,
-  &quot;rarity&quot;: [ &quot;uncommon&quot; ],
-  &quot;addMaxCount&quot;: 2
-}]</property>
-    <property name="spawn.Hard" type="bool" value="false"/>
-   </properties>
-  </object>
-  <object id="52" template="../obj/gold.tx" x="152.333" y="320"/>
-  <object id="59" template="../obj/gold.tx" x="320" y="384" visible="0">
-   <properties>
-    <property name="reward">[{
- &quot;type&quot;: &quot;gold&quot;, &quot;count&quot;: 250
-}]</property>
-   </properties>
-  </object>
- </objectgroup>
-</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_12.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_12.tmx
index db0c8c8fb44..acb5079aa25 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_12.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_12.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="53">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="53">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="1" name="Background" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
@@ -31,7 +31,7 @@
   </object>
   <object id="50" template="../obj/enemy.tx" x="439.667" y="134">
    <properties>
-    <property name="enemy" value="Blue Wiz1"/>
+    <property name="enemy" value="Apprentice Blue Wizard"/>
    </properties>
   </object>
   <object id="51" template="../obj/treasure.tx" x="442" y="204.667"/>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_5.tmx
index 396aba42cb4..06bdfbfa502 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_5.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_5.tmx
@@ -44,7 +44,7 @@
   </object>
   <object id="59" template="../obj/enemy.tx" x="123.167" y="88.25">
    <properties>
-    <property name="enemy" value="Green Wiz1"/>
+    <property name="enemy" value="Apprentice Green Wizard"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/cave_7.tmx b/forge-gui/res/adventure/Shandalar/maps/map/cave_7.tmx
index 34dc339abbf..f710be284f3 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/cave_7.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/cave_7.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="59">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="6" nextobjectid="59">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="1" name="Background" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJzz42Rg8BvFo3gUj+JRPIpH8YjAAAvyrVM=
@@ -31,7 +31,7 @@
   </object>
   <object id="54" template="../obj/enemy.tx" x="199" y="104.667">
    <properties>
-    <property name="enemy" value="Black Wiz1"/>
+    <property name="enemy" value="Apprentice Black Wizard"/>
    </properties>
   </object>
   <object id="55" template="../obj/enemy.tx" x="206.667" y="184">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/crawlspace.tmx b/forge-gui/res/adventure/Shandalar/maps/map/crawlspace.tmx
index 27a872e76fe..718a2c07554 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/crawlspace.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/crawlspace.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="58">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="58">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -88,7 +88,7 @@
  &quot;lifeModifier&quot;: 4,
  &quot;startBattleWithCard&quot;: [ &quot;Ensnaring Bridge|2XM|1&quot; ]
 }</property>
-    <property name="enemy" value="Blue Wiz2"/>
+    <property name="enemy" value="Adept Blue Wizard"/>
    </properties>
   </object>
   <object id="51" template="../obj/enemy.tx" gid="11419" x="183.579" y="127.263">
@@ -103,7 +103,7 @@
   </object>
   <object id="53" template="../obj/enemy.tx" x="104.079" y="123.763">
    <properties>
-    <property name="enemy" value="Red Wiz2"/>
+    <property name="enemy" value="Adept Red Wizard"/>
    </properties>
   </object>
   <object id="52" template="../obj/enemy.tx" x="104.184" y="214.079">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/dreamhalls.tmx b/forge-gui/res/adventure/Shandalar/maps/map/dreamhalls.tmx
index b81742051bf..d24a8e9ce9f 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/dreamhalls.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/dreamhalls.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="14" nextobjectid="57">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="14" nextobjectid="57">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -121,7 +121,7 @@
  &quot;lifeModifier&quot;: 4,
  &quot;startBattleWithCard&quot;: [ &quot;Arcane Encyclopedia|M19|1&quot; ]
 }</property>
-    <property name="enemy" value="Green Wiz3"/>
+    <property name="enemy" value="Master Green Wizard"/>
    </properties>
   </object>
   <object id="51" template="../obj/enemy.tx" x="351.877" y="205.729">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/evilgrove_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/evilgrove_1.tmx
index b393c030e3d..f7122a1bbef 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/evilgrove_1.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/evilgrove_1.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="60">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="60">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJyL5mVg2MVDXxwFtFMWSNMbSPOM2jtq76i9o/aO2ktNe2u5GRjquelrL8jOPUjqpZHql708pLmHWHtBdspA7cBmL6l2o+slBiPbCwPk1MEAaFQ5yg==
@@ -54,7 +54,7 @@
   </object>
   <object id="55" template="../obj/enemy.tx" x="343.167" y="238.333">
    <properties>
-    <property name="enemy" value="Black Wiz1"/>
+    <property name="enemy" value="Apprentice Black Wizard"/>
    </properties>
   </object>
   <object id="56" template="../obj/enemy.tx" x="192" y="87.6667">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/evilgrove_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/evilgrove_2.tmx
index 0a5c7b1cb6d..8b3aa1a5306 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/evilgrove_2.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/evilgrove_2.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="61">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="61">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJyL5mVg2MVDXxwFtFMWSNMbSPMg7JWho/3I9tITjNo7au+ovaP2Dhd7aVVmg+zdC8T13LQxHxuoBdq1h8R6cy+a/0nVj4wBr6Qysg==
@@ -38,12 +38,12 @@
   <object id="52" template="../obj/gold.tx" x="143.634" y="54.4911"/>
   <object id="53" template="../obj/enemy.tx" x="356" y="143.667">
    <properties>
-    <property name="enemy" value="ClayGolem"/>
+    <property name="enemy" value="Clay Golem"/>
    </properties>
   </object>
   <object id="55" template="../obj/enemy.tx" x="119.667" y="81.4997">
    <properties>
-    <property name="enemy" value="Black Wiz1"/>
+    <property name="enemy" value="Apprentice Black Wizard"/>
    </properties>
   </object>
   <object id="57" template="../obj/enemy.tx" x="203.5" y="215.834">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/evilgrove_4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/evilgrove_4.tmx
index 4540c798922..7f300b94b2c 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/evilgrove_4.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/evilgrove_4.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="50" height="50">
   <data encoding="base64" compression="zlib">
    eJzt2UEKwCAMRFG3hR6h5/H+RyouRDcWNCmZDPPAZUs+KEJbr1Iqydp1+pzVauaoeU6t5s3WsWLZW0g8zoqH5x7rRGTHPLtXRwSP+TuEs2FtaNThR/tqQOjwoA4s6sCiDhxMDerAwtKiDixsHdlb1IGFoaFh6GDZU406sKgDizrieP7njMTS0bF0zN+3M3fM1IFFHVjU4fsOK+s98ucdtPPurzs+23oBwepMug==
@@ -32,7 +32,7 @@
   <object id="48" template="../obj/treasure.tx" x="16.1667" y="769.917"/>
   <object id="50" template="../obj/enemy.tx" x="33.1667" y="766.917">
    <properties>
-    <property name="enemy" value="Black Wiz3"/>
+    <property name="enemy" value="Master Black Wizard"/>
    </properties>
   </object>
   <object id="51" template="../obj/treasure.tx" x="544.166" y="128.5"/>
@@ -54,7 +54,7 @@
   </object>
   <object id="56" template="../obj/enemy.tx" x="438.667" y="631.667">
    <properties>
-    <property name="enemy" value="Black Wiz2"/>
+    <property name="enemy" value="Adept Black Wizard"/>
    </properties>
   </object>
   <object id="57" template="../obj/enemy.tx" x="643.333" y="337.5">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/factory_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/factory_1.tmx
index eb50259d54f..070523a4278 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/factory_1.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/factory_1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="93">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="93">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -46,7 +46,7 @@
   </object>
   <object id="50" template="../obj/enemy.tx" x="159.735" y="80.2253">
    <properties>
-    <property name="enemy" value="ClayGolem"/>
+    <property name="enemy" value="Clay Golem"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="78,81,78,77"/>
    </properties>
@@ -56,7 +56,7 @@
   <object id="66" template="../obj/gold.tx" x="20.6667" y="81.3333"/>
   <object id="67" template="../obj/enemy.tx" x="108.667" y="200">
    <properties>
-    <property name="enemy" value="ClayGolem"/>
+    <property name="enemy" value="Clay Golem"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="88,79,80,79"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/factory_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/factory_2.tmx
index 51b7f46c3ed..9ab22d2b1c9 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/factory_2.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/factory_2.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="89">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="89">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -46,7 +46,7 @@
   </object>
   <object id="50" template="../obj/enemy.tx" x="117.217" y="90.704">
    <properties>
-    <property name="enemy" value="ClayGolem"/>
+    <property name="enemy" value="Clay Golem"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="88,87,86,85,83"/>
    </properties>
@@ -55,7 +55,7 @@
   <object id="66" template="../obj/gold.tx" x="19.3334" y="46.6666"/>
   <object id="67" template="../obj/enemy.tx" x="241.504" y="212.858">
    <properties>
-    <property name="enemy" value="ClayGolem"/>
+    <property name="enemy" value="Clay Golem"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="84,82,81,82"/>
    </properties>
@@ -101,7 +101,7 @@
   </object>
   <object id="74" template="../obj/enemy.tx" x="96.5" y="218">
    <properties>
-    <property name="enemy" value="ClayGolem"/>
+    <property name="enemy" value="Clay Golem"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="83,85,86,87,88"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/factory_3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/factory_3.tmx
index 127420cc8d7..6edca472088 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/factory_3.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/factory_3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="88">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="88">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -46,7 +46,7 @@
   </object>
   <object id="50" template="../obj/enemy.tx" x="112.181" y="166.351">
    <properties>
-    <property name="enemy" value="Red Wiz1"/>
+    <property name="enemy" value="Apprentice Red Wizard"/>
     <property name="threatRange" type="int" value="60"/>
     <property name="waypoints" value="79,78"/>
    </properties>
@@ -56,7 +56,7 @@
   <object id="66" template="../obj/gold.tx" x="25.3334" y="144"/>
   <object id="67" template="../obj/enemy.tx" x="214.171" y="208.358">
    <properties>
-    <property name="enemy" value="ClayGolem"/>
+    <property name="enemy" value="Clay Golem"/>
     <property name="threatRange" type="int" value="30"/>
    </properties>
   </object>
@@ -69,7 +69,7 @@
   </object>
   <object id="69" template="../obj/enemy.tx" x="360.086" y="110.375">
    <properties>
-    <property name="enemy" value="Blue Wiz1"/>
+    <property name="enemy" value="Apprentice Blue Wizard"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="83,81,83,84"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/factory_4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/factory_4.tmx
index 6bda6614c49..3dcd1be4d4c 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/factory_4.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/factory_4.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="60" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="112">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="60" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="112">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -36,7 +36,7 @@
   </object>
   <object id="50" template="../obj/enemy.tx" x="106.181" y="166.685">
    <properties>
-    <property name="enemy" value="Red Wiz2"/>
+    <property name="enemy" value="Adept Red Wizard"/>
     <property name="threatRange" type="int" value="60"/>
     <property name="waypoints" value="90,91,92,93"/>
    </properties>
@@ -52,7 +52,7 @@
   </object>
   <object id="69" template="../obj/enemy.tx" x="679.919" y="131.209">
    <properties>
-    <property name="enemy" value="Blue Wiz2"/>
+    <property name="enemy" value="Adept Blue Wizard"/>
     <property name="threatRange" type="int" value="60"/>
     <property name="waypoints" value="111,99,98"/>
    </properties>
@@ -91,7 +91,7 @@
   </object>
   <object id="75" template="../obj/enemy.tx" x="642" y="303.333">
    <properties>
-    <property name="enemy" value="Blue Wiz2"/>
+    <property name="enemy" value="Adept Blue Wizard"/>
     <property name="threatRange" type="int" value="60"/>
     <property name="waypoints" value="101,100,102"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/fort_4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/fort_4.tmx
index 1cde5142665..204ea06072c 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/fort_4.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/fort_4.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="59">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="59">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJzllF0KgCAQhH1PT1BdrM6Snauyu6XUgC3rQzD9QANLrYWfo7s21pjmo9E7Y2a7R+fOOcbuYC7xCU3xvc1yjDHZkglJLputzV/iJtUkv2uMsXqeK+sH0tYzxDyQuCVfWA/Eruu3zvev3Mme60sGevxuvyUx+9cr/avJE/so7WHyoN0duVLvtsf/DC7Y8K3dFfDJZII7Z/xcQXy/Mu8G2v1g1Q==
@@ -43,7 +43,7 @@
   <object id="51" template="../obj/treasure.tx" x="122.505" y="79.2775"/>
   <object id="53" template="../obj/enemy.tx" x="181.5" y="95.5">
    <properties>
-    <property name="enemy" value="Black Wiz1"/>
+    <property name="enemy" value="Apprentice Black Wizard"/>
    </properties>
   </object>
   <object id="54" template="../obj/enemy.tx" x="206.59" y="224.293">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/fort_5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/fort_5.tmx
index f69c6c705af..b497dc055a1 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/fort_5.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/fort_5.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="59">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="59">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -43,7 +43,7 @@
   <object id="51" template="../obj/treasure.tx" x="294.739" y="65.5721"/>
   <object id="53" template="../obj/enemy.tx" x="247.5" y="114.833">
    <properties>
-    <property name="enemy" value="Black Wiz1"/>
+    <property name="enemy" value="Apprentice Black Wizard"/>
    </properties>
   </object>
   <object id="55" template="../obj/enemy.tx" x="130.658" y="204.557">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/fort_6.tmx b/forge-gui/res/adventure/Shandalar/maps/map/fort_6.tmx
index 397b845e17e..a831a0653ba 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/fort_6.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/fort_6.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="61">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="61">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJzNlGEOgyAMhfkvnGB4MXYWt3OheLfZyMtqI1mWPIwvaQQlfH3YEr1z8abxDM7Nfo8UjnO868kU5e051rGodGALc1EMSHNTzSsT2aPy2eJqPUh+1y3ew29uqWtZXFs/kM0HtVZI3NZ5Ih+IXdfgYl/Me/9fy10u5lpdxc3+WF82cA69/bbE7N+X6pezOwSSdaw+Eo54OLs7dC7T8L3bGFyw4dvyhQefTCa4s+JrFfP9n30/wTNrwg==
@@ -25,7 +25,7 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJxjYBgF6ECKjYFBgQ/C1maE0NFA3M7PwPATiH/x09b+aCxiogIMDGIC1LcrmB2VHwOlfwNxLPWtQwHI5kdikf/Ky8DwjZfGjoCCGCS2IDDuhfhoY/5PBkjYDhSAhflitHDFluZoDWidvkAA5i8HHtQ4Hm4A2W8JfKhp7BcN7GtDYt+F5hVYHkZOSx00sBsEkNMOsl8f0rhsHi4AABo+FlM=
+   eJxjYBgF6ECKjYGBRwPC1maE0NFAXKzJwPAUiJ9p0tb+aCxijFoMDExa1LcrmB2VHwOlfwNxLPWtQwHI5kdikX+ozsDwSJ3GjoCCGCT2X6Cd/6hsL8z8nwyQsB0oAAvzfjT/YUtztAa0Tl8gAPOXAw9qHA83gOw3Hw3UNPaLBva1IbFPQstKWB5GTksdNLAbBJDTDrJfz9K4bB4uAABzfRil
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
@@ -36,7 +36,7 @@
   </object>
   <object id="50" template="../obj/enemy.tx" x="288.166" y="185.444">
    <properties>
-    <property name="enemy" value="ClayGolem"/>
+    <property name="enemy" value="Clay Golem"/>
    </properties>
   </object>
   <object id="53" template="../obj/enemy.tx" x="255.5" y="81.833">
@@ -46,7 +46,7 @@
   </object>
   <object id="55" template="../obj/enemy.tx" x="128.658" y="187.224">
    <properties>
-    <property name="enemy" value="ClayGolem"/>
+    <property name="enemy" value="Clay Golem"/>
    </properties>
   </object>
   <object id="56" template="../obj/gold.tx" x="241.058" y="150.057"/>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/fort_7.tmx b/forge-gui/res/adventure/Shandalar/maps/map/fort_7.tmx
index 410ff75f1fa..df2d941ddaf 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/fort_7.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/fort_7.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="59">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="59">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJzllF0KgCAQhH1PT1BdrM6Snauyu6XUgC3rQzD9QANLrYWfo7s21pjmo9E7Y2a7R+fOOcbuYC7xCU3xvc1yjDHZkglJLputzV/iJtUkv2uMsXqeK+sH0tYzxDyQuCVfWA/Eruu3zvev3Mme60sGevxuvyUx+9cr/avJE/so7WHyoN0duVLvtsf/DC7Y8K3dFfDJZII7Z/xcQXy/Mu8G2v1g1Q==
@@ -25,7 +25,7 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJxjYBgF6MCDH8H2hLJtBSG0vSAEDxSgtt3J/ITV0BJ4DbD9MGCHFq4DGcejYBRQApYOkjxFK9BIwH/zhrn/qQEAl/oFSQ==
+   eJxjYBgF6MBEE8E2hbI1tSG0tjYEDxSgtt3+moTV0BKYDbD9MKCFFq4DGcejYBRQAiYOkjxFK5BLwH9dw9z/1AAAI84Flw==
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
@@ -37,18 +37,18 @@
   <object id="48" template="../obj/treasure.tx" x="167.531" y="43.1429"/>
   <object id="50" template="../obj/enemy.tx" x="270.063" y="208.228">
    <properties>
-    <property name="enemy" value="Blue Wiz1"/>
+    <property name="enemy" value="Apprentice Blue Wizard"/>
    </properties>
   </object>
   <object id="51" template="../obj/treasure.tx" x="239.534" y="47.6363"/>
   <object id="53" template="../obj/enemy.tx" x="246.825" y="116.857">
    <properties>
-    <property name="enemy" value="Blue Wiz1"/>
+    <property name="enemy" value="Apprentice Blue Wizard"/>
    </properties>
   </object>
   <object id="55" template="../obj/enemy.tx" x="182.601" y="101.346">
    <properties>
-    <property name="enemy" value="Blue Wiz1"/>
+    <property name="enemy" value="Apprentice Blue Wizard"/>
    </properties>
   </object>
   <object id="56" template="../obj/gold.tx" x="294.751" y="210.094"/>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/graveyard_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/graveyard_2.tmx
index d6668d92eb9..32c6912c96d 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/graveyard_2.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/graveyard_2.tmx
@@ -32,7 +32,7 @@
   </object>
   <object id="52" template="../obj/enemy.tx" x="151.5" y="90.083">
    <properties>
-    <property name="enemy" value="Black Wiz1"/>
+    <property name="enemy" value="Apprentice Black Wizard"/>
    </properties>
   </object>
   <object id="53" template="../obj/enemy.tx" x="328.5" y="86.5">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grolnok.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grolnok.tmx
index 0b7e87c5d04..b5016abc9be 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/grolnok.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/grolnok.tmx
@@ -7,19 +7,19 @@
  <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <tileset firstgid="11905" source="../tileset/FarmFood.tsx"/>
  <tileset firstgid="16001" source="../tileset/main-nocollide.tsx"/>
- <layer id="8" name="Tilelaag 5" width="58" height="46">
+ <layer id="8" name="Collision" width="58" height="46">
   <data encoding="base64" compression="zlib">
-   eJztmEsOAiEMQGfjwo2n8Qwe3XNNGtOEIIW2tArtvITEDwN9fAp6HPF53f8dgT/gGN0THSN7lo4ZPKNSz2NU1wyetdfluTcZ1izwvn1Kyy+a98jT2/X5+C4WYOzgN6pX1vdiBc9fzGnLc9Qn93tqrWranIGaw16fnPFHRyxcvM6ekWfdT+t8oHJLL8dysFrLoz1JOY1cy8+sPLW+nNwz62iRXzw8ta6SeLVYes6MnWTf1vOv6YMLNZ/SPalZ23Xsnp6UK6eeZu1aeUqfQbSeUnpnlLQND0/L3InttV5zn509SyXtWuRNr5g1QBxWd/qLi9Uof5essuessc7Hq6K5C+06JhLP8v1unoDlnXd1IjpRZHAEMjgCGRwBrd9u46KNNcs6ALJ4ItS9wquvFc7CLPO7o+fM/3UROAHsz4Bw
+   eJztmEsOAiEMQGfjwo2n8QCuXM7SM3kyz2Ua04QgBVpahXZeQuJngD4+Bd02/9zP/47AHnD07omOnj1TxwieXsnn0atrBM/c6/BcmwhrFnidPqXk58275Wnter18Fw0wdvBrPZc+b8UMnr+Y05In9Pe4tWN77vXvqbVaq2MBNYe1PnvGHx2x9GJ19rQ8835K5wOVW2o5tgettdzak5RTyzX9TMtT6tuTe0YdNfKLhafUlROvFE3PkbHj7Nt8/iV99ELNJ3dPStZ2HrulJ+Xa85xk7Wp5cusgUk8utTOK24aFp2buxPZKr3vrjp6lnHY18qZVzBIgDq07/cHBbKS/S2bZc9po5+NZkdyFVh0Tjmf6fjVPQPPOOzsenSgiOAIRHIEIjoDUb7VxkcYaZR0AUTwR6l5h1dcMZ2GU+V3Rc+T/Og+8AYqSgY0=
   </data>
  </layer>
  <layer id="1" name="Background" width="58" height="46">
   <data encoding="base64" compression="zlib">
-   eJztmVsKgzAQRUOhFjfmkoT+diVK99IFdEMtoQpFjDiT18zkBs6fmjnciUoy9s6NAAC1vK4/atcBVwBAKrDO8zEsWM9w6Mu5SvG07GrB0w+Kb+01xHX0Y77RXGvXzfXk3q8p2xY8tdQZy0RYl5p5CKhBK75HJGHV89PJ93z+kcJRqif6Fp6aPV0jnnMjnhz8Pyw8bXnuuVrzDOVq1bOVPLeZWva0nOc9MLdWT+ocWj0vQvp2fQeEvtsleUfsZVLyTOVKfc56fSqnvb3f2BpjyZHdGc9cHJ2V5Mi0lCe3L7R5lujjL2AyrxQ=
+   eJztmVsKwjAQRYOg0o0VV1Tw14WIxb10AW5ICRoQaYozec1MbuB89ZE53Elb0mlwbgIAqGXZv2ldB1wBALnAOi/H+MF6huNQz1WKp2VXDZ7X0/ZxPyi+rdcQhzDmI821dd1cT+71mrLtwVNLnancCOtSMxcBNWjF94gkrHo+D/I971/kcJTqib6Fp2ZP14nn3IknB/8NC09bnmuu1jxjuVr17CXP30wte1rO8xyZW6sndQ6tnjshfRueAbH3dk0eCXuZlDxzuVLvE87P5bS295taYyolsvvHsxRb/0pKZFrLk9sX2jxr9PELyZyvew==
   </data>
  </layer>
  <layer id="2" name="Ground" width="58" height="46">
   <data encoding="base64" compression="zlib">
-   eJzlmMtOFUEQhhs4wxyIJoD6BhpxpT6ArtFDeAQ36kqNG9G41ShGHwG5nK1P4QZYeUlYiCs3hgjEN1B0fs6UU1Onuqen5wKJf1JhONPTU19XVV/GmOa1HuvWltp6l8b4eKLdd7elsvHsTmUGhYyLz7vazjPO5WsulfG9TdYiv8u2D/G5Dda6OKvG5n/hrFOaH3VwnhRG1zraRDyPQzbGEE7bfHvcjNIHGPyswunq/zjF/diMhu/Xxel6fxvCfubXaN74Hsd3DyDv+847bcXbl5Nfa9whjGXbVlERp9aeLIqHmUP9bZJVYyROycr5fPwNUVOxtXH+Vlh9GLmvoap7T0F+2zh5XCUjb9uEf3X15WKE3bL8rtn7kYFFwqdvXX2dqsIbwunL4Wvok/vzrMbvEieF87lpbg4hhfRblLdlGbkfsINTA6ubk+tLUhefjV4bEWurscp5p2jd4eso3kcGPTrfLOdoPDCfOcDGCb9htj0EbwP7M94+55lJY84mdm7Sj1NbO8j/EEbYuwv1MhInbCfJ16/dzE8f8TWRntHYZY5y24iGOeuOJWkx9eGJZc+Cd+908/9Lcd9dXBrnw2T9vDOemVRd8SV/kKsaJx8Hl7SY+nCeTnI6msp+42x1xpbHQBNqlsbhejczrtECHmmoS8PqYyvKc0KXp425ktjVabvvIesi1UcZf9fSd6yU5FwhVqb5sTznh4TvY2KfPDjL8FLdaXXGbSTO1h8pevboXuzO35ed4ednWe3fmzHmfmIPZvw5fVjBKdc/bhh/4nut+PhWvGNZ8Ppwar67VJaTcpb84WxG5BjyC3umvTF7f3Ps3lLHDMUWf23Pa77Ts0XfUYu0mM5B5AfFTsaItJD4uJv6idiSQT+VcXjFWIkTbVaU/l0sVTllO/w/54gXaT9lIiM2ivkB66MvYgrhWrI2yakJvsrcWuoMt+FzJL/eFc8ui1rltU/v2TZu36twYjyxHq6yOYLWC2K9yXxGnLV5yEd9C2eP9e/jewintn/huYRa/JH6QXnaY7/ZdCMdjzedbKx4TLmhX8y/RfF0sYZw4npNPPuiM+Bb8KxbsM2nbfm49BXOsvHUeMty0rXkLNJhuvbspzXbs4yHxllVxPq9a2+D/c3RPiTOcyJ3D5Xzg0tFjNCqwrmd3vM9E9rkiivm/n9neYVVEz9H0Vnq7niW99SnlG0eqks8h2X90jrpYuVnFPC4ztK3HTmAeGt7S5zPtip+r+Wskhsm1znbmdnn+wDsmqVG+rG9/42UEfVTZs1/OpE3G/d6nN+zSJ8503pczMjPzxD/PkDXl8TZ76KIY9H+IJRzT3Bib4tx5XMT/904+Lj107/IY7rGHL4ZZf3PRsN1rO1BbWvlXy+9NMc=
+   eJzlmM1OFEEQxxvYYRaiCaAevGvEk/oAmmhigmJ4BC/qSY0X0XiVIEYfAfnYq0/hBTj5kXgQT14MEYhvgOj82Smmpra6p2e2ZyDxn1QYdnp66tdV1R9jTP1ajXVrSk29S2N8NtLsu5tS2Xi2xzKDqoyLz7uazjPO5WsulfG9SdYiv8u2r+JzE6yhOPuNzf/CGVKaHyE4jwujax2tI55HIRtjFU7bfHvUjNIHGPzsh9PV/1GK+7Ee9d4Pxel6fxPCfmZvMG98j+O7B5D3feedpuLty8mvyZan8u0038vueepSEafWnmzvem+sq/pbJ6vGSJySlfP5+FtFdcXWxvlHYfVh5L5WVeg9xWHuWTh5XCUjb0uKAvoXitXFCLtr+V2zDwNdi4RPP9r6OtUPbxVOXw5fQw6Ai+xlwO8Sx4VzznTZ6pwzq/R79kY41jnhB2z3RNdCc3J9S+rii9FrI2JttRqV807RukMWxfmchZ6eq5dzMO6azxxg44TfMNsegreB/R1unvPUqDGnEzsz6seprR3k//zN8oyw9+fDMhInbDPJ1+/tzE8f8TWRntHYZY5yW4t6OUPHkjSb+vDcsmfBuzfb+f+luO8uLo3zSbJ+3h/OTCpUfMkf5KrGycfBJS2mPpwnk5yOxrLfOFvI2PIYaELN0jhca2fGNVjAIw11aVh9bER5TujSuDGXE7sybve9yrpI9VHG35X0HUslOZeIlenOUJ7zY8L3KbHPHpxleKnutDrjNhBn648UPXtwL3bn76tW7/OTrPYfThjzKLHHE/6cPqzglOsfN4w/8b1RfHwn3rEoeH04Nd9dKstJOUv+cDYjcgz5hT3T9pC9vyl2b6FlemKLv7bnNd/p2aLvqEWaTecg8oNiJ2NEmkl83Er9RGzJoN/KOLxmrMSJNktK/y6WfjllO/w/5YgXaSdlIiM2ivku66MjYgrhWrLWyakJvsrcWmj1tuFzJL/eEs8uilrltU/v+WrcvvfDifHEerjM5ghaL4j1NvMZcdbmIR91LJzTrH8f36twavsXnkuoxV+pH5Sn0+w3m26l4/G2lY0Vjyk39Iv5tyieLtYqnLheEc/Ot7p8M551C7Y7aVs+Lh2Fs2w8Nd6ynHQtOYu0n649O2nNTlvGQ+PsV8T6s21vg/3NwT4kznMid/eV84NLRYzQssL5Nb3neya0yRVXzP2HZ3mFVRM/R9FZ6sFwlvfUp5RtHgolnsOyfmmddLHyMwp4XGfpe44cQLy1vSXOZxt9fq/lrJIbJtc525nZ5/sA7KqlRjqxvf+1lHEyKrfmvxjJm417Nc7vWaTPnGk1Lmbk52eIfx+g64vi7HdBxLFof1CVc1twYm+LceVzE//dOPi4ddK/yGO6xhy+HmX9T0a9daztQW1r5T+SDDeK
   </data>
  </layer>
  <layer id="3" name="Clutter" width="58" height="46">
@@ -27,7 +27,7 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJzFWk2IHEUU7t6dmZ4fN7tZw+hBDBIJmoMe3FXQ9ecaV1BBMAbUg6CgSQSRQT3EEBUEr14SdTergT3q6snEf0i8iLi7JmJcDy6CgRCNBxU1Ueuj6qVev6nururpwQ8+pruruvp99X6qunejKB9L7Sh6V/G9dkHHEnimFUW7Jt38cqObwI6OpQt5bVm4W/W/R/Fec9/8Jf73Fs1RV12/TPHZVphNIfjWs99Zpe9nxV8C5weQc5QF6Pyu2c8r2ppAPdGka80JfR6C0579vggb1muOYC+4znT58Memnw1fB9pcFt8XtENjT/lzZ8dqfnzcHktS2/5WuD9dGGb94SD7uc48Sp2nTIyvOfz7jcfzfXOL45R/14sI1UkknajZyO/nStayQepPCGDrIDqpZl8u4q6KvOQ1UaJMvA+isyyKai/FCUhzuMbay8T7/6EzC1Q3uU6ZE1h3eLzzfD2UWNI4PcNQndAodfYq2mvIGkO+dK0brj3TgyNR9JDgwyNW675WuC+H4c9BsSW2x+dH9O9VsdV5pZq3zYY/NIcTs2uOa0XreyjydCJWei235s3tYo20h61PVGy0QdZ6KWsuYvZToRP8OE7rI9I9n8SaiG+uu4qYPTemmYeimixrLvclB2mFjsXI+pXmhc8H+kDb/ox6c3a0wCgBH51FkHuMPJ0gz1Op0aW1ClShk0PGLAfXQDEqNfK+pDUPiwG2kU5XfQpBnkZA+syHF4xO/v6MnH2soVk1fPZ3WfFaJV69Y7jj++zvhqFz3fP9Glga1QwFxTHqLdWavNp7QD3jpfDH5GJKnJ8Re6+Q/CyEqnlfqZ87u7r+/avyYpW14TqufV6PojeTfq0vKL7ImDUX6Hci1uT5SO9c0Ch1VgFouW9cHz8dWwLHlaa/lbbzqAVK27G6vn5tvT9+sY5gfmA7fl3xDY2HVdsRlf9HFe/qpttJ4zB0Em5rpkk4oOw6yNY3zAvWb8Qv99/hxOp8VM3LornnoMklqqv3m++wD7AasCFjXQmN1+tzagfsnkvsvov88Yax83g9+97ZUe3bM+p4r9oPbO9ajc1Ea+TEXHCdU0bjy7XqvuFlaZ0zcQRu71q9yEVoXDVaSa/UDd9CI41RM/PTML/vq2t/djTR/pfDn8BU1F+PqgTmd2bSPptrBMnX8469GeYAdWmveUfHGKhRbyXadzT+DsEP6Dv1RPp9ROZrlcDYv3c0oe8a40PkKGmciWwcE3gOo0Z9ZP7WQHNFe9bf1PmH7TSpnXSSVtjietd5Zcz/2wKP2yeU/3ZP6mM8D2PESdqHAMXiUbY/4msBfHyhYeejaD4JvO/uLel+Lp383a4seJwCc8wGirOdJpcof3kuvabORxIdB5EZC23LiivsOTcxvSfZddSfJ43WQ8lwdR4TfiRQPP/RKVcnVoq7eIF0bttQfgysDZjTBaOR4ms5sj6R9v66NX0euibMmmcgZn3uHUQj5Su+ycGX0HlzuaEKgXnKiwVfvRyh7+b7WNwjx8DT4n2gijWc4oMAO89tzeqdjzLfkqDzxkhT7vlkfLpA+yfaS7nWWQL5dGayv+2fnPfpi+uQIOGRQM3NS/VaGVRvTI0NxazYE7yeY2tVOqFPPj9Lq4+P6X7OQVCk08uemuVqLW1nEVx5y3XljXHE8W0G6yjfhxUxFL2rNccaVi/ZGFqDiuoqAfuP500NnDd/i7qd1YZh6ORAfu6ph8XbLcY+3/68zlJuY13je8Os/0EiSp1rHvulVXG+p27tzrJdXpd7qSJQHbjVzBF0Ltey+/uCvlXzv1dmQcavrCf4Re1a36TPr9tof2Mx9nSk16zpjGdB2zsNzfEKvtUW6SSfcr+Q3jyusONpxbcb1m7OJcUbHPeTtp9ob1LR3yBc4BpRj7L+rwxtHOj3lIlxxKFsz8OJTelzqncLDp2xeR8arWAOFhK3nXI9J6DvZ5HVSfdizui7IH1HlMcSvKZLnX17ENb+H5b/uI0=
+   eJzFWk2IHEUUrtn5n3WzmzWsvxgkEtSDHtxV0NXd7C2uoEJADagHDwE1EUQGFYkhKghevSTRbBYPOerqycR/SLyIuLtRMW4Qg5BAiMaDipqo9VH1Uq/fVndX9fTgBx/TU1Xd/b56P1XdM0plY6Gj1Lua73VyBhbAs22lnhz188u1fgIPDjr6kNWXhnv1+Ps077fnzV0Sfm7eHI3p9ss0n2vH2RSD7wLHndX6ftb8JXJ+ADlHaYDO71ureXXHEKg3DamtNWK+x+B04Lgv4i4bNEewFzzJdIXwp1aYDccibS6KEzn90NjV/tw66DQ/PuyOJalvdzvenz70s/5wkP1cZxalzuM2xlc8/v024P6hucVxPHzoRcTqJJJO1Gzk9/MFa1kv9ScGsLUXnVSzLxdxV0Ze8pooUSTee9FZFHm1l+IEpDlcYf1F4v3/0JkGqptcp8wJrDs83nm+Hmg60nW6lrE6oVHq7Ja015A1hnzpWzd8e6aHB5R6RPDRAad1Vzvel/3wZ6/YUHHH5wfM57UVp/MaPW/rLX9s9SdmVzxteet7LLJ0Ila6bb/m9Z18jbSHrY+UbLRF2nopay5i9lOhE/xYt/0wndRIeYZzPqkYYgzXXUbMnhsyzEJeTZY1l/uSg7QiTw8q51eaFz4fGANtu1PqzdlqjlECITrzIPcYWTpBnqdSo09rGShDJ4eMWQ6ugWJUauRjSWsWDkbYRjp99SkGWRoB6bMQXrA6qfZsmTY5u61hWDZC9ndp8VomXp/u7/VD9nf90Lkvot4sVA1jQXGMeku1Jqv2XjGj68ZU/H2umklvHxdtZ8TeKyY/c6Fr3lf64+4xU//+1XmxzPrQjrbP636tL2nWdNvLyvCVlNtUp8w4kGunZy5olDrLALRsGTbHz1QcgaNa099a23nUAq31SN2031BfHb9YRzA/qCX49MU35gLaDun8P6x5z1iynzT2QyfhrlaShD3a5r1sfcO8YP3eU3V+uXLG2E86T0wrtWnajN9rc4nq6gP2PexDrAasSVlXYuP15ozaAbv3N92+i/zxptV2tJ5+7mzV+PaMPt6p9wObx5xGHp88TrnOcavx1Vp57/DStEIj4gjcPOb0IhehcdlqJb1SN3wLjXSNt7SeFzYpNW/z933d9uegIfr/8vgTGFer61GZwPxOjrp7c40g+XrOszfDHKAu7bTP6LgGahSvMeQ/zg/oPfVI8nlE5muZwLV/HzSEvuutD5GjpHFSuTgm8BxGjfrI/tZAc0V71t/09w87SVI/6SStsEU+54CvDYW/W+Bx+4T23/ZRc4z74RqVZtKHAMXiYbY/4r9twMcXGm4+8uaTwMdu35Ac59PJn+2KgscpsJ/ZQHG21eYS5S/PpX36+0DTxIGy10LfouYSu89tTO83rB315ymr9UCzvzqPCD8SKJ7/GCxWJ5byhwSBdN64pvg1sDZgTuetRoqvReV8Iu39dWPye+yaMGvvgZgNObcXjZSveCcHX0Ln7cUulQvMU1YshOrliH0238XiHjkGnhbPA2Ws4RQfBNh5bmPa6GwUeZcEnbcqQ7nnk/HpA+2faC/lW2cJ5NPJ0dV9/2Q8T19chwQJj0Vqbl1q1sqoemNrbCxmxZ7gjQxby9IJffL+aVpDfEznc/aCPJ1B9tQcl2tJO/Pgy1uuK+sahzzvZrCO8n1YHmPRvc5wqOH0ko2xNSivrhKw/3jR1sA5+1vUFKsN/dDJgfzcUY+LtzusfaHjeZ2l3Ma6xveGaf9BIkqdKwH7pWXxfUfd2Z1mu2yXe6k8UB24084RdC7W0seHgt5V898r0yDjV9YTfKJ2nVxnvt+01n1WxLUnlFmzJlLuBW3vNAyHS3hXm6eTfMr9QnqzuMSOJzTfbji7ORc0b/GcT9pO0d6kj79/co2oR2n/K0MfB8Y9bWMccSj7s/D1uuR3qnfzHp0V+zxULWEO5pt+O+V6TsDYz5TTSedizui9IL1HlMcSvKZLnav2IKz/P2pvt1s=
   </data>
  </layer>
  <layer id="7" name="ClutterBis" width="58" height="46">
@@ -35,7 +35,7 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJy1WkuMFUUULd5j7GGGAQbnjQwxLiQCfmYGhGCIiaALE4VETYxoTHSlED4bAoMmAi6J37glMMyAUUzcICRE3bmbxfDNMBI/IbpAg/wk/lZaZ6oudfp2Vb8eBk9y0+9116uuU/feU7er34lOY07cZjtpbcsCM4G13cYcyEwBg/7c5rlTs/tnFe8v14B/73BHPq9tKjyBPn/cr3gOZ44/Y/sMd/y8kTfBmu689fq+RxP3Zo48FuCiv/f1haGPW+Et97q2MPQNro+1OoMvByyv3R3u2pv283f2fEtW5NmSxXniPGyT8s0W5UfNs1f5AO1qWTCTFeeuqj/77XEJ2VKaB/B9w9rqmjGHpqXtcXX9iZophc4V9qcAMcXzfxPE9VQFnoLUnAPC8wc/7mv2Hj/NdMe99vhajzGv97jrV+24rlm7nrnvLYoL/C98mCfi54Sf434118DbHS5GcvmVhbGn8l94iBalgOvCM4X6fGOmz3e83r/LmA+srb2nyFPiEf1xzEIL+ir6AxD/DpKGMFfhxvGxxPcVi9mdHWFcO4jnro40Z1yT6+DZGxmnzstmPNd4Lh3L3BEadVFppHDlOGSO0hf3jbac+/UsH7fAKvr8ZHfgBayeGb6zP8FFc6zCE+ilIziKH2PzyPfjfjkvhZ8eh/A83HDGnD9rBF6L5gUTnt+QpmvtGcpc/GE8WkNHPYenusO4ZZ0Rfwpf6CVzFo4Ar9WAnmteY8DzR9LTC54nx/Bb9bz27qq783z/M9ZueH7St8y5aOEpxROI5ZfkGK+Nwi0W16JFmOshb8N+/QRwbLQFH77sf/cp1Qh7Z4bPfxvX9kibW3+Ptrnz62e7o/Tf77VV/Cdr4ybPdVRx0nrKcS05y5bCgPXDmLJz04JPhCdzAn7P3NoK/7EGPdNuzLPWnmt3sdIyxxl4rmotxukyPwfMVecqx+BoRI91HcC6Kr7usmM712XMuLXt1lff2uM2ykOOS6kBXjGB1z/+82qKWYDzATylbh6lWC3oZEkdBcBfrK/CoazGlHbgua3hOMIGGo4nYo/XWfiWOXO+vtAT/I52iHnWnkNzTBJc8yCukXfgk6oHeTwC5sm+x/jldw079rm23zu9dcHq+T6lrfCW+Gbe7EvmOUx8V5B+SQ3d72NMap6725zpmr6vM7TVecg8NfC7rT5mEauMsS7H9dVIrXqcfiPzAe35oi34kmP2TLGLHCZyVHEFRJ8E8LPErPBkrYrVULLObPUxO9DIXwfPMZWnzPE85TK4QnvQn2gPcMP/hv25m/wpvtV59auKJaOeFUVXUzkpMcdrKWJWeO6kMeCz+FRi9LjKY85ntIMfOV6H/HFQ1QgCobNJaQ44aK7iW6kLcKyiPcJxwmclPEWHx0mP2SSfAfhefCkc1/vvG/zxaZVXuM+HdwTry1w+XlTPZVh7htV8SRwzV1lPhLfW2DGVnwLWp5QJFs8omuCTLHDW4OexkSy/Fi7VeRvZ7yjbu9E8YePKd5PBgO3vGOUyYnV6VlwLNF98HqX5H0nsGYDrAeIKXFJ1iwbm46Bt21Nz/uIYZBMt0vzHu8I1GDh+bPu7RDkFfrjHIW8z/NhEl1ETyhzw85Lw1Fxxjdfjs6bo1zL0kF+RoxhzZz3YDvt9RyPk5oTmdOfbza3n/SY1Op/r8r7GVEhNCMyrxXnqva+TnUWeVYHny65ayEGMH1qy0l9faeK10kAtXNcY9ntgmudB79PLfv252u44Hqvl9XJDa1GXRqfIU8D+A1aofQOeB1h3Lb6XwzwBra0HKX4B9NOncvBFy/+l9tBmhHjqPViBvk8M9cRvGUdreYMPWDsKiOSiAFy5H/2cDa77qCvmGcODs5uPX+OjWfnvstZwHAuSzxvGPXsB2EfhXNTPTfrZMraXxTxFX4/QvWKa20yHgXUle10Ac320SVvk4pV2l4tAbB+I9xPAEWN8eFroI+bPFI/lJszP8ohp/DIJvU6B85drlJhJTYfxi6FGbfE8pXaXurVlkmMR7mdNUb/0+j5Z7py/sb1FthyILwCeHKc6H7WfpC2Pd1HJxMT8XBV12hNIcUvy9L/n/PzNcr5s7UpJ3h1JnI+tP89X1K4qGqff/zBnvU+sAR1jf75jdeBda+810QPGrfjptPp+S/mb5feKBbl3RMatvzpuF89y71IfUOtBCimOWo/kM++Paiwtee+SgvbfYFbUAZzjdWfEt9ftBMsq3pv5YQ4ldptx/dKu/V9Z+7otfj0GeZbkfWpdF+vn5hGal33FLnM+moqmpLDOrombF4QarWzdlXcMev9ZDBiOPI8xT15TbzdS6yvwh+X3p7W/2hMNCIM+51LvooFmPP9PNIsDXSfGMEi6kuJ5U4uy4l6Rfn7RzzJ71P2qrhkaoq1lGluWo1X+TwDovQINyWPWC5mDvin6vMr6ITkqbeUdioyr0v8m7s0/c9VJY5GXUgPoNVc4l8V2TI9xTmL1dtS4gH5XErPzxnHaT+/sBKLJ4Cjv9MQEzFPzOh35jGOzvfMqeChL51TMmI/49edWZ3rNjXEti19d40wFezw3wUavKx33pQ04nOgPXC+0OhtSY4/xxPxcmF6uWWK9WXGOU4j9fmNrvK3kKTg9siB/Tp7d+JxAx3KMZwyoveW/T9Iva9eI0uhUnTUZpPaQBKJRGt/TGDiWy/hVBedyWV07GZTuIZmgUf8BC4FPjw==
+   eJy1mktoX0UYxadJ402TprWaRCviwuLbpK2KUgT9x4VvUKFYRXAjWrG6kTZVsOpSfLaCG9HYtOAD3FQLou7cRUi1lVrFB0UXVbRa37rSOZk5ved+d+bmpqkHPu4/9zm/+R4zd272LHNuz3G2j7w9sMLN6MZh514pXE0Tcd/9J83PzltSfz6PQf+eELa639p8OKHRuH3ZcE4WgV+1aVHYvjlUNeqG4aqNxHtPZ56tjNoW6FB89i9nl/c4Fm4+68jZ5b3BekVvMPhy3HM9NhCOPex/f+H39xR1zp4izYn9sA3GNw8YP1rOEeMDnNdVlOaKet+19edKv10ltlr6AbwPeet0ObdzQd7GzPGrulyjbK6oPynElPb/UQnrxy04qVyfQ+T8Krb7iH/GN4vD9kW/vXu5c/csD8d/9u064u2XIvzdY1jgf/IoJ+JnT+zjlaavoccHQoxU8qso257Lf3KwFuWE4+TMqfs05xaeFrieOcW5Z73deEadk/GI+2nMohaMtvQHRP9OSA1RVrJpfKyK90rF7JaBsl2bhfPRgTwzjvE4OEcS7bR5ORvnDaYeokYdMvvIqnGojLyX3hvnau53F9W4ha6U31cPl1xQZ3H5t/oTLJaxDSc0Ilsw0o+pftTn6X01L8ln20HO14eCKfMbQyXXOaeWRs4PpKbb2rO9CPGH9tgaOh0Zrhsu281xhv4kL+qlMpMR0rEasn2tYww4v5Z6ejByagw/0l2tvY92h/36/H3efot8vDf7nLXwY8MJpfKLOaZjI9lScc1ahL7eHm0yjp8QtkN9pQ/viNe9JnOEFxeXv/924dxdfWH8fbsv7F+/NGx5/5WxttJ/HBs3RNZpw2TrqcY1c1Ytp3Hvh/3GPl1Q+oScygT9WoSxFf7TGnRTv3M3e7ulP8RKz4nBwHllbz1OL459oKw2VzUGpxP12M4DtK7S14O+bZ8OOnfA2ybvq8/8dqPkocYl5wB3upLrn/i7IzELaT6Ak/PmaYnVWp1smEdB8JfWVzI0zTF5Hjg3DgVG2PhQ4ETs6TgL3yqz5uuty0u/4zzEvNaenSe6rHTOg7hG3oEnNx/U9lDKqb5H+3Hd2o7PQd/2k/x9T442CPP7bu1U+4PX4RrGN84hs/pSOSeF91KpX5xDr4wxxjnP6X3B7Jx+dFl5rs1D5bTCdQ/GmEWsqvYP1lkhML4j1/Ac1J63+kpfaszuqz+6opkcNawQ6xMFPzNmyam1KjWH4jjzYIzZ8aHqcXDuN3mqjJ9LLpMV92PtgX6L16k/HxN/0rc2r76XuJiReVdkXc3lJHNNx1LELDm3SBvwmz5ljL5j8ljzmawar9vjdsLMESjibDA1BwyWlb7lvADbNrWHjDM+a+BkHT4g9ViN+QzB9/QlGdfHv++N2+tNXuE5z51Q2mgR8vGQeS/D2DNp+otxrKwcT8j94TVV3+w3+UlpfcoZde6iulGvFoHZ5juk72NTRXUsXG3zNrHe0bR2YzlhB4zv5qJx78vdksuI1YVFfSwgL4Xf09L/U5k1A7C+IqzQD2beYoX+uOta5/7qBH9pDKqxFln+A4PlMRgYnx/zz5WcAt8O356d0RbFtrEuY07IPtD3JXJaVhzT8fgTV/drTlvHAutGqSdo87ax0jb7vzcPlbk5U3OGw3nLuoOBUf3GObruG4y+RldwTgid2pXmtGtfHy2rc7YV3i/xfOYg2o9asiYeX+PScyX6b03inpNxDcxy7og+Pdwf9v/cHxh3d1Xr5b299bo0PU9OaOtY1X9oP8c1jJcvjFX7AfZ7J72Wo5yQra07JH6h4a7q+zDudZvnv72/PGdKOO0aLGWfk1J35loy/tmp9gP7QmtHTYlcVNa3u4Lt7qq/Z4P1JbmVcqZ0wdLZGa22LSl//9oJNQa+0zimsu8bLrx7QVhH0Vy070323TK1lqWcrK+75FmpmjtbHYbWxZjdKr5TKevlDetiEHLxp/6Qi1BqHUjXE8CINl60oLxHyp85jktc2T+XJMzqu5b1ukmavzpHSRnndGg/DXPUnsjJuTvnrT1zbAvZP3H1+mXH97mya/6m1hbVKhJeCJwapzYfrZ94rrb3nIaOSfm5rbplTSDHluWM12t+/uiZD3v7qSHvdmX2p8aftS1rV5saZ7//KLNdJ7ZCHVN/PunrwFPenp6lHqiOxU97zd/HlL9Fda2YqnwjcmH8tXF77pLwLfX8Ja6Vcoy2HvG3ro9arW747pKT9d9EUa8D2KfjzlQ8355HXdzy2cqHPmTszsb6rh/73/P2fl/6eEp8l9R1ajsvtu/NU9IvL9VvWfHRfGpKTuv8mHj/inKOtq4hd/iNwa4/06DJxPuYcuqYeryVG1+hPzzfn97+6s+cIJqIOZf7Fg3Nxvl/arY42NaiLkxIXclxHq1FRX2tyL6/2HeZJ8zz2o4ZVqytTTW2KUfb/D8BZNcKrJjHWi/YB6Pz9Hmb8YM5ynP5DYXtavV/E2dW37m6pcYiLzkHsGMumZtiO1WPsY+xejzmuJD9VpKyz11gelm+2VGsyWDkNz0apZyWa2/iN7azrZ230YVFPqdSpjz067e9weyYm2Jtil87x5mPnohs1H2xrgyclTfo9cz9wHqwN9h20/YUJ/rn4MLmmkUbKep9nFPq+vt60+cyT8F02YrqPr676T7KxnKKMyXMvfm/T7yv1q4pU6Nz86y5KLeGRLFGWX0pbdBYbuJrK83lpnntXNS4huTKGvUfc59rZQ==
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grolnok_f1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grolnok_f1.tmx
index dabab207a93..647e55eca90 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/grolnok_f1.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/grolnok_f1.tmx
@@ -11,12 +11,12 @@
    eJxjYEAAN04EJgeQqg/ZPhM+0jCyXmIxue6kBIzaS397QeljIOwdSuFMrv7B4F96AmrZ+4ECe4dSuqK2G0gBHxgGLpznkVH3UcNeUgHMLkrqeWrYC8PzOFHl0QGx4cooysDABMW46n1sZuOzFxdG9xc57SZCbZhpBNoy6PqJBejpDpd+XHLk+pdYe4nRTwogNZ9h8y817QXFm6YEgg2Tp4e92Nj42snk2kusemqUQfjSKDY+tco9XOUZsX0QagJq2gsAMiw9tA==
   </data>
  </layer>
- <layer id="13" name="background" width="30" height="30">
+ <layer id="13" name="Background" width="30" height="30">
   <data encoding="base64" compression="zlib">
    eJzF190OwTAUB/CGi3JtEzc+Etlj4Ea8BS48FjGewhXhRuJtvAE72U52VrSnXTcn+cd0bX9rLdkIUaxG6D+2de/4Sd1eVS53nE+XO9amqthDG7dsHxf3H8VxLzI/Psvf/bi1bAkxSOa5GqKW6bypIsmzR2TuIeO6OC7Xfoo0nP3gumivNH5VruqroW5f5u0u9c39FXTBWjt6Lm4ki+PqdDfBf1zTPvjyuddmW4u22cXzuus8Wr7fgAt5Bfn7ET3GjOfF72qfpqMbh/nxNkzvH3xe0LVD+z7rD5/4fHRdL8xzyBJrXGgD7zb/dHEu/O247qmXhroQdMHB4HrR9ulSR02dLu4xZKfcd7OuuwvzPjrF+Wlo4X1ErTLuXePSdztf7iTZp6kS3X8gdV9d3arHvgH1Jev1
   </data>
  </layer>
- <layer id="18" name="Tilelaag 4" width="30" height="30">
+ <layer id="18" name="Foreground" width="30" height="30">
   <properties>
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
@@ -24,7 +24,7 @@
    eJzdlsFKw0AQhrdK2fbipbbmpmAteO9VPNhDwWdQEV/FZ/CiVPogVkX6IAp6rW/QZtgOGaebZDodovjDBxsy3W92syXp7zjX/yVqbee2KmK7nXkf0/H1rg5JaP1Y6c2br6gPifeuGdj3zg3rNhx4ufczrX/xmzFzgdd/4D1L7182AlV5wQnBWsggUq/15gXmwTrk2Yd7Ft5Zjvd92dP3EsgH6RN+91WXe2n/RV5cM3pxrZZejtRL0ewzws8M98aeK655He+Tz/4nMa4amfeioA6YCL3rZtpaPd+cMq8m4IWMmhlVeGNBP39fUe9JJ/5+tgqd97RT/A0yNvRCyr55MA/EO1fs/4j1LfXyHHUDN6QHGJ/3AmXRet+6Ae6VRuvVuCy9x8nq+HbPznufc54Pk59j6fo3XS8NOBFLL9+/XhLg19Zey/wV7wK0wx76
   </data>
  </layer>
- <objectgroup id="12" name="Kopie van Objects" opacity="0.9">
+ <objectgroup id="12" name="Objects" opacity="0.9">
   <object id="140" template="../obj/treasure.tx" x="308.807" y="387.623">
    <properties>
     <property name="reward">[{
@@ -67,7 +67,7 @@
 </property>
    </properties>
   </object>
-  <object id="168" template="../obj/gate.tx" gid="3221229597" x="288.001" y="351.869" width="15.9995" height="20.7576" rotation="90.4687" visible="1">
+  <object id="168" template="../obj/gate.tx" gid="3221229597" x="283.85" y="353.055" width="15.9995" height="20.7576" rotation="90.4687" visible="1">
    <properties>
     <property name="dialog">[{
     &quot;text&quot;:&quot;This door is locked&quot;,
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/grove_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/grove_1.tmx
index 01012ef849a..bae5220e92f 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/grove_1.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/grove_1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="83">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="83">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -76,7 +76,7 @@
   </object>
   <object id="57" template="../obj/enemy.tx" x="374.985" y="77.6361">
    <properties>
-    <property name="enemy" value="Green Wiz1"/>
+    <property name="enemy" value="Apprentice Green Wizard"/>
     <property name="threatRange" type="int" value="50"/>
     <property name="waypoints" value="77,78,71,72,78"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/jacehold.tmx b/forge-gui/res/adventure/Shandalar/maps/map/jacehold.tmx
index 51e5d1d4d66..76553000e7c 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/jacehold.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/jacehold.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="39" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="102">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="39" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="102">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -208,7 +208,7 @@
   <object id="76" template="../obj/manashards.tx" x="220.5" y="17.5"/>
   <object id="77" template="../obj/enemy.tx" x="56" y="240">
    <properties>
-    <property name="enemy" value="Blue Wiz2"/>
+    <property name="enemy" value="Adept Blue Wizard"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="92,80,81,80"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/kobold_encampment.tmx b/forge-gui/res/adventure/Shandalar/maps/map/kobold_encampment.tmx
new file mode 100644
index 00000000000..91eb3d450a1
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/kobold_encampment.tmx
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="35" height="28" tilewidth="16" tileheight="16" infinite="0" nextlayerid="40" nextobjectid="243">
+ <editorsettings>
+  <export format="tmx"/>
+ </editorsettings>
+ <tileset firstgid="1" source="../tileset/main.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="11905" source="../tileset/FarmFood.tsx"/>
+ <tileset firstgid="16001" source="../tileset/dungeon.tsx"/>
+ <layer id="33" name="Background" width="35" height="28">
+  <data encoding="base64" compression="zlib">
+   eJztk01uwjAQhc0mgWXCz5XKrtuyIXTTHoE9qtIztOUSvQHHYMcGIThAlrS15YzsWGPHzjhClXjSU/7f+zSOq4SxqsUvI2W4t58qv47tDhFkm9eufDDGY+MLZfHt1fswlq4zamPBGGxctln58phrdLB0talt7ULn8s2/XWUyY8mPRSavIWs2lcYU458Blmsm/VOzfOaMfeXNLME2ccyIuqeARcxEsPzW8wA2PQuef+TynaI+h1nGYAEOzCJjPVEsmLe5m8GXRXC4WOA5vPOcybXTHYvF1a37cabs09uFx2QBUfpis/TBsxj5rxMmSi9misT31P5YLMCjO7Q/Jl/MrodEep7gXX2zHHlvmTL2nqrM0w1ZTHVlofJs+DwuWveZn7+l9q5Qjt2w6aeBHw+FA2PBVHrkCx4Kh8nkEvDAXqHumbvu+i/6AzQIJW0=
+  </data>
+ </layer>
+ <layer id="39" name="Tilelaag 3" width="35" height="28">
+  <data encoding="base64" compression="zlib">
+   eJztlT8OgjAUh99k+Ds4wGkkGg/h6uboqE7eRY+iXkB0MBLj6AlcwTaloWJbaClO/ZIXfQj8vrRPACC8ByBl4ZKipI78/C5gF9YHZ11QXVEt3aqnFXr9eJwd4pGW2fjz6ZPffI9k075v6JpkKO/h/y9X5oJrquFxi8z76M4jdjHpkwpmIh/+ZsqqK7K9YV1EUIeuPnRvRPNalC5ziRNvXUboe6LoFaD/7EthXtvuzx31GVMmaZoJfHwXAOwD0m/i/lxYHxHjEGASVr2qS8G8Y4B5rvOuV51NVZcZcsld4nFgni86a5tEVW1re7SKm68/ovyT8+3BujT50Ox1LdvknPDuy8toc44uOu8ji8VisVi68gFJ9Hjg
+  </data>
+ </layer>
+ <layer id="38" name="Wall" width="35" height="28">
+  <data encoding="base64" compression="zlib">
+   eJxjYMAN0jhRMTLgYGJgWIyEOZlQxUB8UsFCLgaGRUC8mAu7XTAzJdDsXoJm1yI0sUVIan8yEucWe24GBgcgduSG2A/z3xQmVDO3INmzWRTTnDhBBoZ4IE4QxJSbRKR77gLdcA+I7wPxMiZM/2ED2NzyB+iGv0D8D4tbyAVsRMTzdWEGBjFRCL4mDBGbJcTAMBuI5whhqg8Dhsl0EtMPctwgg6vCCDbI/hIRBP8vEeFAbBwhuwNX3GCLE1LBF0YIJgbgixt6ugVfmBADsKURbIBQPGErKwiB2Wh2E+sWagF/MQhOpGKexQfCSEjrtADhQPsjGBFlwA9G0vIftcE0JoQ7QOULsXmP2mAytByCuQMEQG75NkDumYSlvJ1GQR6nNgC5bzIaHsh0hA5IrVdoDZDDaxSMglEwCkYB6QAAA11KiA==
+  </data>
+ </layer>
+</map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/lavaforge_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/lavaforge_1.tmx
index 833406b4a1e..760b7e27513 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/lavaforge_1.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/lavaforge_1.tmx
@@ -148,7 +148,7 @@
  &quot;lifeModifier&quot;: 6,
  &quot;startBattleWithCard&quot;: [ &quot;c_a_treasure_sac&quot; ]
 }</property>
-    <property name="enemy" value="Red Wiz2"/>
+    <property name="enemy" value="Adept Red Wizard"/>
    </properties>
   </object>
   <object id="59" template="../obj/enemy.tx" x="366" y="125.5">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/lavaforge_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/lavaforge_2.tmx
index 7244acccee2..f0582265eb1 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/lavaforge_2.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/lavaforge_2.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="64">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="67">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -157,7 +157,7 @@
  &quot;lifeModifier&quot;: 4,
  &quot;startBattleWithCard&quot;: [ &quot;Desert|AFC|1&quot; ]
 }</property>
-    <property name="enemy" value="Red Wiz2"/>
+    <property name="enemy" value="Adept Red Wizard"/>
    </properties>
   </object>
   <object id="61" template="../obj/treasure.tx" x="418" y="238.667">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_1.tmx
index 54497c9bcdd..b3791c09dc2 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_1.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/magetower_1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="75">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="75">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -50,7 +50,7 @@
   </object>
   <object id="50" template="../obj/enemy.tx" x="207.402" y="88.0586">
    <properties>
-    <property name="enemy" value="Blue Wiz1"/>
+    <property name="enemy" value="Apprentice Blue Wizard"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="72,73"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_13.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_13.tmx
index d9bd3638b74..f5f44867bc5 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_13.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/magetower_13.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="101">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="101">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -82,7 +82,7 @@
  &quot;lifeModifier&quot;: 10,
  &quot;startBattleWithCard&quot;: [ &quot;Hesitation&quot; ]
 }</property>
-    <property name="enemy" value="Blue Wiz3"/>
+    <property name="enemy" value="Master Blue Wizard"/>
    </properties>
   </object>
   <object id="67" template="../obj/enemy.tx" x="247.673" y="379.931">
@@ -108,7 +108,7 @@
   </object>
   <object id="80" template="../obj/enemy.tx" x="285.049" y="316.722">
    <properties>
-    <property name="enemy" value="Blue Wiz3"/>
+    <property name="enemy" value="Master Blue Wizard"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="90,91,88"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_2.tmx
index bb4245f9169..301579684a5 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_2.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/magetower_2.tmx
@@ -43,7 +43,7 @@
   </object>
   <object id="50" template="../obj/enemy.tx" x="208.402" y="125.559">
    <properties>
-    <property name="enemy" value="Black Wiz1"/>
+    <property name="enemy" value="Adept Black Wizard"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="68,71"/>
    </properties>
@@ -63,14 +63,14 @@
   <object id="62" template="../obj/gold.tx" x="153" y="112.5"/>
   <object id="65" template="../obj/enemy.tx" x="175" y="191.5">
    <properties>
-    <property name="enemy" value="Black Wiz1"/>
+    <property name="enemy" value="Apprentice Black Wizard"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="74,72,74,68,70,73,69,73,70,68"/>
    </properties>
   </object>
   <object id="66" template="../obj/enemy.tx" x="321.5" y="151">
    <properties>
-    <property name="enemy" value="Black Wiz1"/>
+    <property name="enemy" value="Apprentice Black Wizard"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="69,73,70,68,74,72,74,68,70,73"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_3.tmx
index 5965e793335..d5d48f89768 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_3.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/magetower_3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="77">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="77">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -39,7 +39,7 @@
   </object>
   <object id="50" template="../obj/enemy.tx" x="209.152" y="63.8086">
    <properties>
-    <property name="enemy" value="Red Wiz1"/>
+    <property name="enemy" value="Adept Red Wizard"/>
     <property name="threatRange" type="int" value="30"/>
     <property name="waypoints" value="74,72,73,75,72"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_4.tmx
index b9c31ab6733..f369c7e33e3 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_4.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/magetower_4.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="86">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="86">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -44,7 +44,7 @@
   </object>
   <object id="50" template="../obj/enemy.tx" x="208.402" y="64.8086">
    <properties>
-    <property name="enemy" value="White Wiz1"/>
+    <property name="enemy" value="Master White Wizard"/>
     <property name="threatRange" type="int" value="30"/>
    </properties>
   </object>
@@ -85,7 +85,7 @@
   </object>
   <object id="68" template="../obj/enemy.tx" x="172" y="125.5">
    <properties>
-    <property name="enemy" value="Monk"/>
+    <property name="enemy" value="Apprentice White Wizard"/>
     <property name="threatRange" type="int" value="40"/>
    </properties>
   </object>
@@ -103,7 +103,7 @@
   </object>
   <object id="71" template="../obj/enemy.tx" x="243" y="190">
    <properties>
-    <property name="enemy" value="Monk"/>
+    <property name="enemy" value="Apprentice White Wizard"/>
     <property name="threatRange" type="int" value="40"/>
    </properties>
   </object>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/magetower_5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/magetower_5.tmx
index cf3e35cf2e5..05b6482877f 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/magetower_5.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/magetower_5.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="28" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="94">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="28" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="9" nextobjectid="94">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -39,7 +39,7 @@
   </object>
   <object id="50" template="../obj/enemy.tx" x="155.981" y="126.642">
    <properties>
-    <property name="enemy" value="Green Wiz1"/>
+    <property name="enemy" value="Adept Green Wizard"/>
     <property name="threatRange" type="int" value="50"/>
     <property name="waypoints" value="89,90,86"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/forest_capital.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/forest_capital.tmx
index 43e4d863f7b..3c8f1edae52 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/forest_capital.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/forest_capital.tmx
@@ -39,7 +39,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
-    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
     <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
@@ -80,7 +80,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen"/>
-    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
     <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
@@ -89,7 +89,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
-    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
     <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
@@ -98,7 +98,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
-    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
     <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
@@ -107,7 +107,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
-    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
     <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
@@ -116,7 +116,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
-    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
     <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
@@ -134,7 +134,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
-    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
     <property name="signYOffset" type="float" value="-2"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
    </properties>
@@ -144,6 +144,8 @@
     <property name="arena">{
 
     &quot;enemyPool&quot;:[
+	&quot;Adept Green Wizard&quot;,
+	&quot;Apprentice Green Wizard&quot;,
 	&quot;Beastmaster&quot;,
 	&quot;Centaur&quot;,
 	&quot;Centaur Warrior&quot;,
@@ -156,13 +158,13 @@
 	&quot;Elf&quot;,
 	&quot;Elf warrior&quot;,
 	&quot;Faerie&quot;,
-	&quot;Green Wiz1&quot;,
-	&quot;Green Wiz2&quot;,
-	&quot;Green Wiz3&quot;,
 	&quot;High Elf&quot;,
 	&quot;Loamspeaker&quot;,
+	&quot;Master Green Wizard&quot;,
 	&quot;Mindclaw Shaman&quot;,
+	&quot;Runelord&quot;,
 	&quot;Satyr&quot;,
+	&quot;Simic Wizard&quot;,
 	&quot;Shaman&quot;,
 	&quot;Shaman of Zedruu&quot;,
 	&quot;Treefolk&quot;,
@@ -209,7 +211,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen"/>
-    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Hydra"/>
+    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
     <property name="signXOffset" type="float" value="-16"/>
     <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
@@ -219,7 +221,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Green,Creature6Green,Instant6Green,Elf,Wolf,Druid,Squirrel"/>
     <property name="mythicShopList" value="Planeswalker4Green,WUBRG,RGU,UWG,UGB,RWG,RGB,GWB,Legend4Green,PhyrexianGreen,Hydra"/>
-    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green"/>
+    <property name="rareShopList" value="Artifact4Green,Land4Green,Dimir,Rakdos,Orzhov,Golgari,Vehicle2Green,Wand4Green,Shapeshifters,Insects"/>
     <property name="signXOffset" type="float" value="-16"/>
     <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Dinosaur4Green,Wolf4Green,Sliver4Green,Multicolor8Green"/>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/island_capital.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/island_capital.tmx
index 0f0bdd19e5b..391cc1d7c93 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/island_capital.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/island_capital.tmx
@@ -44,7 +44,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
-    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods"/>
     <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
@@ -53,7 +53,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
-    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods"/>
     <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
@@ -62,7 +62,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
-    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods"/>
     <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
@@ -90,7 +90,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
-    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods"/>
     <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
@@ -99,7 +99,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
-    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods"/>
     <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
@@ -108,7 +108,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
-    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods"/>
     <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
@@ -131,10 +131,9 @@
     <property name="arena">{
 
     &quot;enemyPool&quot;:[
+	&quot;Adept Blue Wizard&quot;,
 	&quot;Aether Channeler&quot;,
-	&quot;Blue Wiz1&quot;,
-	&quot;Blue Wiz2&quot;,
-	&quot;Blue Wiz3&quot;,
+	&quot;Apprentice Blue Wizard&quot;,
 	&quot;Cephalid&quot;,
 	&quot;Challenger 20&quot;,
 	&quot;Challenger 21&quot;,
@@ -146,6 +145,7 @@
 	&quot;Illusionist&quot;
 	&quot;Knight Mercenary&quot;,
 	&quot;Loamcaller&quot;,
+	&quot;Master Blue Wizard&quot;,
 	&quot;Merfolk&quot;,
 	&quot;Merfolk Avatar&quot;,
 	&quot;Merfolk Fighter&quot;,
@@ -154,6 +154,7 @@
 	&quot;Merfolk warrior&quot;,
 	&quot;Pirate&quot;,
 	&quot;Rogue&quot;,
+	&quot;Simic Wizard&quot;,
 	&quot;Tarkir Djinn&quot;
 	],
     &quot;rounds&quot;:3,
@@ -210,7 +211,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
-    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods"/>
     <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
@@ -219,7 +220,7 @@
    <properties>
     <property name="commonShopList" value="Enchantment6Blue,Creature6Blue,Instant6Blue,Merfolk,Wizard"/>
     <property name="mythicShopList" value="Planeswalker4Blue,WUBRG,RWU,RGU,UWG,RUB,UWB,UGB,Legend4Blue,PhyrexianBlue,Sphinx"/>
-    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue"/>
+    <property name="rareShopList" value="Artifact4Blue,Land4Blue,Azorius,Izzet,Simic,Dimir,Vehicle2Blue,Wand4Blue,Gods"/>
     <property name="signYOffset" type="float" value="-4"/>
     <property name="uncommonShopList" value="Pirate4Blue,Spirit4Blue,Sliver2Blue,Rogue4Blue,Multicolor8Blue"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/mountain_capital.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/mountain_capital.tmx
index f7d9af2f268..72e7fd89a5f 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/mountain_capital.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/mountain_capital.tmx
@@ -119,6 +119,8 @@
     <property name="arena">{
 
     &quot;enemyPool&quot;:[
+	&quot;Adept Red Wizard&quot;,
+	&quot;Apprentice Red Wizard&quot;,
 	&quot;Ashmouth Devil&quot;,
 	&quot;Axgard Dwarf&quot;,
 	&quot;Barbarian&quot;,
@@ -138,11 +140,11 @@
 	&quot;Goblin Chief&quot;,
 	&quot;Goblin Warrior&quot;,
 	&quot;Khan&quot;,
+	&quot;Kobold Dragoncaller&quot;,
+	&quot;Kobold Shaman&quot;,
+	&quot;Master Red Wizard&quot;,
 	&quot;Minotaur Flayer&quot;,
 	&quot;Pyromancer&quot;,
-	&quot;Red Wiz1&quot;,
-	&quot;Red Wiz2&quot;,
-	&quot;Red Wiz3&quot;,
 	&quot;Shaman&quot;,
 	&quot;Shaman of Zedruu&quot;,
 	&quot;Troll&quot;,
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/plains_capital.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/plains_capital.tmx
index fc7c0f18765..aa385f5cc50 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/plains_capital.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/plains_capital.tmx
@@ -37,8 +37,8 @@
  <objectgroup id="4" name="Objects">
   <object id="41" template="../../obj/shop.tx" x="465" y="260">
    <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
-    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White,Small Cats,"/>
+    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite,Eldrazi"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
     <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
@@ -46,8 +46,8 @@
   </object>
   <object id="56" template="../../obj/shop.tx" x="416" y="260">
    <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
-    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White,Small Cats,"/>
+    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite,Eldrazi"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
     <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
@@ -64,8 +64,8 @@
   </object>
   <object id="43" template="../../obj/shop.tx" x="370" y="325">
    <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
-    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White,Small Cats,"/>
+    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite,Eldrazi"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
     <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
@@ -74,8 +74,8 @@
   <object id="47" template="../../obj/inn.tx" x="536" y="144"/>
   <object id="49" template="../../obj/shop.tx" x="417" y="324">
    <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
-    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White,Small Cats,"/>
+    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite,Eldrazi"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
     <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
@@ -83,8 +83,8 @@
   </object>
   <object id="50" template="../../obj/shop.tx" x="465" y="323">
    <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
-    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White,Small Cats,"/>
+    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite,Eldrazi"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
     <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
@@ -101,8 +101,8 @@
   </object>
   <object id="52" template="../../obj/shop.tx" x="369" y="261">
    <properties>
-    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White"/>
-    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite"/>
+    <property name="commonShopList" value="Enchantment6White,Creature6White,Instant6White,Angel,Human4White,Soldier4White,Small Cats,"/>
+    <property name="mythicShopList" value="Planeswalker4White,WUBRG,RWG,RWU,RWB,UWG,UWB,GWB,Legend4White,PhyrexianWhite,Eldrazi"/>
     <property name="rareShopList" value="Artifact4White,Land4White,Dimir,Rakdos,Orzhov,Golgari,Vehicle2White,Wand4White"/>
     <property name="signYOffset" type="float" value="-8"/>
     <property name="uncommonShopList" value="Bird4White,Spirit4White,Sliver4White,Knight4White,Multicolor8White"/>
@@ -128,7 +128,9 @@
     <property name="arena">{
 
     &quot;enemyPool&quot;:[
+	&quot;Adept White Wizard&quot;,
 	&quot;Adventurer&quot;,
+	&quot;Apprentice White Wizard&quot;,
 	&quot;Archer&quot;,
 	&quot;Archer Elite&quot;,
 	&quot;Archaeologist&quot;,
@@ -150,13 +152,12 @@
 	&quot;Knight&quot;,
 	&quot;Knight Mercenary&quot;,
 	&quot;Kor Warrior&quot;,
+	&quot;Master White Wizard&quot;,
 	&quot;Monk&quot;,
+	&quot;Runelord&quot;,
 	&quot;Orthodoxy Duelist&quot;,
 	&quot;Orzhov Cleric&quot;,
-	&quot;White Dwarf&quot;,
-	&quot;White Wiz1&quot;,
-	&quot;White Wiz2&quot;,
-	&quot;White Wiz3&quot;
+	&quot;White Dwarf&quot;
 	],
     &quot;rounds&quot;:3,
     &quot;entryFee&quot;:100,
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/spawn.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/spawn.tmx
index 5b4dd9dbbd5..e0412cc612d 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/spawn.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/spawn.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="72">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="77">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -37,7 +37,7 @@
   <object id="61" template="../../obj/entry_left.tx" x="0" y="465" width="16" height="465"/>
   <object id="65" template="../../obj/entry_left.tx" x="464" y="463" width="16" height="462"/>
   <object id="66" template="../../obj/entry_down.tx" x="16" y="17" width="447" height="16"/>
-  <object id="69" template="../../obj/enemy.tx" gid="2147495067" x="238" y="208">
+  <object id="69" template="../../obj/enemy.tx" gid="2147495067" x="260.998" y="224.029">
    <properties>
     <property name="dialog">[{
   &quot;text&quot;:&quot;Hello, planeswalker {var=player_name}&quot;,
@@ -76,7 +76,7 @@
     { &quot;name&quot;:&quot;Bye&quot; }
   ]
 }]</property>
-    <property name="enemy" value="Black Wiz2"/>
+    <property name="enemy" value="Adept Black Wizard"/>
    </properties>
   </object>
   <object id="70" template="../../obj/entry_up.tx" x="240" y="272" width="16" height="16">
@@ -87,5 +87,35 @@
     <property name="teleport" value=""/>
    </properties>
   </object>
+  <object id="72" template="../../obj/shop.tx" x="305.612" y="270.766">
+   <properties>
+    <property name="commonShopList" value="Eldrazi"/>
+    <property name="signYOffset" type="float" value="-8"/>
+   </properties>
+  </object>
+  <object id="73" template="../../obj/shop.tx" x="118.838" y="270.766">
+   <properties>
+    <property name="commonShopList" value="SmallCats"/>
+    <property name="signYOffset" type="float" value="-8"/>
+   </properties>
+  </object>
+  <object id="74" template="../../obj/shop.tx" x="205.256" y="318.853">
+   <properties>
+    <property name="commonShopList" value="Shapeshifter"/>
+    <property name="signYOffset" type="float" value="-8"/>
+   </properties>
+  </object>
+  <object id="75" template="../../obj/shop.tx" x="265.887" y="308.399">
+   <properties>
+    <property name="commonShopList" value="Gods"/>
+    <property name="signYOffset" type="float" value="-8"/>
+   </properties>
+  </object>
+  <object id="76" template="../../obj/shop.tx" x="203.165" y="240.102">
+   <properties>
+    <property name="commonShopList" value="Insects"/>
+    <property name="signYOffset" type="float" value="-8"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/swamp_capital.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/swamp_capital.tmx
index 27e7eb50f3b..06d6149c99c 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/swamp_capital.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/swamp_capital.tmx
@@ -56,9 +56,8 @@
     <property name="arena">{
 
     &quot;enemyPool&quot;:[
-	&quot;Black Wiz1&quot;
-	&quot;Black Wiz2&quot;,
-	&quot;Black Wiz3&quot;,
+	&quot;Adept Black Wizard&quot;,
+	&quot;Apprentice Black Wizard&quot;,
 	&quot;Challenger 20&quot;,
 	&quot;Challenger 21&quot;,
 	&quot;Challenger 22&quot;,
@@ -71,6 +70,7 @@
 	&quot;Harpy 2&quot;,
 	&quot;High Vampire&quot;,
 	&quot;Lich&quot;,
+	&quot;Master Black Wizard&quot;,
 	&quot;Necromancer&quot;,
 	&quot;Rat Ninja&quot;,
 	&quot;Vampire&quot;,
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/temple_of_liliana/keep.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/temple_of_liliana/keep.tmx
index bedbb918eb4..63a2bf4b3d8 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/temple_of_liliana/keep.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/temple_of_liliana/keep.tmx
@@ -150,7 +150,7 @@
 		}]
 	}]
 } ]</property>
-    <property name="enemy" value="Black Wiz2"/>
+    <property name="enemy" value="Adept Black Wizard"/>
    </properties>
   </object>
   <object id="226" template="../../../obj/portal.tx" type="portal" x="112" y="112">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/templeofchandra.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/templeofchandra.tmx
index f178b01e1a1..57fe3a1f26a 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/templeofchandra.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/main_story/templeofchandra.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="60" height="61" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="184">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="60" height="61" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="184">
  <properties>
   <property name="canFailDungeon" type="bool" value="true"/>
   <property name="dungeonEffect">{
@@ -1254,7 +1254,7 @@
 		}]
 	}]
 } ]</property>
-    <property name="enemy" value="Black Wiz2"/>
+    <property name="enemy" value="Adept Black Wizard"/>
    </properties>
   </object>
   <object id="171" template="../../obj/enemy.tx" x="736.083" y="497.25">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/monastery_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/monastery_1.tmx
index b8417da0c9a..1fb3ffdfacb 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/monastery_1.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/monastery_1.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="71">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="71">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -59,7 +59,7 @@
   </object>
   <object id="55" template="../obj/enemy.tx" x="215.746" y="123.525">
    <properties>
-    <property name="enemy" value="White Wiz1"/>
+    <property name="enemy" value="Apprentice White Wizard"/>
     <property name="threatRange" type="int" value="40"/>
     <property name="waypoints" value="63,62"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/monastery_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/monastery_2.tmx
index d3e375708f0..c3c28d80ec6 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/monastery_2.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/monastery_2.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="82">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="82">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -82,13 +82,13 @@
   </object>
   <object id="70" template="../obj/enemy.tx" x="237.51" y="183.254">
    <properties>
-    <property name="enemy" value="White Wiz1"/>
+    <property name="enemy" value="Apprentice White Wizard"/>
     <property name="threatRange" type="int" value="20"/>
    </properties>
   </object>
   <object id="71" template="../obj/enemy.tx" x="164.5" y="120">
    <properties>
-    <property name="enemy" value="White Wiz1"/>
+    <property name="enemy" value="Apprentice White Wizard"/>
     <property name="threatRange" type="int" value="20"/>
    </properties>
   </object>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/monastery_3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/monastery_3.tmx
index d3cc5d1c85c..0d02c10120b 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/monastery_3.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/monastery_3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="71">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="71">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -57,13 +57,13 @@
   </object>
   <object id="59" template="../obj/enemy.tx" x="286.626" y="137.313">
    <properties>
-    <property name="enemy" value="White Wiz1"/>
+    <property name="enemy" value="Apprentice White Wizard"/>
     <property name="threatRange" type="int" value="20"/>
    </properties>
   </object>
   <object id="60" template="../obj/enemy.tx" x="287.292" y="215.969">
    <properties>
-    <property name="enemy" value="White Wiz1"/>
+    <property name="enemy" value="Apprentice White Wizard"/>
     <property name="threatRange" type="int" value="20"/>
    </properties>
   </object>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/monastery_4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/monastery_4.tmx
index 8dfc981052a..6c415ffc27b 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/monastery_4.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/monastery_4.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="62">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -85,13 +85,13 @@
   <object id="58" template="../obj/manashards.tx" x="303.975" y="224.625"/>
   <object id="59" template="../obj/enemy.tx" x="238.878" y="221.935">
    <properties>
-    <property name="enemy" value="Monk"/>
+    <property name="enemy" value="Apprentice White Wizard"/>
     <property name="threatRange" type="int" value="40"/>
    </properties>
   </object>
   <object id="60" template="../obj/enemy.tx" x="191.392" y="220.555">
    <properties>
-    <property name="enemy" value="Cleric"/>
+    <property name="enemy" value="Apprentice White Wizard"/>
     <property name="threatRange" type="int" value="40"/>
    </properties>
   </object>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/monastery_5.tmx b/forge-gui/res/adventure/Shandalar/maps/map/monastery_5.tmx
index 80831c89741..6db20f6a696 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/monastery_5.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/monastery_5.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="65">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="65">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
@@ -54,7 +54,7 @@
   </object>
   <object id="58" template="../obj/enemy.tx" x="240.648" y="313.313">
    <properties>
-    <property name="enemy" value="White Wiz2"/>
+    <property name="enemy" value="Adept White Wizard"/>
     <property name="threatRange" type="int" value="20"/>
    </properties>
   </object>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/nahiri.tmx b/forge-gui/res/adventure/Shandalar/maps/map/nahiri.tmx
index d24e620f3e3..23799c79b70 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/nahiri.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/nahiri.tmx
@@ -118,7 +118,7 @@
     <property name="threatRange" type="int" value="30"/>
    </properties>
   </object>
-  <object id="105" template="../obj/gate.tx" x="46.211" y="119.111" width="19.1841" height="22">
+  <object id="105" template="../obj/gate.tx" x="45.711" y="118.611" width="19.1841" height="22">
    <properties>
     <property name="dialog">[{
     &quot;text&quot;:&quot;This gate is locked&quot;,
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/skullcave_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/skullcave_1.tmx
index 373354236dc..ddda941d0f0 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/skullcave_1.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/skullcave_1.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="67">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="67">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJxjYBj8QJqHgSGaF8KOAtKyPPSzF2YXMptWYBfU/J08EH+i27uLTv6mJ8DnJ2ka+LeOm7BbkMN/oAClaQ1f2A2mdEQLtwwW/2FzB7XdNhj8Sg9/jnQACk/0MMUmRiwAALFiEcg=
@@ -25,7 +25,7 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJxjYBgF+MAeflSalmABkh3Y7F1ABzfQG+DzEy38S6x9Ax3WlNoP04/NTyvwyA0HMFj8gs0d1HbbYPArPfw5CqgLAE38EOE=
+   eJxjYBgF+MAKTVSalqAHyQ5s9vbQwQ30Bvj8RAv/EmvfQIc1pfbD9GPz0xQ8csMBDBa/YHMHtd02GPxKD3+OAuoCAM6aEXE=
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
@@ -36,7 +36,7 @@
   </object>
   <object id="50" template="../obj/enemy.tx" x="209.781" y="66.3283">
    <properties>
-    <property name="enemy" value="Black Wiz1"/>
+    <property name="enemy" value="Apprentice Black Wizard"/>
    </properties>
   </object>
   <object id="54" template="../obj/enemy.tx" x="207.069" y="226.922">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/skullcave_3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/skullcave_3.tmx
index 161539317d0..70258263f56 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/skullcave_3.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/skullcave_3.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="58">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="58">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="7" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJxjYBgFo2AUDATw4mRgWMUx0K6gD6jjZmDYw8PAsJeHvvbuAtoXxcvAEM1LX3sHGkjzQPw+CkYBNgAA4BQFog==
@@ -30,7 +30,7 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJxjYBgFgxUsAWJWOttJb/tgYMkA2TuS/MuKg00v8JaXgeEdL/39zsnHwMDFR187Byo9DwQYqDw00GAg45jSMAcA5rAGIA==
+   eJxjYBgFgxUsAWJWOttJb/tgYMkA2TuS/MuKg00vcFOdgeGWOv39/hVo5zd1+to5UOl5IMBA5aGBBgMZx5SGOQBT3wg2
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
@@ -42,17 +42,17 @@
   <object id="51" template="../obj/treasure.tx" x="216.917" y="46.4167"/>
   <object id="53" template="../obj/enemy.tx" x="208.5" y="198.167">
    <properties>
-    <property name="enemy" value="Black Wiz1"/>
+    <property name="enemy" value="Apprentice Black Wizard"/>
    </properties>
   </object>
   <object id="54" template="../obj/enemy.tx" x="242" y="170">
    <properties>
-    <property name="enemy" value="Black Wiz1"/>
+    <property name="enemy" value="Apprentice Black Wizard"/>
    </properties>
   </object>
   <object id="55" template="../obj/enemy.tx" x="202.833" y="146.667">
    <properties>
-    <property name="enemy" value="Black Wiz1"/>
+    <property name="enemy" value="Adept Black Wizard"/>
    </properties>
   </object>
   <object id="56" template="../obj/treasure.tx" x="200" y="47"/>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/snowabbey_1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/snowabbey_1.tmx
index 4a8c0c31357..a3a35eda956 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/snowabbey_1.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/snowabbey_1.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="56">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="56">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJxjYMAOonkZGHbxoOIoXog4jMYmTymQBZpTy40qJg0U2w3EO3kg8signhsiTw170QGyuYTkh4O9hMBQt5cUc0hVj88cUsGoveTZOxDxCysHYQC9HCQkTy4YTOXGcLd3J5o5+OzdTaV0hV63wjCx8oQAAOmmIfY=
@@ -30,7 +30,7 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJy1lE0KwjAQhUODuDDgAYpnEt14G2/gD4iX8UgtqFUEl2akgy/jJLbSPChNk8l8edMkTWFM0z5n/+yteWvmjKqTC9+osu2rYWzhc259zgtwGsE82nDOfRzmnU/1thb7HIXfB4XNTIql9cWEuSUnJc4p2bciHI8p5RclvSL/oXBzqBb7gDzvbD+/fYSeOW/lPm1i87+VStUyFSs9dtE/c7rmZK+/9u8QLClk5xTzkbMEr5Vy1/Q5oxib8rLyzI2N10O7J0vXfVzjE+vanl0S/uPcdUduDml1JH98b2DfUMKa1S6eG9c2xL76tRZaR+w8rSffc7GP2jIGv2P7hH29AL0EWYc=
+   eJy1lE0KwjAQhUODuDA3KB7AM3gK3Xgbb+APiJfxSC2oVQSXZqSDL+MkttI8KE2TyXx50yRNYUzTPmf/7K15a+qMqpML36iy7athbOFzbn3OC3AawTzacM59HOadz/S2Fvschd8Hhc1MiqX1xYS5JSclzinZtyIcjynlFyW9Iv+hcHOoFvuAPO9sP799hJ45b+U+bWLzv5VK1TIVKz120T9zuuZkr7/27xAsKWTnFPORswSvlXLX9DmjGJvysvLMjY3XQ7snS9d9XOMT69qeXRL+49x1R24OaXUkf3xvYN9QwprVLp4b1zbEvvq1FlpH7DytJ99zsY/aMga/Y/uEfb0AnA9Zqw==
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
@@ -44,17 +44,17 @@
   <object id="52" template="../obj/gold.tx" x="99" y="232.5"/>
   <object id="53" template="../obj/enemy.tx" x="199.25" y="63">
    <properties>
-    <property name="enemy" value="Red Wiz1"/>
+    <property name="enemy" value="Apprentice Red Wizard"/>
    </properties>
   </object>
   <object id="54" template="../obj/enemy.tx" x="135.333" y="199">
    <properties>
-    <property name="enemy" value="Red Wiz1"/>
+    <property name="enemy" value="Apprentice Red Wizard"/>
    </properties>
   </object>
   <object id="55" template="../obj/enemy.tx" x="262.333" y="198.5">
    <properties>
-    <property name="enemy" value="Red Wiz1"/>
+    <property name="enemy" value="Apprentice Red Wizard"/>
    </properties>
   </object>
  </objectgroup>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/snowabbey_2.tmx b/forge-gui/res/adventure/Shandalar/maps/map/snowabbey_2.tmx
index 50d96fcc8d4..cc013d654d2 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/snowabbey_2.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/snowabbey_2.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="57">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="57">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJxjYBgFo2BkAmkeBFuWB7e6UUA52AMM3700DmNpLOZH8TIwRPNiio/G99AHwzn/7uLBjomVJwQAhfEMmQ==
@@ -17,7 +17,7 @@
  </layer>
  <layer id="7" name="Background2" width="30" height="17">
   <data encoding="base64" compression="zlib">
-   eJxjYIAAJ04GhhouBoZaIK7jYqAqqASa58gJseMOFCMDXOLUBCA7HNDMR3YXrQDIjmoqh+dIB7bA+LKnQpx182Nn4wIPoHmE3uABNG/A8ic1/E4MAKVd5LxJT78j501s+QdbGiAmDslRi2wnqGysoWMcwOyExcE9GttbC01jD5Di3QFHHFALIPsPBJyItJPU/AsD6GFKSr3ziwuCcfHxAUL1IK3sRQawsAUAAUozuQ==
+   eJzllUsKgDAMRLO1N/EQ4udSIn5OKtJzuLKhDQRptZW0Gx8EVKRjMh0LYBkqgEUBrKY2BaJMZr2+shq7K07ouSSo0d3W59+VC9SYhef5dxrjVyvg2Vj7r0Nol5HSaJcNyqdE7zHg3uXZLNk7z6YvP749EOPhl3e5Jv4bl4IekCZ5cGTWXd0e08z3LuCBFLw/ZIjUTM0vcZ9pyrlzKluh+yfezsFcuhya7QVvxjPd
   </data>
  </layer>
  <layer id="2" name="Walls" width="30" height="17">
@@ -30,7 +30,7 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJy1lUEKwjAQRUPElYEeQDxUVRCPogtPoOJGD+ORLGh1o0vzKYPTcaa1JX4Y0iRNXn6TTHPv3H7g3C2W1xiH+DwOzk1CVUpRnxS9j7IQ/a9hVea+XkcJNpg0d1/RmmhuKVoTrYG3WZ7apI3j8/O1gMX7aHxfgSu9yrrmFe9w7jn8Fpyr6RLqHE2p95f7s757Cm6TJ0uFcX+6cLU5IfI69d9nCkrBtTyDV3r9njVxV5lz66ydSyqU/S6ZV37emrjHyDy1cK2cAS0icxfz09z4zqnyBhc8wes9xkNw5f3tKs6Vd4a8grtVPP/rXJFXCslOnSfhm3uV7KW3z5X8L1r/SW1/LSbF03/8bkb1sajzNlmnNp4nwZsZzDcA4F5d
+   eJy1lUEKwjAQRUPElbmBeIAepyqIB9BjCLpW8TweyYJWN7o0nzI4HWdaW+KHIU3S5OU3yTT3zh0Hzt1ieY1xis/j4NwkVKUU9UnR+ygL0f8aVmXu63WUYINJc/cVrYnmlqI10Rp4m+WpTdo4Pj9fC1i8j8b3FbjSq6xrXvEO557Db8G5mi6hztGUen+5P+u7p+A2ebJUGPenC1ebEyKvU/99pqAUXMszeKXX71kTd5U5t87auaRC2e+SeeXnrYm7jcxdC9fKGdAiMg8xP82N75wqb3DBE7zeYzwEV97fruJceWfIK7h7xfO/zhV5pZDs1HkSvrlXyV56+1zJ/6L1n9T212JSPP3H72ZUH4s6b5N1auN5EryZwXwDUChedQ==
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
@@ -44,12 +44,12 @@
   <object id="52" template="../obj/gold.tx" x="168" y="25"/>
   <object id="53" template="../obj/enemy.tx" x="107.75" y="61">
    <properties>
-    <property name="enemy" value="Red Wiz1"/>
+    <property name="enemy" value="Apprentice Red Wizard"/>
    </properties>
   </object>
   <object id="54" template="../obj/enemy.tx" x="291.833" y="59.5">
    <properties>
-    <property name="enemy" value="Red Wiz1"/>
+    <property name="enemy" value="Apprentice Red Wizard"/>
    </properties>
   </object>
   <object id="55" template="../obj/enemy.tx" x="199.333" y="232">
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/snowabbey_3.tmx b/forge-gui/res/adventure/Shandalar/maps/map/snowabbey_3.tmx
index deb7c665e0b..c785026fc63 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/snowabbey_3.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/snowabbey_3.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="57">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="30" height="17" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="57">
  <editorsettings>
   <export target="wastetown..tmx" format="tmx"/>
  </editorsettings>
  <tileset firstgid="1" source="../tileset/main.tsx"/>
- <tileset firstgid="3477" source="../tileset/buildings.tsx"/>
+ <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <layer id="6" name="Collision" width="30" height="17">
   <data encoding="base64" compression="zlib">
    eJxjYBicYA8PA8NeHvLlyQW7eCCYXPlRMDiBDA8CU1MtuYBW6ZcQiOJlYIjmpZ35gy2cR8HwBdJI6UaWxmkIOb9is5fa+RlWz6BjYuUJAQDRPxeF
@@ -30,7 +30,7 @@
    <property name="spriteLayer" type="bool" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJy1lU0KwjAQhUPFlYW6cSUeKiKIl/EE/oG3tKC2INWdGeLgc5ymoT8fDC2ZNi8vmSQ2MeYwMubmnlcXJ/dOLFLzxxzaQvkcchb6LyCI59jnWBMpMmPKrF4X8wj1iZyFtk2+uVzxoPlB3RhIg8aB2k1abUE/2PaAeSZYX85PV6Qv8nxU1rMvcPzs/ZL+zgN/g220ftuJjyb4O62eY2n655X56NIn+bSwl5A6v7OpD0T61bQYTW+I2tbqdanUeh+E9sTaae5dPa8G0tb0yfv9s39LMd9971/WY1h3N5BnrVaopvjckNqh2oo9n2NqtQDfG8V32/soNBYr7sQK7qcu96/UQdj/G8u0WtA=
+   eJy1lU0KwjAQhWPFlb2BeIB6m4ggXsYT+AeeT3duLKgVRJdmiIPPcZqG/nwwtGTavLxkktjEmE3fmKt7Xlzs3DsxTs0fI2gL5XPIWei/gCBeA59jTeSQGXPMynUxj1CfyF5o2+SbyxUPmh/UjYE0aByoXaVVF/SDbQ+YZ4L15fw0Rfoiz1tlPdsCx8/ez+nvPPA32Ebrtxz6qIK/0+o5lqp/TpmPJn2STwt7CSnz25v4QKRfTYvR9Lqoba1ep0qtt0FoT8yd5trV86wjbU2fvN8++/cu5rvt/ct6DOuuOvKs1QrVFJ8bUjtUW7Hnc0ytFuB7ofiuex+FxmLFnfiE+6nJ/St1EPb/BvHbWxg=
   </data>
  </layer>
  <objectgroup id="4" name="Objects">
@@ -43,17 +43,17 @@
   <object id="51" template="../obj/treasure.tx" x="101.527" y="134.913"/>
   <object id="53" template="../obj/enemy.tx" x="139.382" y="133.036">
    <properties>
-    <property name="enemy" value="Red Wiz1"/>
+    <property name="enemy" value="Apprentice Red Wizard"/>
    </properties>
   </object>
   <object id="54" template="../obj/enemy.tx" x="257.009" y="131.827">
    <properties>
-    <property name="enemy" value="Red Wiz1"/>
+    <property name="enemy" value="Apprentice Red Wizard"/>
    </properties>
   </object>
   <object id="55" template="../obj/enemy.tx" x="199.429" y="56.5249">
    <properties>
-    <property name="enemy" value="Red Wiz1"/>
+    <property name="enemy" value="Apprentice Red Wizard"/>
    </properties>
   </object>
   <object id="56" template="../obj/gold.tx" x="199.84" y="21.8333"/>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/tibalt.tmx b/forge-gui/res/adventure/Shandalar/maps/map/tibalt.tmx
index d45a7773293..205021b406a 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/tibalt.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/tibalt.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="31" height="22" tilewidth="16" tileheight="16" infinite="0" nextlayerid="22" nextobjectid="201">
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="31" height="22" tilewidth="16" tileheight="16" infinite="0" nextlayerid="22" nextobjectid="201">
  <editorsettings>
   <export format="tmx"/>
  </editorsettings>
@@ -59,7 +59,7 @@
   </object>
   <object id="122" template="../obj/enemy.tx" x="101.042" y="176.271">
    <properties>
-    <property name="enemy" value="Red Wiz1"/>
+    <property name="enemy" value="Adept Red Wizard"/>
     <property name="threatRange" type="int" value="20"/>
     <property name="waypoints" value="183,184"/>
    </properties>
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/zedruu_f4.tmx b/forge-gui/res/adventure/Shandalar/maps/map/zedruu_f4.tmx
index e16fc789246..60c70997f80 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/zedruu_f4.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/zedruu_f4.tmx
@@ -7,7 +7,7 @@
  <tileset firstgid="10113" source="../tileset/buildings.tsx"/>
  <tileset firstgid="11905" source="../tileset/FarmFood.tsx"/>
  <tileset firstgid="16001" source="../tileset/dungeon.tsx"/>
- <layer id="37" name="Colission" width="44" height="33">
+ <layer id="37" name="Collision" width="44" height="33">
   <data encoding="base64" compression="zlib">
    eJzVmG0KwjAMhvdz/SOeSocH8Irix63EuWNI2F4MJWm6tbX1geIQ7R7SJO3Wdb9lt5/HrZ8/W4M7wfPpuu7l6jmFgC9cW+W8xI88B9fu2mOc3fd6qLz2tK53Nvwa4jlQ21eqa+7IeSy/HSv4bu1BcN4SYy0OFuSZUtspOWH5+rl5z9DXc+SEFusStQFfyXlSvpfm+JUvQXnsO0/s2nKWfEv1HvKiPfhh5FbIWfMdM+xFb/cdPIaniFgcDWcfrNnW+pgC/yvhC8YlPmsIuRKpvtb8x8znFOSwBvVS7Zw5uThfwsoNax6O5hxyxT2s2PG10XrnGldAzv6eJMHrNgY/l0an135uYnK9Jf7Nt+TaWVCsDt5I6VulgS8I+dZ2BdTD4CydpS99WVeaf02/Qd/Vzv0l6wux4M/DMeeN0HuSUr5w9dcOzm9hxJDDV7q3tS/ymPPYX43nv9Tcle4rjRhwPtWcW+kJHM25RVcOf95q3ZWA79b6+gDoLH8h
   </data>
diff --git a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas
index 1bf046d1dac..b567f85ffdb 100644
--- a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas
+++ b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.atlas
@@ -181,6 +181,21 @@ NecronShop
 ChaosShop
   xy: 352, 816
   size: 16, 16
+InsectShop
+  xy: 368, 912
+  size: 16, 16
+CatShop
+  xy: 288, 928
+  size: 16, 16
+ShapeshifterShop
+  xy: 384, 912
+  size: 16, 16
+GodMinigodShop
+  xy: 320, 928
+  size: 16, 16
+EldraziShop
+  xy: 304, 928
+  size: 16, 16
 TyranidShop
   xy: 368, 816
   size: 16, 16
diff --git a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.png b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.png
index edd6291650e..625e84b9919 100644
Binary files a/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.png and b/forge-gui/res/adventure/Shandalar/maps/tileset/buildings.png differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/badger.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/badger.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/badger.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/badger.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/badger.png b/forge-gui/res/adventure/Shandalar/sprites/animals/badger.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/badger.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/badger.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/bat.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/bat.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/bat.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/bat.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/bat.png b/forge-gui/res/adventure/Shandalar/sprites/animals/bat.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/bat.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/bat.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/bear.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/bear.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/bear.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/bear.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/bear.png b/forge-gui/res/adventure/Shandalar/sprites/animals/bear.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/bear.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/bear.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/boar.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/boar.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/boar.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/boar.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/boar.png b/forge-gui/res/adventure/Shandalar/sprites/animals/boar.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/boar.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/boar.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/bull.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/bull.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/bull.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/bull.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/bull.png b/forge-gui/res/adventure/Shandalar/sprites/animals/bull.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/bull.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/bull.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/camel.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/camel.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/camel.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/camel.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/camel.png b/forge-gui/res/adventure/Shandalar/sprites/animals/camel.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/camel.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/camel.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cat.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/cat.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cat.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/cat.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cat.png b/forge-gui/res/adventure/Shandalar/sprites/animals/cat.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cat.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/cat.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/chicken.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/chicken.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.png b/forge-gui/res/adventure/Shandalar/sprites/animals/chicken.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/chicken.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/crab.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/crab.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/crab.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/crab.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/crab.png b/forge-gui/res/adventure/Shandalar/sprites/animals/crab.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/crab.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/crab.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/deer.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/deer.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/deer.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/deer.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/deer.png b/forge-gui/res/adventure/Shandalar/sprites/animals/deer.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/deer.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/deer.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/deer_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/deer_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/deer_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/deer_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/deer_2.png b/forge-gui/res/adventure/Shandalar/sprites/animals/deer_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/deer_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/deer_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dog.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/dog.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dog.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/dog.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dog.png b/forge-gui/res/adventure/Shandalar/sprites/animals/dog.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dog.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/dog.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/elephant.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/elephant.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/elephant.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/elephant.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/elephant.png b/forge-gui/res/adventure/Shandalar/sprites/animals/elephant.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/elephant.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/elephant.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/fox.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/fox.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/fox.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/fox.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/fox.png b/forge-gui/res/adventure/Shandalar/sprites/animals/fox.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/fox.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/fox.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/frog.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/frog.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/frog.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/frog.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/frog.png b/forge-gui/res/adventure/Shandalar/sprites/animals/frog.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/frog.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/frog.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/gorilla.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/gorilla.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/gorilla.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/gorilla.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/gorilla.png b/forge-gui/res/adventure/Shandalar/sprites/animals/gorilla.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/gorilla.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/gorilla.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/griffin.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/griffin.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/griffin.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/griffin.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/griffin.png b/forge-gui/res/adventure/Shandalar/sprites/animals/griffin.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/griffin.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/griffin.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/griffin_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/griffin_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/griffin_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/griffin_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/griffin_2.png b/forge-gui/res/adventure/Shandalar/sprites/animals/griffin_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/griffin_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/griffin_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/hippo.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/hippo.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/hippo.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/hippo.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/hippo.png b/forge-gui/res/adventure/Shandalar/sprites/animals/hippo.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/hippo.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/hippo.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/horse.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/horse.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/horse.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/horse.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/horse.png b/forge-gui/res/adventure/Shandalar/sprites/animals/horse.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/horse.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/horse.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/jellyfish.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/jellyfish.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/jellyfish.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/jellyfish.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/jellyfish.png b/forge-gui/res/adventure/Shandalar/sprites/animals/jellyfish.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/jellyfish.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/jellyfish.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/octopus.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/octopus.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/octopus.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/octopus.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/octopus.png b/forge-gui/res/adventure/Shandalar/sprites/animals/octopus.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/octopus.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/octopus.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/owl.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/owl.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/owl.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/owl.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/owl.png b/forge-gui/res/adventure/Shandalar/sprites/animals/owl.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/owl.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/owl.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/penguin.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/penguin.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/penguin.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/penguin.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/penguin.png b/forge-gui/res/adventure/Shandalar/sprites/animals/penguin.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/penguin.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/penguin.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/raven.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/raven.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/raven.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/raven.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/raven.png b/forge-gui/res/adventure/Shandalar/sprites/animals/raven.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/raven.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/raven.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/reindeer.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/reindeer.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/reindeer.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/reindeer.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/reindeer.png b/forge-gui/res/adventure/Shandalar/sprites/animals/reindeer.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/reindeer.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/reindeer.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/squirrel.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/squirrel.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/squirrel.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/squirrel.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/squirrel.png b/forge-gui/res/adventure/Shandalar/sprites/animals/squirrel.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/squirrel.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/squirrel.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/turtle.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/turtle.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/turtle.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/turtle.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/turtle.png b/forge-gui/res/adventure/Shandalar/sprites/animals/turtle.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/turtle.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/turtle.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/vulture.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/vulture.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/vulture.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/vulture.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/vulture.png b/forge-gui/res/adventure/Shandalar/sprites/animals/vulture.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/vulture.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/vulture.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/wildrat.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/wildrat.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/wildrat.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/wildrat.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/wildrat.png b/forge-gui/res/adventure/Shandalar/sprites/animals/wildrat.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/wildrat.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/wildrat.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/wolf.atlas b/forge-gui/res/adventure/Shandalar/sprites/animals/wolf.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/wolf.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/animals/wolf.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/wolf.png b/forge-gui/res/adventure/Shandalar/sprites/animals/wolf.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/wolf.png
rename to forge-gui/res/adventure/Shandalar/sprites/animals/wolf.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dragonfly.atlas b/forge-gui/res/adventure/Shandalar/sprites/arachnida/dragonfly.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dragonfly.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/dragonfly.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dragonfly.png b/forge-gui/res/adventure/Shandalar/sprites/arachnida/dragonfly.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dragonfly.png
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/dragonfly.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/unused/Replaced/insect.atlas b/forge-gui/res/adventure/Shandalar/sprites/arachnida/giantfly.atlas
similarity index 98%
rename from forge-gui/res/adventure/Shandalar/sprites/unused/Replaced/insect.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/giantfly.atlas
index eb6b96c2bf6..a4693765f94 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/unused/Replaced/insect.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/arachnida/giantfly.atlas
@@ -1,4 +1,4 @@
-insect.png
+giantfly.png
 size: 192,160
 format: RGBA8888
 filter: Nearest,Nearest
diff --git a/forge-gui/res/adventure/Shandalar/sprites/unused/Replaced/insect.png b/forge-gui/res/adventure/Shandalar/sprites/arachnida/giantfly.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/unused/Replaced/insect.png
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/giantfly.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarab.atlas b/forge-gui/res/adventure/Shandalar/sprites/arachnida/scarab.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/scarab.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/scarab.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarab.png b/forge-gui/res/adventure/Shandalar/sprites/arachnida/scarab.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/scarab.png
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/scarab.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/scorpion.atlas b/forge-gui/res/adventure/Shandalar/sprites/arachnida/scorpion.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/scorpion.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/scorpion.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/scorpion.png b/forge-gui/res/adventure/Shandalar/sprites/arachnida/scorpion.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/scorpion.png
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/scorpion.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/spider_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_black.atlas
similarity index 98%
rename from forge-gui/res/adventure/Shandalar/sprites/spider_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_black.atlas
index 05f5b14a287..61c87786882 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/spider_2.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_black.atlas
@@ -1,4 +1,4 @@
-spider_2.png
+spider_black.png
 size: 64,96
 format: RGBA8888
 filter: Nearest,Nearest
diff --git a/forge-gui/res/adventure/Shandalar/sprites/spider.png b/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_black.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/spider.png
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_black.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_cave.atlas b/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_cave.atlas
new file mode 100644
index 00000000000..c39012865b3
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_cave.atlas
@@ -0,0 +1,89 @@
+spider_cave.png
+size: 256,192
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none          
+Avatar
+  xy: 170, 19
+  size: 13, 13    
+Idle 
+  xy: 6, 176
+  size: 20, 16 
+Idle 
+  xy: 38, 176
+  size: 20, 16 
+Idle 
+  xy: 70, 176
+  size: 20, 16 
+Idle 
+  xy: 102, 176
+  size: 20, 16 
+Idle 
+  xy: 6, 16
+  size: 20, 16
+Idle 
+  xy: 38, 16
+  size: 20, 16   
+Idle 
+  xy: 70, 16
+  size: 20, 16
+Idle 
+  xy: 102, 16
+  size: 20, 16   
+Idle 
+  xy: 134, 16
+  size: 20, 16
+Idle 
+  xy: 166, 16
+  size: 20, 16   
+Idle
+  xy: 198, 16
+  size: 20, 16
+Idle 
+  xy: 230, 16
+  size: 20, 16  
+Walk 
+  xy: 6, 48
+  size: 20, 16
+Walk 
+  xy: 38, 48
+  size: 20, 16   
+Walk 
+  xy: 70, 48
+  size: 20, 16
+Walk 
+  xy: 102, 48
+  size: 20, 16   
+Attack 
+  xy: 8, 16
+  size: 16, 16
+Attack 
+  xy: 40, 16
+  size: 16, 16   
+Attack 
+  xy: 72, 16
+  size: 16, 16
+Attack 
+  xy: 104, 16
+  size: 16, 16   
+Attack 
+  xy: 136, 16
+  size: 16, 16
+Attack 
+  xy: 168, 16
+  size: 16, 16   
+Attack 
+  xy: 200, 16
+  size: 16, 16
+Attack 
+  xy: 232, 16
+  size: 16, 16            
+Death 
+  xy: 8, 112
+  size: 16, 16    
+Death 
+  xy: 40, 112
+  size: 16, 16 
+Death 
+  xy: 72, 112
+  size: 16, 16      
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dog2.png b/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_cave.png
similarity index 70%
rename from forge-gui/res/adventure/Shandalar/sprites/dog2.png
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_cave.png
index f72fcb848dd..b8115b7dcd4 100644
Binary files a/forge-gui/res/adventure/Shandalar/sprites/dog2.png and b/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_cave.png differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/spider.atlas b/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_purple.atlas
similarity index 97%
rename from forge-gui/res/adventure/Shandalar/sprites/spider.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_purple.atlas
index 11e2c9dff74..8911c3a13e7 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/spider.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_purple.atlas
@@ -1,4 +1,4 @@
-spider.png
+spider_purple.png
 size: 64,96
 format: RGBA8888
 filter: Nearest,Nearest
diff --git a/forge-gui/res/adventure/Shandalar/sprites/spider_2.png b/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_purple.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/spider_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_purple.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_web.png b/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_web.png
new file mode 100644
index 00000000000..89de203d067
Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/arachnida/spider_web.png differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/wasp.atlas b/forge-gui/res/adventure/Shandalar/sprites/arachnida/wasp.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/wasp.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/wasp.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/wasp.png b/forge-gui/res/adventure/Shandalar/sprites/arachnida/wasp.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/wasp.png
rename to forge-gui/res/adventure/Shandalar/sprites/arachnida/wasp.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/artifactsoldier.atlas b/forge-gui/res/adventure/Shandalar/sprites/constructs/artifactsoldier.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/artifactsoldier.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/constructs/artifactsoldier.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/artifactsoldier.png b/forge-gui/res/adventure/Shandalar/sprites/constructs/artifactsoldier.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/artifactsoldier.png
rename to forge-gui/res/adventure/Shandalar/sprites/constructs/artifactsoldier.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/golem.atlas b/forge-gui/res/adventure/Shandalar/sprites/constructs/golem.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/golem.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/constructs/golem.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/golem.png b/forge-gui/res/adventure/Shandalar/sprites/constructs/golem.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/golem.png
rename to forge-gui/res/adventure/Shandalar/sprites/constructs/golem.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/golem_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/constructs/golem_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/golem_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/constructs/golem_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/golem_2.png b/forge-gui/res/adventure/Shandalar/sprites/constructs/golem_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/golem_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/constructs/golem_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/golem_3.atlas b/forge-gui/res/adventure/Shandalar/sprites/constructs/golem_3.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/golem_3.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/constructs/golem_3.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/golem_3.png b/forge-gui/res/adventure/Shandalar/sprites/constructs/golem_3.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/golem_3.png
rename to forge-gui/res/adventure/Shandalar/sprites/constructs/golem_3.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/ironcheffboss.png b/forge-gui/res/adventure/Shandalar/sprites/dungeon/ironcheffboss.png
deleted file mode 100644
index 6d7125a3493..00000000000
Binary files a/forge-gui/res/adventure/Shandalar/sprites/dungeon/ironcheffboss.png and /dev/null differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mimic.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/mimic.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mimic.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dungeon/mimic.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mimic.png b/forge-gui/res/adventure/Shandalar/sprites/dungeon/mimic.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mimic.png
rename to forge-gui/res/adventure/Shandalar/sprites/dungeon/mimic.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis1.png b/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis1.png
deleted file mode 100644
index fd04e785401..00000000000
Binary files a/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis1.png and /dev/null differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis2.png b/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis2.png
deleted file mode 100644
index fd04e785401..00000000000
Binary files a/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis2.png and /dev/null differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis3.png b/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis3.png
deleted file mode 100644
index fd04e785401..00000000000
Binary files a/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis3.png and /dev/null differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis4.png b/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis4.png
deleted file mode 100644
index fd04e785401..00000000000
Binary files a/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis4.png and /dev/null differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis5.png b/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis5.png
deleted file mode 100644
index fd04e785401..00000000000
Binary files a/forge-gui/res/adventure/Shandalar/sprites/dwarfpilotbis5.png and /dev/null differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/bear_cavalry.atlas b/forge-gui/res/adventure/Shandalar/sprites/dwarves/bear_cavalry.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/bear_cavalry.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/bear_cavalry.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/bear_cavalry.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/bear_cavalry.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/bear_cavalry.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/bear_cavalry.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/carver.atlas b/forge-gui/res/adventure/Shandalar/sprites/dwarves/carver.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/carver.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/carver.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/carver.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/carver.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/carver.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/carver.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf.atlas b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_2.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_3.atlas b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_3.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_3.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_3.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_3.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_3.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_3.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_3.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_4.atlas b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_4.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_4.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_4.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_4.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_4.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_4.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_4.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_5.atlas b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_5.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_5.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_5.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_5.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_5.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_5.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_5.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_6.atlas b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_6.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_6.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_6.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_6.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_6.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_6.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_6.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_7.atlas b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_7.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_7.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_7.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_7.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_7.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_7.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_7.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_8.atlas b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_8.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_8.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_8.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarf_8.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_8.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarf_8.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarf_8.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarfpilot.atlas b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarfpilot.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarfpilot.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarfpilot.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dwarfpilot.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarfpilot.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dwarfpilot.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/dwarfpilot.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/unused/Replaced/mineguard.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/mineguard.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/unused/Replaced/mineguard.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/mineguard.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/miner.atlas b/forge-gui/res/adventure/Shandalar/sprites/dwarves/miner.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/miner.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/miner.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/miner.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/miner.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/miner.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/miner.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/polar_cavalry.atlas b/forge-gui/res/adventure/Shandalar/sprites/dwarves/polar_cavalry.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/polar_cavalry.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/polar_cavalry.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/polar_cavalry.png b/forge-gui/res/adventure/Shandalar/sprites/dwarves/polar_cavalry.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/polar_cavalry.png
rename to forge-gui/res/adventure/Shandalar/sprites/dwarves/polar_cavalry.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/airelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/airelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/airelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/airelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/airelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/airelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/airelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/airelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cloudelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/cloudelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cloudelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/cloudelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cloudelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/cloudelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cloudelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/cloudelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/crystalelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/crystalelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/crystalelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/crystalelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/crystalelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/crystalelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/crystalelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/crystalelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/fireelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/fireelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/fireelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/fireelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/fireelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/fireelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/fireelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/fireelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/iceelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/iceelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/iceelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/iceelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/iceelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/iceelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/iceelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/iceelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lightningelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/lightningelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lightningelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/lightningelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lightningelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/lightningelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lightningelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/lightningelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/magicelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/magicelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/magicelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/magicelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/magicelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/magicelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/magicelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/magicelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/magmaelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/magmaelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/magmaelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/magmaelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/magmaelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/magmaelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/magmaelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/magmaelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/magmafireelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/magmafireelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/magmafireelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/magmafireelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/magmafireelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/magmafireelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/magmafireelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/magmafireelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mindelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/mindelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mindelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/mindelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mindelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/mindelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mindelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/mindelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/sandelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/sandelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/sandelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/sandelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/sandelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/sandelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/sandelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/sandelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/stoneelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/stoneelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/stoneelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/stoneelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/stoneelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/stoneelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/stoneelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/stoneelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/volcanoelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/volcanoelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/volcanoelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/volcanoelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/volcanoelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/volcanoelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/volcanoelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/volcanoelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/unused/Replaced/plant.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/walkingleef.atlas
similarity index 98%
rename from forge-gui/res/adventure/Shandalar/sprites/unused/Replaced/plant.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/walkingleef.atlas
index 9235bf53e29..906ce5972b9 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/unused/Replaced/plant.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/elementals/walkingleef.atlas
@@ -1,4 +1,4 @@
-plant.png
+walkingleef.png
 size: 224,384
 format: RGBA8888
 filter: Nearest,Nearest
diff --git a/forge-gui/res/adventure/Shandalar/sprites/unused/Replaced/plant.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/walkingleef.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/unused/Replaced/plant.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/walkingleef.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/waterelemental.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/waterelemental.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/waterelemental.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/waterelemental.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/waterelemental.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/waterelemental.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/waterelemental.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/waterelemental.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/waterelemental_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/elementals/waterelemental_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/waterelemental_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/waterelemental_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/waterelemental_2.png b/forge-gui/res/adventure/Shandalar/sprites/elementals/waterelemental_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/waterelemental_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/elementals/waterelemental_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/druid.atlas b/forge-gui/res/adventure/Shandalar/sprites/elves/druid.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/druid.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elves/druid.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/druid.png b/forge-gui/res/adventure/Shandalar/sprites/elves/druid.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/druid.png
rename to forge-gui/res/adventure/Shandalar/sprites/elves/druid.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/druid_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/elves/druid_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/druid_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elves/druid_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/druid_2.png b/forge-gui/res/adventure/Shandalar/sprites/elves/druid_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/druid_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/elves/druid_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/elf_golgari.atlas b/forge-gui/res/adventure/Shandalar/sprites/elves/elf_golgari.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/elf_golgari.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elves/elf_golgari.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/elf_golgari.png b/forge-gui/res/adventure/Shandalar/sprites/elves/elf_golgari.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/elf_golgari.png
rename to forge-gui/res/adventure/Shandalar/sprites/elves/elf_golgari.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/hunter.atlas b/forge-gui/res/adventure/Shandalar/sprites/elves/hunter.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/hunter.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elves/hunter.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/hunter.png b/forge-gui/res/adventure/Shandalar/sprites/elves/hunter.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/hunter.png
rename to forge-gui/res/adventure/Shandalar/sprites/elves/hunter.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/hunter_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/elves/hunter_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/hunter_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/elves/hunter_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/hunter_2.png b/forge-gui/res/adventure/Shandalar/sprites/elves/hunter_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/hunter_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/elves/hunter_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/unused/Requested/dimirfaerie.atlas b/forge-gui/res/adventure/Shandalar/sprites/faeries/dimirfaerie.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/unused/Requested/dimirfaerie.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/faeries/dimirfaerie.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/unused/Requested/dimirfaerie.png b/forge-gui/res/adventure/Shandalar/sprites/faeries/dimirfaerie.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/unused/Requested/dimirfaerie.png
rename to forge-gui/res/adventure/Shandalar/sprites/faeries/dimirfaerie.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pixie.atlas b/forge-gui/res/adventure/Shandalar/sprites/faeries/pixie.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pixie.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/faeries/pixie.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pixie.png b/forge-gui/res/adventure/Shandalar/sprites/faeries/pixie.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pixie.png
rename to forge-gui/res/adventure/Shandalar/sprites/faeries/pixie.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pixie_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/faeries/pixie_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pixie_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/faeries/pixie_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pixie_2.png b/forge-gui/res/adventure/Shandalar/sprites/faeries/pixie_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pixie_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/faeries/pixie_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pixie_dimir.atlas b/forge-gui/res/adventure/Shandalar/sprites/faeries/pixie_dimir.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pixie_dimir.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/faeries/pixie_dimir.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pixie_dimir.png b/forge-gui/res/adventure/Shandalar/sprites/faeries/pixie_dimir.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pixie_dimir.png
rename to forge-gui/res/adventure/Shandalar/sprites/faeries/pixie_dimir.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/ascendedtitan.atlas b/forge-gui/res/adventure/Shandalar/sprites/giants/ascendedtitan.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/ascendedtitan.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/giants/ascendedtitan.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/ascendedtitan.png b/forge-gui/res/adventure/Shandalar/sprites/giants/ascendedtitan.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/ascendedtitan.png
rename to forge-gui/res/adventure/Shandalar/sprites/giants/ascendedtitan.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/firegiant.atlas b/forge-gui/res/adventure/Shandalar/sprites/giants/firegiant.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/firegiant.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/giants/firegiant.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/firegiant.png b/forge-gui/res/adventure/Shandalar/sprites/giants/firegiant.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/firegiant.png
rename to forge-gui/res/adventure/Shandalar/sprites/giants/firegiant.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/forestgiant.atlas b/forge-gui/res/adventure/Shandalar/sprites/giants/forestgiant.atlas
similarity index 93%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/forestgiant.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/giants/forestgiant.atlas
index 1ca3900d4a9..b4deeca4d82 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/dungeon/forestgiant.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/giants/forestgiant.atlas
@@ -1,4 +1,4 @@
-foresttitan.png
+forestgiant.png
 size: 64,16
 format: RGBA8888
 filter: Nearest,Nearest
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/foresttitan.png b/forge-gui/res/adventure/Shandalar/sprites/giants/forestgiant.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/foresttitan.png
rename to forge-gui/res/adventure/Shandalar/sprites/giants/forestgiant.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/godlytitan.atlas b/forge-gui/res/adventure/Shandalar/sprites/giants/godlytitan.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/godlytitan.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/giants/godlytitan.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/godlytitan.png b/forge-gui/res/adventure/Shandalar/sprites/giants/godlytitan.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/godlytitan.png
rename to forge-gui/res/adventure/Shandalar/sprites/giants/godlytitan.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/gravetitan.atlas b/forge-gui/res/adventure/Shandalar/sprites/giants/gravetitan.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/gravetitan.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/giants/gravetitan.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/gravetitan.png b/forge-gui/res/adventure/Shandalar/sprites/giants/gravetitan.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/gravetitan.png
rename to forge-gui/res/adventure/Shandalar/sprites/giants/gravetitan.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/stormtitan.atlas b/forge-gui/res/adventure/Shandalar/sprites/giants/stormtitan.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/stormtitan.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/giants/stormtitan.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/stormtitan.png b/forge-gui/res/adventure/Shandalar/sprites/giants/stormtitan.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/stormtitan.png
rename to forge-gui/res/adventure/Shandalar/sprites/giants/stormtitan.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/titan.atlas b/forge-gui/res/adventure/Shandalar/sprites/giants/titan.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/titan.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/giants/titan.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/titan.png b/forge-gui/res/adventure/Shandalar/sprites/giants/titan.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/titan.png
rename to forge-gui/res/adventure/Shandalar/sprites/giants/titan.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/titan_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/giants/titan_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/titan_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/giants/titan_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/titan_2.png b/forge-gui/res/adventure/Shandalar/sprites/giants/titan_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/titan_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/giants/titan_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/goblin.atlas b/forge-gui/res/adventure/Shandalar/sprites/goblins/goblin.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/goblin.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/goblins/goblin.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/goblin.png b/forge-gui/res/adventure/Shandalar/sprites/goblins/goblin.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/goblin.png
rename to forge-gui/res/adventure/Shandalar/sprites/goblins/goblin.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/goblin_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/goblins/goblin_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/goblin_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/goblins/goblin_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/goblin_2.png b/forge-gui/res/adventure/Shandalar/sprites/goblins/goblin_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/goblin_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/goblins/goblin_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/goblin_3.atlas b/forge-gui/res/adventure/Shandalar/sprites/goblins/goblin_3.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/goblin_3.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/goblins/goblin_3.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/goblin_3.png b/forge-gui/res/adventure/Shandalar/sprites/goblins/goblin_3.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/goblin_3.png
rename to forge-gui/res/adventure/Shandalar/sprites/goblins/goblin_3.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/goblin_group.atlas b/forge-gui/res/adventure/Shandalar/sprites/goblins/goblin_group.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/goblin_group.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/goblins/goblin_group.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/goblin_group.png b/forge-gui/res/adventure/Shandalar/sprites/goblins/goblin_group.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/goblin_group.png
rename to forge-gui/res/adventure/Shandalar/sprites/goblins/goblin_group.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/wolf_rider.atlas b/forge-gui/res/adventure/Shandalar/sprites/goblins/wolf_rider.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/wolf_rider.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/goblins/wolf_rider.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/wolf_rider.png b/forge-gui/res/adventure/Shandalar/sprites/goblins/wolf_rider.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/wolf_rider.png
rename to forge-gui/res/adventure/Shandalar/sprites/goblins/wolf_rider.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/wolf_rider_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/goblins/wolf_rider_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/wolf_rider_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/goblins/wolf_rider_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/wolf_rider_2.png b/forge-gui/res/adventure/Shandalar/sprites/goblins/wolf_rider_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/wolf_rider_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/goblins/wolf_rider_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/angelwarrior.atlas b/forge-gui/res/adventure/Shandalar/sprites/holy/angelwarrior.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/angelwarrior.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/holy/angelwarrior.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/angelwarrior.png b/forge-gui/res/adventure/Shandalar/sprites/holy/angelwarrior.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/angelwarrior.png
rename to forge-gui/res/adventure/Shandalar/sprites/holy/angelwarrior.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cleric.atlas b/forge-gui/res/adventure/Shandalar/sprites/holy/cleric.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cleric.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/holy/cleric.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cleric.png b/forge-gui/res/adventure/Shandalar/sprites/holy/cleric.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cleric.png
rename to forge-gui/res/adventure/Shandalar/sprites/holy/cleric.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cleric_orzhov.atlas b/forge-gui/res/adventure/Shandalar/sprites/holy/cleric_orzhov.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cleric_orzhov.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/holy/cleric_orzhov.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cleric_orzhov.png b/forge-gui/res/adventure/Shandalar/sprites/holy/cleric_orzhov.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cleric_orzhov.png
rename to forge-gui/res/adventure/Shandalar/sprites/holy/cleric_orzhov.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/knight.atlas b/forge-gui/res/adventure/Shandalar/sprites/holy/knight.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/knight.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/holy/knight.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/knight.png b/forge-gui/res/adventure/Shandalar/sprites/holy/knight.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/knight.png
rename to forge-gui/res/adventure/Shandalar/sprites/holy/knight.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/monk.atlas b/forge-gui/res/adventure/Shandalar/sprites/holy/monk.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/monk.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/holy/monk.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/monk.png b/forge-gui/res/adventure/Shandalar/sprites/holy/monk.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/monk.png
rename to forge-gui/res/adventure/Shandalar/sprites/holy/monk.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/monk_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/holy/monk_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/monk_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/holy/monk_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/monk_2.png b/forge-gui/res/adventure/Shandalar/sprites/holy/monk_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/monk_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/holy/monk_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/monk_3.atlas b/forge-gui/res/adventure/Shandalar/sprites/holy/monk_3.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/monk_3.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/holy/monk_3.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/monk_3.png b/forge-gui/res/adventure/Shandalar/sprites/holy/monk_3.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/monk_3.png
rename to forge-gui/res/adventure/Shandalar/sprites/holy/monk_3.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/paladin.atlas b/forge-gui/res/adventure/Shandalar/sprites/holy/paladin.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/paladin.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/holy/paladin.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/paladin.png b/forge-gui/res/adventure/Shandalar/sprites/holy/paladin.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/paladin.png
rename to forge-gui/res/adventure/Shandalar/sprites/holy/paladin.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/paladin_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/holy/paladin_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/paladin_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/holy/paladin_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/paladin_2.png b/forge-gui/res/adventure/Shandalar/sprites/holy/paladin_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/paladin_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/holy/paladin_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/priest.atlas b/forge-gui/res/adventure/Shandalar/sprites/holy/priest.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/priest.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/holy/priest.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/priest.png b/forge-gui/res/adventure/Shandalar/sprites/holy/priest.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/priest.png
rename to forge-gui/res/adventure/Shandalar/sprites/holy/priest.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/antlered_elite.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/antlered_elite.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/antlered_elite.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/antlered_elite.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/antlered_elite.png b/forge-gui/res/adventure/Shandalar/sprites/humans/antlered_elite.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/antlered_elite.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/antlered_elite.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/archaeologist.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/archaeologist.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/archaeologist.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/archaeologist.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/archaeologist.png b/forge-gui/res/adventure/Shandalar/sprites/humans/archaeologist.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/archaeologist.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/archaeologist.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/archer.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/archer.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/archer.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/archer.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/archer.png b/forge-gui/res/adventure/Shandalar/sprites/humans/archer.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/archer.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/archer.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/archer_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/archer_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/archer_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/archer_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/archer_2.png b/forge-gui/res/adventure/Shandalar/sprites/humans/archer_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/archer_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/archer_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/barbarian.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/barbarian.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/barbarian.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/barbarian.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/barbarian.png b/forge-gui/res/adventure/Shandalar/sprites/humans/barbarian.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/barbarian.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/barbarian.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/bearguard.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/bearguard.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/bearguard.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/bearguard.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/bearguard.png b/forge-gui/res/adventure/Shandalar/sprites/humans/bearguard.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/bearguard.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/bearguard.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/bowmandefender.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/bowmandefender.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/bowmandefender.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/bowmandefender.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/bowmandefender.png b/forge-gui/res/adventure/Shandalar/sprites/humans/bowmandefender.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/bowmandefender.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/bowmandefender.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/calibou_elite.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/calibou_elite.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/calibou_elite.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/calibou_elite.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/calibou_elite.png b/forge-gui/res/adventure/Shandalar/sprites/humans/calibou_elite.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/calibou_elite.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/calibou_elite.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cathar.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/cathar.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cathar.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/cathar.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cathar.png b/forge-gui/res/adventure/Shandalar/sprites/humans/cathar.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cathar.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/cathar.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cavalier.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/cavalier.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cavalier.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/cavalier.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cavalier.png b/forge-gui/res/adventure/Shandalar/sprites/humans/cavalier.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cavalier.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/cavalier.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cavalier_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/cavalier_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cavalier_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/cavalier_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cavalier_2.png b/forge-gui/res/adventure/Shandalar/sprites/humans/cavalier_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cavalier_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/cavalier_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/farmer.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/farmer.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/farmer.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/farmer.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/farmer.png b/forge-gui/res/adventure/Shandalar/sprites/humans/farmer.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/farmer.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/farmer.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/gladiator.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/gladiator.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/gladiator.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/gladiator.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/gladiator.png b/forge-gui/res/adventure/Shandalar/sprites/humans/gladiator.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/gladiator.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/gladiator.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/hoplite.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/hoplite.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/hoplite.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/hoplite.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/hoplite.png b/forge-gui/res/adventure/Shandalar/sprites/humans/hoplite.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/hoplite.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/hoplite.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/legionite.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/legionite.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/legionite.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/legionite.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/legionite.png b/forge-gui/res/adventure/Shandalar/sprites/humans/legionite.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/legionite.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/legionite.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pikeman.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/pikeman.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pikeman.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/pikeman.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pikeman.png b/forge-gui/res/adventure/Shandalar/sprites/humans/pikeman.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pikeman.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/pikeman.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pikeman_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/pikeman_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pikeman_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/pikeman_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pikeman_2.png b/forge-gui/res/adventure/Shandalar/sprites/humans/pikeman_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pikeman_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/pikeman_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pirate.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/pirate.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pirate.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/pirate.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pirate.png b/forge-gui/res/adventure/Shandalar/sprites/humans/pirate.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pirate.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/pirate.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/rogue.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/rogue.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/rogue.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/rogue.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/rogue.png b/forge-gui/res/adventure/Shandalar/sprites/humans/rogue.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/rogue.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/rogue.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/swordsman.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/swordsman.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/swordsman.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/swordsman.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/swordsman.png b/forge-gui/res/adventure/Shandalar/sprites/humans/swordsman.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/swordsman.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/swordsman.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/swordsman_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/swordsman_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/swordsman_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/swordsman_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/swordsman_2.png b/forge-gui/res/adventure/Shandalar/sprites/humans/swordsman_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/swordsman_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/swordsman_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/swordsman_3.atlas b/forge-gui/res/adventure/Shandalar/sprites/humans/swordsman_3.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/swordsman_3.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/humans/swordsman_3.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/swordsman_3.png b/forge-gui/res/adventure/Shandalar/sprites/humans/swordsman_3.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/swordsman_3.png
rename to forge-gui/res/adventure/Shandalar/sprites/humans/swordsman_3.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobold.atlas b/forge-gui/res/adventure/Shandalar/sprites/kobolds/kobolddragoncaller.atlas
similarity index 95%
rename from forge-gui/res/adventure/Shandalar/sprites/kobold.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/kobolds/kobolddragoncaller.atlas
index bc343e31c26..0508aa0b104 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/kobold.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/kobolds/kobolddragoncaller.atlas
@@ -1,11 +1,11 @@
-kobold.png
+kobolddragoncaller.png
 size: 256,192
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none          
 Avatar
-  xy: 103, 75
-  size: 16, 16     
+  xy: 140, 44
+  size: 14, 14     
 Idle 
   xy: 0, 0
   size: 32, 32   
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobold.png b/forge-gui/res/adventure/Shandalar/sprites/kobolds/kobolddragoncaller.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/kobold.png
rename to forge-gui/res/adventure/Shandalar/sprites/kobolds/kobolddragoncaller.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldpyromancer.atlas b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldpyromancer.atlas
new file mode 100644
index 00000000000..92e670ca60f
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldpyromancer.atlas
@@ -0,0 +1,161 @@
+koboldpyromancer.png
+size: 256,256
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none          
+Avatar
+  xy: 16, 173
+  size: 14, 14     
+Idle 
+  xy: 0, 12
+  size: 32,20 
+Idle 
+  xy: 32, 12
+  size: 32,20   
+Idle 
+  xy: 64, 12
+  size: 32,20 
+Idle 
+  xy: 96, 12
+  size: 32,20 
+Idle 
+  xy: 0, 44
+  size: 32,20 
+Idle 
+  xy: 32, 44
+  size: 32,20   
+Idle 
+  xy: 64, 44
+  size: 32,20 
+Idle 
+  xy: 96, 44
+  size: 32,20  
+Idle 
+  xy: 128, 44
+  size: 32,20 
+Idle 
+  xy: 160, 44
+  size: 32,20   
+Idle 
+  xy: 192, 44
+  size: 32,20 
+Idle 
+  xy: 224, 44
+  size: 32,20
+Idle 
+  xy: 0, 108
+  size: 32,20 
+Idle 
+  xy: 32, 108
+  size: 32,20   
+Idle 
+  xy: 64, 108
+  size: 32,20 
+Idle 
+  xy: 96, 108
+  size: 32,20  
+Idle 
+  xy: 128, 108
+  size: 32,20 
+Idle 
+  xy: 160, 108
+  size: 32,20   
+Idle 
+  xy: 192, 108
+  size: 32,20 
+Idle 
+  xy: 224, 108
+  size: 32,20
+Idle 
+  xy: 0, 140
+  size: 32,20 
+Idle 
+  xy: 32, 140
+  size: 32,20   
+Idle 
+  xy: 64, 140
+  size: 32,20 
+Idle 
+  xy: 96, 140
+  size: 32,20  
+Idle 
+  xy: 128, 140
+  size: 32,20 
+Idle 
+  xy: 160, 140
+  size: 32,20   
+Idle 
+  xy: 192, 140
+  size: 32,20 
+Idle 
+  xy: 224, 140
+  size: 32,20
+Idle 
+  xy: 0, 204
+  size: 32,20 
+Idle 
+  xy: 32, 204
+  size: 32,20   
+Idle 
+  xy: 64, 204
+  size: 32,20 
+Idle 
+  xy: 96, 204
+  size: 32,20  
+Walk
+  xy: 0, 76
+  size: 32, 20      
+Walk
+  xy: 32, 76
+  size: 32, 20      
+Walk
+  xy: 64, 76
+  size: 32, 20      
+Walk
+  xy: 96, 76
+  size: 32, 20      
+Walk
+  xy: 128, 76
+  size: 32, 20      
+Walk
+  xy: 160, 76
+  size: 32, 20      
+Walk
+  xy: 192, 76
+  size: 32, 20      
+Walk
+  xy: 224, 76
+  size: 32, 20      
+Attack 
+  xy: 2, 170
+  size: 55, 21 
+Attack 
+  xy: 66, 170
+  size: 55, 21
+Attack 
+  xy: 130, 170
+  size: 55, 21
+Attack 
+  xy: 194, 170
+  size: 55, 21
+Death 
+  xy: 0, 236
+  size: 32, 20
+Death 
+  xy: 32, 236
+  size: 32, 20
+Death 
+  xy: 64, 236
+  size: 32, 20
+Death 
+  xy: 96, 236
+  size: 32, 20 
+Death 
+  xy: 128, 236
+  size: 32, 20
+Death 
+  xy: 160, 236
+  size: 32, 20 
+Death 
+  xy: 192, 236
+  size: 32, 20
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldpyromancer.png b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldpyromancer.png
new file mode 100644
index 00000000000..0648f2560f5
Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldpyromancer.png differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldshaman.atlas b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldshaman.atlas
new file mode 100644
index 00000000000..a8097abf996
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldshaman.atlas
@@ -0,0 +1,113 @@
+koboldshaman.png
+size: 256,288
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none          
+Avatar
+  xy: 142, 110
+  size: 14, 14     
+Idle 
+  xy: 0, 12
+  size: 32, 20   
+Idle 
+  xy: 32, 12
+  size: 32, 20   
+Idle 
+  xy: 64, 12
+  size: 32, 20  
+Idle 
+  xy: 96, 12
+  size: 32, 20
+Idle 
+  xy: 128, 12
+  size: 32, 20   
+Idle 
+  xy: 160, 12
+  size: 32, 20  
+Idle 
+  xy: 192, 12
+  size: 32, 20
+Idle 
+  xy: 224, 12
+  size: 32, 20
+Idle 
+  xy: 0, 108
+  size: 32, 20   
+Idle 
+  xy: 32, 108
+  size: 32, 20
+Idle 
+  xy: 64, 108
+  size: 32, 20 
+Idle 
+  xy: 96, 108
+  size: 32, 20
+Walk
+  xy: 0,42
+  size: 32, 22   
+Walk
+  xy: 32, 42
+  size: 32, 22      
+Walk
+  xy: 64, 42
+  size: 32, 22      
+Walk
+  xy: 96, 42
+  size: 32, 22      
+Walk
+  xy: 128, 42
+  size: 32, 22      
+Walk
+  xy: 160, 42
+  size: 32, 22      
+Walk
+  xy: 192, 42
+  size: 32, 22      
+Walk
+  xy: 224, 42
+  size: 32, 22      
+Attack 
+  xy: 0, 76
+  size: 32, 20  
+Attack 
+  xy: 32, 76
+  size: 32, 20  
+Attack 
+  xy: 64, 76
+  size: 32, 20  
+Attack 
+  xy: 96, 76
+  size: 32, 20  
+Attack 
+  xy: 128, 76
+  size: 32, 20  
+Attack 
+  xy: 160, 76
+  size: 32, 20  
+Attack 
+  xy: 192, 76
+  size: 32, 20  
+Attack 
+  xy: 224, 76
+  size: 32, 20           
+Death 
+  xy: 0, 128
+  size: 32, 32  
+Death 
+  xy: 32, 128
+  size: 32, 32  
+Death 
+  xy: 64, 128
+  size: 32, 32  
+Death 
+  xy: 96, 128
+  size: 32, 32  
+Death 
+  xy: 128, 128
+  size: 32, 32  
+Death 
+  xy: 160, 128
+  size: 32, 32  
+Death 
+  xy: 192, 128
+  size: 32, 32  
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldshaman.png b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldshaman.png
new file mode 100644
index 00000000000..ab32f790ac5
Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldshaman.png differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldslinger.atlas b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldslinger.atlas
new file mode 100644
index 00000000000..a8097abf996
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldslinger.atlas
@@ -0,0 +1,113 @@
+koboldshaman.png
+size: 256,288
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none          
+Avatar
+  xy: 142, 110
+  size: 14, 14     
+Idle 
+  xy: 0, 12
+  size: 32, 20   
+Idle 
+  xy: 32, 12
+  size: 32, 20   
+Idle 
+  xy: 64, 12
+  size: 32, 20  
+Idle 
+  xy: 96, 12
+  size: 32, 20
+Idle 
+  xy: 128, 12
+  size: 32, 20   
+Idle 
+  xy: 160, 12
+  size: 32, 20  
+Idle 
+  xy: 192, 12
+  size: 32, 20
+Idle 
+  xy: 224, 12
+  size: 32, 20
+Idle 
+  xy: 0, 108
+  size: 32, 20   
+Idle 
+  xy: 32, 108
+  size: 32, 20
+Idle 
+  xy: 64, 108
+  size: 32, 20 
+Idle 
+  xy: 96, 108
+  size: 32, 20
+Walk
+  xy: 0,42
+  size: 32, 22   
+Walk
+  xy: 32, 42
+  size: 32, 22      
+Walk
+  xy: 64, 42
+  size: 32, 22      
+Walk
+  xy: 96, 42
+  size: 32, 22      
+Walk
+  xy: 128, 42
+  size: 32, 22      
+Walk
+  xy: 160, 42
+  size: 32, 22      
+Walk
+  xy: 192, 42
+  size: 32, 22      
+Walk
+  xy: 224, 42
+  size: 32, 22      
+Attack 
+  xy: 0, 76
+  size: 32, 20  
+Attack 
+  xy: 32, 76
+  size: 32, 20  
+Attack 
+  xy: 64, 76
+  size: 32, 20  
+Attack 
+  xy: 96, 76
+  size: 32, 20  
+Attack 
+  xy: 128, 76
+  size: 32, 20  
+Attack 
+  xy: 160, 76
+  size: 32, 20  
+Attack 
+  xy: 192, 76
+  size: 32, 20  
+Attack 
+  xy: 224, 76
+  size: 32, 20           
+Death 
+  xy: 0, 128
+  size: 32, 32  
+Death 
+  xy: 32, 128
+  size: 32, 32  
+Death 
+  xy: 64, 128
+  size: 32, 32  
+Death 
+  xy: 96, 128
+  size: 32, 32  
+Death 
+  xy: 128, 128
+  size: 32, 32  
+Death 
+  xy: 160, 128
+  size: 32, 32  
+Death 
+  xy: 192, 128
+  size: 32, 32  
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldslinger.png b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldslinger.png
new file mode 100644
index 00000000000..0ac6c39f4b4
Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldslinger.png differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldtrapmaster.atlas b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldtrapmaster.atlas
new file mode 100644
index 00000000000..66e4b18dadf
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldtrapmaster.atlas
@@ -0,0 +1,101 @@
+koboldtrapmaster.png
+size: 256,448
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none          
+Avatar
+  xy: 103, 75
+  size: 16, 16     
+Idle 
+  xy: 7, 82
+  size: 21, 23   
+Idle 
+  xy: 39, 82
+  size: 21, 23   
+Idle 
+  xy: 71, 82
+  size: 21, 23    
+Idle 
+  xy: 103, 82
+  size: 21, 23    
+Idle 
+  xy: 135, 82
+  size: 21, 23   
+Idle 
+  xy: 167, 82
+  size: 21, 23   
+Idle 
+  xy: 199, 82
+  size: 21, 23    
+Idle 
+  xy: 231, 82
+  size: 21, 23    
+Walk
+  xy: 0, 32
+  size: 32, 32      
+Walk
+  xy: 32, 32
+  size: 32, 32      
+Walk
+  xy: 64, 32
+  size: 32, 32      
+Walk
+  xy: 96, 32
+  size: 32, 32      
+Walk
+  xy: 128, 32
+  size: 32, 32      
+Walk
+  xy: 160, 32
+  size: 32, 32      
+Walk
+  xy: 192, 32
+  size: 32, 32      
+Walk
+  xy: 224, 32
+  size: 32, 32      
+Attack 
+  xy: 0, 64
+  size: 32, 32  
+Attack 
+  xy: 32, 64
+  size: 32, 32  
+Attack 
+  xy: 64, 64
+  size: 32, 32  
+Attack 
+  xy: 96, 64
+  size: 32, 32  
+Attack 
+  xy: 128, 64
+  size: 32, 32  
+Attack 
+  xy: 160, 64
+  size: 32, 32  
+Attack 
+  xy: 192, 64
+  size: 32, 32  
+Attack 
+  xy: 224, 64
+  size: 32, 32           
+Death 
+  xy: 0, 128
+  size: 32, 32  
+Death 
+  xy: 32, 128
+  size: 32, 32  
+Death 
+  xy: 64, 128
+  size: 32, 32  
+Death 
+  xy: 96, 128
+  size: 32, 32  
+Death 
+  xy: 128, 128
+  size: 32, 32  
+Death 
+  xy: 160, 128
+  size: 32, 32  
+Death 
+  xy: 192, 128
+  size: 32, 32  
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldtrapmaster.png b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldtrapmaster.png
new file mode 100644
index 00000000000..612165aecb3
Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldtrapmaster.png differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldwarrior.atlas b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldwarrior.atlas
new file mode 100644
index 00000000000..6db5b6b33e4
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldwarrior.atlas
@@ -0,0 +1,119 @@
+koboldwarrior.png
+size: 512,224
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none          
+Avatar
+  xy: 152, 74
+  size: 14, 14     
+Idle 
+  xy: 16, 4
+  size: 25, 28
+Idle 
+  xy: 83, 4
+  size: 25, 28 
+Idle 
+  xy: 147, 4
+  size: 25, 28
+Idle 
+  xy: 211, 4
+  size: 25, 28
+Idle 
+  xy: 275, 4
+  size: 25, 28
+Idle 
+  xy: 19, 68
+  size: 25, 28
+Idle 
+  xy: 83, 68
+  size: 25, 28 
+Idle 
+  xy: 147, 68
+  size: 25, 28
+Idle 
+  xy: 211, 68
+  size: 25, 28
+Idle 
+  xy: 275, 68
+  size: 25, 28
+Idle 
+  xy: 339, 68
+  size: 25, 28
+Idle 
+  xy: 19, 132
+  size: 25, 28
+Idle 
+  xy: 83, 132
+  size: 25, 28 
+Idle 
+  xy: 147, 132
+  size: 25, 28
+Idle 
+  xy: 211, 132
+  size: 25, 28
+Idle 
+  xy: 275, 132
+  size: 25, 28
+Idle 
+  xy: 339, 132
+  size: 25, 28
+Walk 
+  xy: 19, 40
+  size: 25, 25
+Walk 
+  xy: 83, 40
+  size: 25, 25
+Walk
+  xy: 147, 40
+  size: 25, 25      
+Walk
+  xy: 211, 40
+  size: 25, 25      
+Walk
+  xy: 275, 40
+  size: 25, 25   
+Walk
+  xy: 339, 40
+  size: 25, 25     
+Walk
+  xy: 403, 40
+  size: 25, 25      
+Walk
+  xy: 467, 40
+  size: 25, 25            
+Attack 
+  xy: 18, 107
+  size: 35, 22  
+Attack 
+  xy: 82, 107
+  size: 35, 22  
+Attack 
+  xy: 146, 107
+  size: 35, 22  
+Attack 
+  xy: 210, 107
+  size: 35, 22  
+Attack 
+  xy: 274, 107
+  size: 35, 22   
+Attack 
+  xy: 338, 107
+  size: 35, 22           
+Death 
+  xy: 23,200
+  size: 30, 24  
+Death 
+  xy: 87,200
+  size: 30, 24  
+Death 
+  xy: 151,200
+  size: 30, 24  
+Death 
+  xy: 215,200
+  size: 30, 24  
+Death 
+  xy: 279,200
+  size: 30, 24  
+Death 
+  xy: 343,200
+  size: 30, 24  
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldwarrior.png b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldwarrior.png
new file mode 100644
index 00000000000..4ccc24a03a6
Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldwarrior.png differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldworker.atlas b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldworker.atlas
new file mode 100644
index 00000000000..66df5dfd49b
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldworker.atlas
@@ -0,0 +1,92 @@
+koboldworker.png
+size: 256,192
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none          
+Avatar
+  xy: 12, 109
+  size: 14, 14     
+Idle 
+  xy: 6, 12
+  size: 20, 20   
+Idle 
+  xy: 38, 12
+  size: 20, 20   
+Idle 
+  xy: 70, 12
+  size: 20, 20   
+Idle 
+  xy: 102, 12
+  size: 20, 20   
+Idle 
+  xy: 134, 12
+  size: 20, 20     
+Idle 
+  xy: 6, 140
+  size: 20, 20   
+Idle 
+  xy: 38, 140
+  size: 20, 20   
+Idle 
+  xy: 70, 140
+  size: 20, 20   
+Idle 
+  xy: 102, 140
+  size: 20, 20     
+Walk
+  xy: 6, 42
+  size: 22, 22      
+Walk
+  xy: 38, 42
+  size: 22, 22     
+Walk
+  xy: 70, 42
+  size: 22, 22     
+Walk
+  xy: 102, 42
+  size: 22, 22      
+Walk
+  xy: 134, 42
+  size: 22, 22      
+Walk
+  xy: 166, 42
+  size: 22, 22      
+Walk
+  xy: 198, 42
+  size: 22, 22      
+Walk
+  xy: 224, 32
+  size: 32, 32      
+Attack 
+  xy: 6, 74
+  size: 22, 22  
+Attack 
+  xy: 38, 74
+  size: 22, 22  
+Attack 
+  xy: 70, 74
+  size: 22, 22  
+Attack 
+  xy: 102, 74
+  size: 22, 22          
+Death 
+  xy: 0, 170
+  size: 32, 22  
+Death 
+  xy: 32, 170
+  size: 32, 22  
+Death 
+  xy: 64, 170
+  size: 32, 22    
+Death 
+  xy: 96, 170
+  size: 32, 22   
+Death 
+  xy: 128, 170
+  size: 32, 22  
+Death 
+  xy: 160, 170
+  size: 32, 22  
+Death 
+  xy: 192, 170
+  size: 32, 22   
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldworker.png b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldworker.png
new file mode 100644
index 00000000000..5cf4b9f62e3
Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/kobolds/koboldworker.png differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mineguard.atlas b/forge-gui/res/adventure/Shandalar/sprites/kor/mineguard.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mineguard.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/kor/mineguard.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mineguard.png b/forge-gui/res/adventure/Shandalar/sprites/kor/mineguard.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mineguard.png
rename to forge-gui/res/adventure/Shandalar/sprites/kor/mineguard.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lion.atlas b/forge-gui/res/adventure/Shandalar/sprites/leonin/lion.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lion.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/leonin/lion.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lion.png b/forge-gui/res/adventure/Shandalar/sprites/leonin/lion.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lion.png
rename to forge-gui/res/adventure/Shandalar/sprites/leonin/lion.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lion_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/leonin/lion_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lion_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/leonin/lion_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lion_2.png b/forge-gui/res/adventure/Shandalar/sprites/leonin/lion_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lion_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/leonin/lion_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ancient.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/ancient.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ancient.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/ancient.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ancient.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/ancient.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ancient.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/ancient.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ancient_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/ancient_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ancient_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/ancient_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ancient_2.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/ancient_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ancient_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/ancient_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/basilisk.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/basilisk.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/basilisk.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/basilisk.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/basilisk.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/basilisk.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/basilisk.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/basilisk.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/basilisk_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/basilisk_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/basilisk_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/basilisk_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/basilisk_2.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/basilisk_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/basilisk_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/basilisk_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/basilisk_3.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/basilisk_3.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/basilisk_3.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/basilisk_3.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/basilisk_3.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/basilisk_3.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/basilisk_3.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/basilisk_3.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/battler.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/battler.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/battler.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/battler.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/battler.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/battler.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/battler.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/battler.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/battler_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/battler_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/battler_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/battler_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/battler_2.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/battler_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/battler_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/battler_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/big_snake.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/big_snake.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/big_snake.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/big_snake.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/big_snake.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/big_snake.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/big_snake.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/big_snake.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/big_snake_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/big_snake_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/big_snake_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/big_snake_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/big_snake_2.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/big_snake_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/big_snake_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/big_snake_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dreamwalker.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/dreamwalker.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dreamwalker.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/dreamwalker.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dreamwalker.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/dreamwalker.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dreamwalker.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/dreamwalker.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dreamwalker_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/dreamwalker_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dreamwalker_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/dreamwalker_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dreamwalker_2.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/dreamwalker_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dreamwalker_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/dreamwalker_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lizardrider.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/lizardrider.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lizardrider.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/lizardrider.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lizardrider.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/lizardrider.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lizardrider.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/lizardrider.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lizardrider_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/lizardrider_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lizardrider_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/lizardrider_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lizardrider_2.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/lizardrider_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lizardrider_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/lizardrider_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lizards/lizardwizard.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/lizardwizard.atlas
new file mode 100644
index 00000000000..46f177da33c
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/sprites/lizards/lizardwizard.atlas
@@ -0,0 +1,131 @@
+lizardwizard.png
+size: 512,384
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none          
+Avatar
+  xy: 90, 18
+  size: 16, 16      
+Idle 
+  xy: 12, 18
+  size: 36, 25      
+Idle 
+  xy: 76, 18
+  size: 36, 25    
+Idle 
+  xy: 140, 18
+  size: 36, 25    
+Idle 
+  xy: 204, 18
+  size: 36, 25       
+Idle 
+  xy: 268, 18
+  size: 36, 25      
+Idle 
+  xy: 332, 18
+  size: 36, 25    
+Idle 
+  xy: 396, 18
+  size: 36, 25    
+Idle 
+  xy: 460, 18
+  size: 36, 25   
+Idle 
+  xy: 12, 146
+  size: 36, 25      
+Idle 
+  xy: 76, 146
+  size: 36, 25    
+Idle 
+  xy: 140, 146
+  size: 36, 25    
+Idle 
+  xy: 204, 146
+  size: 36, 25       
+Idle 
+  xy: 268, 146
+  size: 36, 25      
+Idle 
+  xy: 332, 146
+  size: 36, 25    
+Idle 
+  xy: 396, 146
+  size: 36, 25  
+Idle 
+  xy: 12, 274
+  size: 36, 25      
+Idle 
+  xy: 76, 274
+  size: 36, 25    
+Idle 
+  xy: 140, 274
+  size: 36, 25    
+Idle 
+  xy: 204, 274
+  size: 36, 25       
+Idle 
+  xy: 268, 274
+  size: 36, 25   
+Walk
+  xy: 16, 82
+  size: 35, 25   
+Walk 
+  xy: 80, 82
+  size: 35, 25  
+Walk 
+  xy: 144, 82
+  size: 35, 25  
+Walk 
+  xy: 208, 82
+  size: 35, 25      
+Walk
+  xy: 272, 82
+  size: 35, 25   
+Walk 
+  xy: 336, 82
+  size: 35, 25  
+Walk 
+  xy: 400, 82
+  size: 35, 25  
+Walk 
+  xy: 464, 82
+  size: 35, 25  
+Attack 
+  xy: 16, 210
+  size: 40, 25  
+Attack 
+  xy: 80, 210
+  size: 40, 25  
+Attack 
+  xy: 144, 210
+  size: 40, 25  
+Attack 
+  xy: 208, 210
+  size: 40, 25    
+Attack 
+  xy: 272, 210
+  size: 40, 25         
+Attack 
+  xy: 336, 210
+  size: 40, 25   
+Attack 
+  xy: 400, 210
+  size: 40, 25   
+Attack 
+  xy: 464, 210
+  size: 40, 25       
+Death 
+  xy: 12, 337
+  size: 40, 26      
+Death 
+  xy: 78, 337
+  size: 40, 26  
+Death 
+  xy: 142, 337
+  size: 40, 26  
+Death 
+  xy: 206, 337
+  size: 40, 26  
+Death 
+  xy: 270, 337
+  size: 40, 26  
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lizards/lizardwizard.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/lizardwizard.png
new file mode 100644
index 00000000000..9017bbf9770
Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/sprites/lizards/lizardwizard.png differ
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pikelizard.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/pikelizard.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pikelizard.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/pikelizard.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/pikelizard.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/pikelizard.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/pikelizard.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/pikelizard.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/scout.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/scout.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/scout.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/scout.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/scout.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/scout.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/scout.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/scout.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/scout_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/scout_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/scout_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/scout_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/scout_2.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/scout_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/scout_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/scout_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/shaman.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/shaman.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/shaman.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/shaman.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/shaman.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/shaman.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/shaman.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/shaman.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/shaman_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/lizards/shaman_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/shaman_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/shaman_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/shaman_2.png b/forge-gui/res/adventure/Shandalar/sprites/lizards/shaman_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/shaman_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/lizards/shaman_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/merfolk.atlas b/forge-gui/res/adventure/Shandalar/sprites/merfolk/merfolk.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/merfolk.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/merfolk/merfolk.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/merfolk.png b/forge-gui/res/adventure/Shandalar/sprites/merfolk/merfolk.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/merfolk.png
rename to forge-gui/res/adventure/Shandalar/sprites/merfolk/merfolk.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/merfolk_lord.atlas b/forge-gui/res/adventure/Shandalar/sprites/merfolk/merfolk_lord.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/merfolk_lord.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/merfolk/merfolk_lord.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/merfolk_lord.png b/forge-gui/res/adventure/Shandalar/sprites/merfolk/merfolk_lord.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/merfolk_lord.png
rename to forge-gui/res/adventure/Shandalar/sprites/merfolk/merfolk_lord.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mermaid.atlas b/forge-gui/res/adventure/Shandalar/sprites/merfolk/mermaid.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mermaid.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/merfolk/mermaid.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mermaid.png b/forge-gui/res/adventure/Shandalar/sprites/merfolk/mermaid.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mermaid.png
rename to forge-gui/res/adventure/Shandalar/sprites/merfolk/mermaid.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/warlockmaster.atlas b/forge-gui/res/adventure/Shandalar/sprites/miniboss/conjurer.atlas
similarity index 95%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/warlockmaster.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/miniboss/conjurer.atlas
index d730139dfe3..6ef497f4ba6 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/dungeon/warlockmaster.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/miniboss/conjurer.atlas
@@ -1,4 +1,4 @@
-warlockmaster.png
+conjurer.png
 size: 256,32
 format: RGBA8888
 filter: Nearest,Nearest
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/warlockmaster.png b/forge-gui/res/adventure/Shandalar/sprites/miniboss/conjurer.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/warlockmaster.png
rename to forge-gui/res/adventure/Shandalar/sprites/miniboss/conjurer.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/ironcheffboss.atlas b/forge-gui/res/adventure/Shandalar/sprites/miniboss/ironcheffboss.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/ironcheffboss.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/miniboss/ironcheffboss.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/boss/ironcheffboss.png b/forge-gui/res/adventure/Shandalar/sprites/miniboss/ironcheffboss.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/boss/ironcheffboss.png
rename to forge-gui/res/adventure/Shandalar/sprites/miniboss/ironcheffboss.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/torturer.atlas b/forge-gui/res/adventure/Shandalar/sprites/miniboss/torturer.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/torturer.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/miniboss/torturer.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/torturer.png b/forge-gui/res/adventure/Shandalar/sprites/miniboss/torturer.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/torturer.png
rename to forge-gui/res/adventure/Shandalar/sprites/miniboss/torturer.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/behemoth.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/behemoth.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/behemoth.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/behemoth.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/behemoth.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/behemoth.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/behemoth.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/behemoth.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/beholder.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/beholder.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/beholder.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/beholder.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/beholder.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/beholder.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/beholder.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/beholder.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/centaur.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/centaur.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/centaur.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/centaur.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/centaur.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/centaur.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/centaur.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/centaur.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/centaur_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/centaur_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/centaur_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/centaur_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/centaur_2.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/centaur_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/centaur_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/centaur_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cyclops.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/cyclops.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cyclops.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/cyclops.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cyclops.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/cyclops.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cyclops.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/cyclops.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cyclops_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/cyclops_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cyclops_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/cyclops_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/cyclops_2.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/cyclops_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/cyclops_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/cyclops_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/djinn.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/djinn.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/djinn.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/djinn.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/djinn.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/djinn.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/djinn.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/djinn.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/djinn_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/djinn_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/djinn_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/djinn_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/djinn_2.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/djinn_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/djinn_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/djinn_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/doppelganger.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/doppelganger.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/doppelganger.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/doppelganger.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/doppelganger.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/doppelganger.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/doppelganger.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/doppelganger.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dragon.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/dragon.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dragon.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/dragon.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dragon.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/dragon.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dragon.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/dragon.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/efreet.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/efreet.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/efreet.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/efreet.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/efreet.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/efreet.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/efreet.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/efreet.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/efreet_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/efreet_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/efreet_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/efreet_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/efreet_2.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/efreet_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/efreet_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/efreet_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/eye.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/eye.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/eye.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/eye.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/eye.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/eye.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/eye.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/eye.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/firedragon.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/firedragon.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/firedragon.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/firedragon.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/firedragon.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/firedragon.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/firedragon.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/firedragon.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/fungus.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/fungus.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/fungus.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/fungus.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/fungus.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/fungus.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/fungus.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/fungus.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/fungus_golgari.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/fungus_golgari.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/fungus_golgari.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/fungus_golgari.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/fungus_golgari.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/fungus_golgari.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/fungus_golgari.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/fungus_golgari.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gargoyle.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/gargoyle.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gargoyle.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/gargoyle.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gargoyle.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/gargoyle.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gargoyle.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/gargoyle.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gargoyle_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/gargoyle_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gargoyle_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/gargoyle_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gargoyle_2.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/gargoyle_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gargoyle_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/gargoyle_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/golgari_treant.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/golgari_treant.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/golgari_treant.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/golgari_treant.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/golgari_treant.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/golgari_treant.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/golgari_treant.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/golgari_treant.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gorgone.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/gorgone.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gorgone.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/gorgone.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gorgone.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/gorgone.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gorgone.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/gorgone.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gorgonen.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/gorgonen.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gorgonen.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/gorgonen.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gorgonen.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/gorgonen.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gorgonen.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/gorgonen.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gremlin.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/gremlin.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gremlin.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/gremlin.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gremlin.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/gremlin.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gremlin.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/gremlin.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gremlin_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/gremlin_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gremlin_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/gremlin_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gremlin_2.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/gremlin_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gremlin_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/gremlin_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/harpy.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/harpy.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/harpy.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/harpy.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/harpy.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/harpy.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/harpy.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/harpy.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/harpy_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/harpy_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/harpy_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/harpy_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/harpy_2.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/harpy_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/harpy_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/harpy_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/homarid.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/homarid.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/homarid.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/homarid.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/homarid.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/homarid.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/homarid.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/homarid.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/hydra.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/hydra.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/hydra.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/hydra.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/hydra.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/hydra.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/hydra.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/hydra.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/jackalwarrior.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/jackalwarrior.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/jackalwarrior.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/jackalwarrior.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/jackalwarrior.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/jackalwarrior.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/jackalwarrior.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/jackalwarrior.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kavu.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/kavu.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/kavu.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/kavu.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/kavu.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/kavu.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/kavu.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/kavu.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/leech.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/leech.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/leech.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/leech.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/leech.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/leech.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/leech.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/leech.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/leech_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/leech_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/leech_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/leech_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/leech_2.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/leech_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/leech_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/leech_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/cephalid.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/mindflayer.atlas
similarity index 99%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/cephalid.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/mindflayer.atlas
index 36bd8df9491..2aed2599997 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/dungeon/cephalid.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/monsters/mindflayer.atlas
@@ -1,4 +1,4 @@
-cephalid.png
+mindflayer.png
 size: 960,384
 format: RGBA8888
 filter: Nearest,Nearest
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/cephalid.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/mindflayer.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/cephalid.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/mindflayer.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/minotaur.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/minotaur.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/minotaur.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/minotaur.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/minotaur.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/minotaur.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/minotaur.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/minotaur.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ooze.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/ooze.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ooze.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/ooze.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ooze.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/ooze.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ooze.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/ooze.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/phoenix.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/phoenix.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/phoenix.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/phoenix.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/phoenix.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/phoenix.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/phoenix.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/phoenix.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/plant.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/plant.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/plant.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/plant.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/plant.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/plant.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/plant.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/plant.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/sandwurm.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/sandwurm.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/sandwurm.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/sandwurm.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/sandwurm.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/sandwurm.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/sandwurm.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/sandwurm.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/satyr.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/satyr.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/satyr.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/satyr.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/satyr.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/satyr.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/satyr.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/satyr.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/satyr_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/satyr_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/satyr_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/satyr_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/satyr_2.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/satyr_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/satyr_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/satyr_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrow.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/scarecrow.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrow.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/scarecrow.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrow.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/scarecrow.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/scarecrow.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/scarecrow.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/sliver.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/sliver.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/sliver.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/sliver.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/sliver.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/sliver.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/sliver.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/sliver.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/sliver_black.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/sliver_black.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/sliver_black.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/sliver_black.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/sliver_black.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/sliver_black.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/sliver_black.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/sliver_black.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/sliver_blue.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/sliver_blue.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/sliver_blue.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/sliver_blue.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/sliver_white.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/sliver_white.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/sliver_white.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/sliver_white.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/swamptroll.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/swamptroll.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/swamptroll.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/swamptroll.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/swamptroll.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/swamptroll.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/swamptroll.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/swamptroll.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/treant.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/treant.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/treant.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/treant.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/treant.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/treant.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/treant.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/treant.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/treant_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/treant_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/treant_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/treant_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/treant_2.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/treant_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/treant_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/treant_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/treant_golgari.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/treant_golgari.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/treant_golgari.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/treant_golgari.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/treant_golgari.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/treant_golgari.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/treant_golgari.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/treant_golgari.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/troll.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/troll.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/troll.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/troll.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/troll.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/troll.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/troll.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/troll.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/troll_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/troll_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/troll_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/troll_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/troll_2.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/troll_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/troll_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/troll_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/walkingbrain.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/walkingbrain.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/walkingbrain.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/walkingbrain.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/walkingbrain.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/walkingbrain.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/walkingbrain.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/walkingbrain.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/werewolf.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/werewolf.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/werewolf.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/werewolf.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/werewolf.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/werewolf.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/werewolf.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/werewolf.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/wurm.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/wurm.atlas
similarity index 92%
rename from forge-gui/res/adventure/Shandalar/sprites/wurm.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/wurm.atlas
index 04e44ef5b6c..bda58863de9 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/wurm.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/monsters/wurm.atlas
@@ -1,68 +1,68 @@
-wurm.png
-size: 64,96
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none          
-Avatar
-  xy: 0, 0
-  size: 16, 16      
-Idle 
-  xy: 0, 16
-  size: 16, 16      
-Idle 
-  xy: 16, 16
-  size: 16, 16 
-Idle 
-  xy: 32, 16
-  size: 16, 16 
-Idle 
-  xy: 48, 16
-  size: 16, 16    
-Walk
-  xy: 0, 32
-  size: 16, 16      
-Walk 
-  xy: 16, 32
-  size: 16, 16 
-Walk 
-  xy: 32, 32
-  size: 16, 16 
-Walk 
-  xy: 48, 32
-  size: 16, 16      
-Attack 
-  xy: 0, 48
-  size: 16, 16      
-Attack 
-  xy: 16, 48
-  size: 16, 16 
-Attack 
-  xy: 32, 48
-  size: 16, 16 
-Attack 
-  xy: 48, 48
-  size: 16, 16          
-Hit 
-  xy: 0, 64
-  size: 16, 16      
-Hit 
-  xy: 16, 64
-  size: 16, 16 
-Hit 
-  xy: 32, 64
-  size: 16, 16 
-Hit 
-  xy: 48, 64
-  size: 16, 16 
-Death 
-  xy: 0, 80
-  size: 16, 16      
-Death 
-  xy: 16, 80
-  size: 16, 16 
-Death 
-  xy: 32, 80
-  size: 16, 16 
-Death 
-  xy: 48, 80
+wurm.png
+size: 64,96
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none          
+Avatar
+  xy: 0, 0
+  size: 16, 16      
+Idle 
+  xy: 0, 16
+  size: 16, 16      
+Idle 
+  xy: 16, 16
+  size: 16, 16 
+Idle 
+  xy: 32, 16
+  size: 16, 16 
+Idle 
+  xy: 48, 16
+  size: 16, 16    
+Walk
+  xy: 0, 32
+  size: 16, 16      
+Walk 
+  xy: 16, 32
+  size: 16, 16 
+Walk 
+  xy: 32, 32
+  size: 16, 16 
+Walk 
+  xy: 48, 32
+  size: 16, 16      
+Attack 
+  xy: 0, 48
+  size: 16, 16      
+Attack 
+  xy: 16, 48
+  size: 16, 16 
+Attack 
+  xy: 32, 48
+  size: 16, 16 
+Attack 
+  xy: 48, 48
+  size: 16, 16          
+Hit 
+  xy: 0, 64
+  size: 16, 16      
+Hit 
+  xy: 16, 64
+  size: 16, 16 
+Hit 
+  xy: 32, 64
+  size: 16, 16 
+Hit 
+  xy: 48, 64
+  size: 16, 16 
+Death 
+  xy: 0, 80
+  size: 16, 16      
+Death 
+  xy: 16, 80
+  size: 16, 16 
+Death 
+  xy: 32, 80
+  size: 16, 16 
+Death 
+  xy: 48, 80
   size: 16, 16 
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/sprites/wurm.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/wurm.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/wurm.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/wurm.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/yeti.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/yeti.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/yeti.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/yeti.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/yeti.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/yeti.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/yeti.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/yeti.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/yeti_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/monsters/yeti_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/yeti_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/yeti_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/yeti_2.png b/forge-gui/res/adventure/Shandalar/sprites/monsters/yeti_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/yeti_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/monsters/yeti_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/humanoidrat.atlas b/forge-gui/res/adventure/Shandalar/sprites/nezumi/humanoidrat.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/humanoidrat.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/nezumi/humanoidrat.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/humanoidrat.png b/forge-gui/res/adventure/Shandalar/sprites/nezumi/humanoidrat.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/humanoidrat.png
rename to forge-gui/res/adventure/Shandalar/sprites/nezumi/humanoidrat.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/copperhostbrutalizer.atlas b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/copperhostbrutalizer.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/copperhostbrutalizer.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/copperhostbrutalizer.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/copperhostbrutalizer.png b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/copperhostbrutalizer.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/copperhostbrutalizer.png
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/copperhostbrutalizer.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/copperhostinfector.atlas b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/copperhostinfector.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/copperhostinfector.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/copperhostinfector.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/copperhostinfector.png b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/copperhostinfector.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/copperhostinfector.png
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/copperhostinfector.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/drossgladiator.atlas b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/drossgladiator.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/drossgladiator.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/drossgladiator.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/drossgladiator.png b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/drossgladiator.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/drossgladiator.png
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/drossgladiator.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/drossgrimnarch.atlas b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/drossgrimnarch.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/drossgrimnarch.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/drossgrimnarch.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/drossgrimnarch.png b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/drossgrimnarch.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/drossgrimnarch.png
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/drossgrimnarch.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/furnacegoblin.atlas b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/furnacegoblin.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/furnacegoblin.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/furnacegoblin.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/furnacegoblin.png b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/furnacegoblin.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/furnacegoblin.png
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/furnacegoblin.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/furnacetormentor.atlas b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/furnacetormentor.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/furnacetormentor.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/furnacetormentor.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/furnacetormentor.png b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/furnacetormentor.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/furnacetormentor.png
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/furnacetormentor.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gitaxianscientist.atlas b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/gitaxianscientist.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gitaxianscientist.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/gitaxianscientist.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gitaxianscientist.png b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/gitaxianscientist.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gitaxianscientist.png
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/gitaxianscientist.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gitaxianunderling.atlas b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/gitaxianunderling.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gitaxianunderling.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/gitaxianunderling.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/gitaxianunderling.png b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/gitaxianunderling.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/gitaxianunderling.png
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/gitaxianunderling.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/phyrexianangel.atlas b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/phyrexianangel.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/phyrexianangel.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/phyrexianangel.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/phyrexianangel.png b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/phyrexianangel.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/phyrexianangel.png
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/phyrexianangel.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/phyrexianduelist.atlas b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/phyrexianduelist.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/phyrexianduelist.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/phyrexianduelist.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/phyrexianduelist.png b/forge-gui/res/adventure/Shandalar/sprites/phyrexians/phyrexianduelist.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/phyrexianduelist.png
rename to forge-gui/res/adventure/Shandalar/sprites/phyrexians/phyrexianduelist.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dawnhart_witch.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/dawnhart_witch.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dawnhart_witch.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/dawnhart_witch.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dawnhart_witch.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/dawnhart_witch.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dawnhart_witch.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/dawnhart_witch.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/death_knight.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/death_knight.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/death_knight.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/death_knight.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/death_knight.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/death_knight.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/death_knight.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/death_knight.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/death_knight_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/death_knight_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/death_knight_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/death_knight_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/death_knight_2.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/death_knight_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/death_knight_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/death_knight_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/demon.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/demon.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/demon.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/demon.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/demon.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/demon.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/demon.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/demon.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/demon_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/demon_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/demon_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/demon_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/demon_2.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/demon_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/demon_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/demon_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/demon_3.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/demon_3.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/demon_3.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/demon_3.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/demon_3.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/demon_3.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/demon_3.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/demon_3.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/devil.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/devil.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/devil.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/devil.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/devil.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/devil.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/devil.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/devil.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/devil_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/devil_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/devil_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/devil_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/devil_2.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/devil_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/devil_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/devil_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/flyingwitch.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/flyingwitch.atlas
similarity index 98%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/flyingwitch.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/flyingwitch.atlas
index 0a75f8cb229..c3378ab31ac 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/dungeon/flyingwitch.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/unholy/flyingwitch.atlas
@@ -1,4 +1,4 @@
-witch.png
+witchlarge.png
 size: 320,192
 format: RGBA8888
 filter: Nearest,Nearest
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ghost.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/ghost.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ghost.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/ghost.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ghost.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/ghost.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ghost.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/ghost.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ghost_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/ghost_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ghost_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/ghost_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ghost_2.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/ghost_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ghost_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/ghost_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ghost_3.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/ghost_3.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ghost_3.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/ghost_3.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ghost_3.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/ghost_3.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ghost_3.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/ghost_3.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ghoul.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/ghoul.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ghoul.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/ghoul.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/ghoul.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/ghoul.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/ghoul.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/ghoul.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/hellhound.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/hellhound.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/hellhound.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/hellhound.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/hellhound.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/hellhound.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/hellhound.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/hellhound.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/hellhound_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/hellhound_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/hellhound_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/hellhound_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/hellhound_2.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/hellhound_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/hellhound_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/hellhound_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/imp.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/imp.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/imp.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/imp.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/imp.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/imp.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/imp.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/imp.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/imp_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/imp_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/imp_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/imp_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/imp_2.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/imp_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/imp_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/imp_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/juggler.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/juggler.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/juggler.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/juggler.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/juggler.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/juggler.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/juggler.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/juggler.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/juggler_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/juggler_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/juggler_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/juggler_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/juggler_2.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/juggler_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/juggler_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/juggler_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lich.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/lich.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lich.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/lich.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lich.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/lich.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lich.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/lich.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lich_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/lich_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lich_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/lich_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/lich_2.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/lich_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/lich_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/lich_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mummy.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/mummy.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mummy.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/mummy.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mummy.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/mummy.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mummy.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/mummy.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/skeleton.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/skeleton.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/skeleton.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/skeleton.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/skeleton.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/skeleton.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/skeleton.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/skeleton.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/skeleton_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/skeleton_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/skeleton_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/skeleton_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/skeleton_2.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/skeleton_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/skeleton_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/skeleton_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/vampire.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/vampire.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/vampire.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/vampire.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/vampire.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/vampire.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/vampire.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/vampire.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/vampire_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/vampire_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/vampire_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/vampire_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/vampire_2.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/vampire_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/vampire_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/vampire_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/vampire_3.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/vampire_3.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/vampire_3.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/vampire_3.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/vampire_3.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/vampire_3.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/vampire_3.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/vampire_3.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/warden.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/warden.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/warden.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/warden.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/warden.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/warden.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/warden.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/warden.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/warden_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/warden_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/warden_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/warden_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/warden_2.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/warden_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/warden_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/warden_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/unused/Requested/witch.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/witch.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/unused/Requested/witch.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/witch.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/unused/Requested/witch.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/witch.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/unused/Requested/witch.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/witch.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/witch.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/witchlarge.atlas
similarity index 98%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/witch.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/witchlarge.atlas
index 3d2f3b32044..c57658c17f6 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/dungeon/witch.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/unholy/witchlarge.atlas
@@ -1,4 +1,4 @@
-witch.png
+witchlarge.png
 size: 320,192
 format: RGBA8888
 filter: Nearest,Nearest
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/witch.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/witchlarge.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/witch.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/witchlarge.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/zombie.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/zombie.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/zombie.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/zombie.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/zombie.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/zombie.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/zombie.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/zombie.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/zombie_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/unholy/zombie_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/zombie_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/zombie_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/zombie_2.png b/forge-gui/res/adventure/Shandalar/sprites/unholy/zombie_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/zombie_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/unholy/zombie_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/black_wiz2.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/black_wiz2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/black_wiz2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/black_wiz2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/black_wiz2.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/black_wiz2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/black_wiz2.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/black_wiz2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/black_wiz3.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/black_wiz3.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/black_wiz3.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/black_wiz3.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/black_wiz3.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/black_wiz3.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/black_wiz3.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/black_wiz3.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/black_wizard.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/black_wizard.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/black_wizard.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/black_wizard.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/black_wizard.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/black_wizard.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/black_wizard.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/black_wizard.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/blue_wiz2.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/blue_wiz2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/blue_wiz2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/blue_wiz2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/blue_wiz2.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/blue_wiz2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/blue_wiz2.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/blue_wiz2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dimir_wiz.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/dimir_wiz.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dimir_wiz.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/dimir_wiz.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dimir_wiz.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/dimir_wiz.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dimir_wiz.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/dimir_wiz.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/enchanter.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/enchanter.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/enchanter.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/enchanter.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/enchanter.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/enchanter.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/enchanter.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/enchanter.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/green_wiz1.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/green_wiz1.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/green_wiz1.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/green_wiz1.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/green_wiz1.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/green_wiz1.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/green_wiz1.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/green_wiz1.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/green_wiz2.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/green_wiz2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/green_wiz2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/green_wiz2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/green_wiz2.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/green_wiz2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/green_wiz2.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/green_wiz2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/green_wiz3.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/green_wiz3.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/green_wiz3.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/green_wiz3.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/green_wiz3.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/green_wiz3.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/green_wiz3.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/green_wiz3.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mage.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/mage.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mage.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/mage.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mage.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/mage.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mage.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/mage.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mage_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/mage_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mage_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/mage_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/mage_2.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/mage_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/mage_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/mage_2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/pyromancer.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/pyromancer.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/pyromancer.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/pyromancer.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/pyromancer.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/pyromancer.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/dungeon/pyromancer.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/pyromancer.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/rakdos_wiz.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/rakdos_wiz.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/rakdos_wiz.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/rakdos_wiz.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/rakdos_wiz.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/rakdos_wiz.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/rakdos_wiz.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/rakdos_wiz.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/red_wiz2.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/red_wiz2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/red_wiz2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/red_wiz2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/red_wiz2.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/red_wiz2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/red_wiz2.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/red_wiz2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/red_wiz3.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/red_wiz3.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/red_wiz3.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/red_wiz3.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/red_wiz3.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/red_wiz3.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/red_wiz3.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/red_wiz3.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/runescribe.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/runescribe.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/runescribe.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/runescribe.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/runescribe.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/runescribe.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/runescribe.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/runescribe.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/white_wiz2.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/white_wiz2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/white_wiz2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/white_wiz2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/white_wiz2.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/white_wiz2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/white_wiz2.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/white_wiz2.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/white_wiz3.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/white_wiz3.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/white_wiz3.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/white_wiz3.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/white_wiz3.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/white_wiz3.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/white_wiz3.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/white_wiz3.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/wizard.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/wizard.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/wizard.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/wizard.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/wizard.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/wizard.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/wizard.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/wizard.png
diff --git a/forge-gui/res/adventure/Shandalar/sprites/wizard_2.atlas b/forge-gui/res/adventure/Shandalar/sprites/wizards/wizard_2.atlas
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/wizard_2.atlas
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/wizard_2.atlas
diff --git a/forge-gui/res/adventure/Shandalar/sprites/wizard_2.png b/forge-gui/res/adventure/Shandalar/sprites/wizards/wizard_2.png
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/sprites/wizard_2.png
rename to forge-gui/res/adventure/Shandalar/sprites/wizards/wizard_2.png
diff --git a/forge-gui/res/adventure/Shandalar/world/black.json b/forge-gui/res/adventure/Shandalar/world/black.json
index 5a624d9928a..647dd5c96b3 100644
--- a/forge-gui/res/adventure/Shandalar/world/black.json
+++ b/forge-gui/res/adventure/Shandalar/world/black.json
@@ -35,13 +35,12 @@
 	"Shroom2"
 ],
 "enemies": [
+	"Adept Black Wizard",
+	"Apprentice Black Wizard",
 	"Bat",
 	"Beholder",
 	"Big Zombie",
 	"Black Sliver",
-	"Black Wiz1",
-	"Black Wiz2",
-	"Black Wiz3",
 	"Challenger 20",
 	"Challenger 21",
 	"Challenger 22",
@@ -62,10 +61,11 @@
 	"Horror",
 	"Insect",
 	"Lich",
+	"Master Black Wizard",
 	"Mindclaw Shaman",
 	"Mummy",
+	"Nezumi Ninja",
 	"Rakdos Devil",
-	"Rat Ninja",
 	"Skeleton",
 	"Skeleton Soldier",
 	"Vampire",
diff --git a/forge-gui/res/adventure/Shandalar/world/blue.json b/forge-gui/res/adventure/Shandalar/world/blue.json
index 4d589f45d20..574bfd5ac44 100644
--- a/forge-gui/res/adventure/Shandalar/world/blue.json
+++ b/forge-gui/res/adventure/Shandalar/world/blue.json
@@ -28,11 +28,10 @@
 	"Shell"
 ],
 "enemies": [
+	"Adept Blue Wizard",
 	"Aether Channeler",
+	"Apprentice Blue Wizard",
 	"Bird",
-	"Blue Wiz1",
-	"Blue Wiz2",
-	"Blue Wiz3",
 	"Cephalid",
 	"Challenger 20",
 	"Challenger 21",
@@ -61,6 +60,7 @@
 	"Rogue",
 	"Scorpion",
 	"Sea Monster",
+	"Simic Wizard",
 	"Tarkir Djinn",
 	"Turtle",
 	"Walking Brain",
diff --git a/forge-gui/res/adventure/Shandalar/world/enemies.json b/forge-gui/res/adventure/Shandalar/world/enemies.json
index aaa83e0c92f..df2fedf28bc 100644
--- a/forge-gui/res/adventure/Shandalar/world/enemies.json
+++ b/forge-gui/res/adventure/Shandalar/world/enemies.json
@@ -1,9 +1,326 @@
 [
 {
-	"name": "Adventurer",
-	"sprite": "sprites/swordsman_3.atlas",
+	"name": "Adept Black Wizard",
+	"sprite": "sprites/wizards/black_wiz2.atlas",
 	"deck": [
-		"decks/adventurer.dck"
+		"decks/wizards/blackwizard_medium_demonicpact.dck",
+		"decks/wizards/blackwizard_medium_fear.dck",
+		"decks/wizards/blackwizard_medium_goblins.dck"
+	],
+	"ai": "",
+	"randomizeDeck": true,
+	"spawnRate": 0.75,
+	"difficulty": 0.1,
+	"speed": 24,
+	"life": 15,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 6,
+			"rarity": [
+				"Common",
+				"Uncommon"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 20,
+			"addMaxCount": 70
+		},
+		{
+			"type": "card",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 4,
+			"colors": [
+				"Black"
+			],
+			"rarity": [
+				"Common",
+				"Uncommon"
+			],
+			"colorType": "MonoColor"
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.5,
+			"count": 1,
+			"addMaxCount": 3,
+			"rarity": [
+				"Rare",
+				"Mythic Rare"
+			]
+		}
+	],
+	"colors": "B",
+	"questTags": [
+		"Wizard",
+		"Necromancer",
+		"IdentityBlack",
+		"BiomeColorless",
+		"BiomeBlack"
+	]
+},
+{
+	"name": "Adept Blue Wizard",
+	"sprite": "sprites/wizards/blue_wiz2.atlas",
+	"deck": [
+		"decks/wizards/bluewizard_medium_donate.dck",
+		"decks/wizards/bluewizard_medium_dragons.dck",
+		"decks/wizards/bluewizard_medium_midrange.dck",
+		"decks/wizards/bluewizard_medium_mill.dck"
+	],
+	"ai": "",
+	"randomizeDeck": true,
+	"spawnRate": 0.75,
+	"difficulty": 0.1,
+	"speed": 24,
+	"life": 15,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 6,
+			"rarity": [
+				"Common",
+				"Uncommon"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 20,
+			"addMaxCount": 70
+		},
+		{
+			"type": "card",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 4,
+			"colors": [
+				"Blue"
+			],
+			"rarity": [
+				"Common",
+				"Uncommon"
+			],
+			"colorType": "MonoColor"
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.5,
+			"count": 1,
+			"addMaxCount": 4,
+			"rarity": [
+				"Rare",
+				"Mythic Rare"
+			]
+		}
+	]
+},
+{
+	"name": "Adept Green Wizard",
+	"sprite": "sprites/wizards/green_wiz2.atlas",
+	"deck": [
+		"decks/wizards/greenwizard_medium_cheatramp.dck",
+		"decks/wizards/greenwizard_medium_nissa.dck",
+		"decks/wizards/greenwizard_medium_snakes.dck",
+		"decks/wizards/greenwizard_medium_trample.dck"
+	],
+	"ai": "",
+	"randomizeDeck": true,
+	"spawnRate": 0.75,
+	"difficulty": 0.1,
+	"speed": 24,
+	"life": 15,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 6,
+			"rarity": [
+				"Common",
+				"Uncommon"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 20,
+			"addMaxCount": 70
+		},
+		{
+			"type": "card",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 4,
+			"colors": [
+				"Green"
+			],
+			"rarity": [
+				"Uncommon",
+				"Rare"
+			],
+			"colorType": "MonoColor"
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.5,
+			"count": 1,
+			"addMaxCount": 4,
+			"rarity": [
+				"Rare",
+				"Mythic Rare"
+			]
+		}
+	],
+	"colors": "G",
+	"questTags": [
+		"Nature",
+		"Wizard",
+		"Human",
+		"IdentityGreen",
+		"BiomeGreen",
+		"BiomeColorless"
+	]
+},
+{
+	"name": "Adept Red Wizard",
+	"sprite": "sprites/wizards/red_wiz2.atlas",
+	"deck": [
+		"decks/wizards/redwizard_medium_artifact.dck",
+		"decks/wizards/redwizard_medium_giant.dck",
+		"decks/wizards/redwizard_medium_circleofflame.dck",
+		"decks/wizards/redwizard_medium_ralburn.dck",
+		"decks/wizards/redwizard_medium_hasteburn.dck"
+	],
+	"ai": "",
+	"randomizeDeck": true,
+	"spawnRate": 0.75,
+	"difficulty": 0.1,
+	"speed": 24,
+	"life": 15,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 8
+		},
+		{
+			"type": "gold",
+			"count": 25,
+			"addMaxCount": 200
+		}
+	],
+	"colors": "R",
+	"questTags": [
+		"Wizard",
+		"Human",
+		"Fire",
+		"Pyromancer",
+		"IdentityRed",
+		"BiomeRed",
+		"BiomeColorless"
+	]
+},
+{
+	"name": "Adept White Wizard",
+	"sprite": "sprites/wizards/white_wiz2.atlas",
+	"deck": [
+		"decks/wizards/whitewizard_medium_aggro.dck",
+		"decks/wizards/whitewizard_medium_basri.dck",
+		"decks/wizards/whitewizard_medium_control.dck",
+		"decks/wizards/whitewizard_medium_knight.dck"
+	],
+	"randomizeDeck": true,
+	"spawnRate": 0.75,
+	"difficulty": 0.1,
+	"speed": 24,
+	"life": 15,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"basicland"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.5,
+			"count": 1,
+			"addMaxCount": 2,
+			"rarity": [
+				"uncommon"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.25,
+			"count": 1,
+			"addMaxCount": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.1,
+			"count": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 0.3,
+			"count": 10,
+			"addMaxCount": 90
+		}
+	],
+	"colors": "W",
+	"questTags": [
+		"Holy",
+		"Wizard",
+		"Human",
+		"Religious",
+		"Passive",
+		"IdentityWhite",
+		"BiomeColorless",
+		"BiomeWhite"
+	]
+},
+{
+	"name": "Adventurer",
+	"sprite": "sprites/humans/swordsman_3.atlas",
+	"deck": [
+		"decks/humans/adventurer.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -69,15 +386,15 @@
 },
 {
 	"name": "Aether Channeler",
-	"sprite": "sprites/monk_3.atlas",
+	"sprite": "sprites/holy/monk_3.atlas",
 	"deck": [
-		"decks/aether_channeler.dck"
+		"decks/holy/aether_channeler.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
 	"difficulty": 0.1,
 	"speed": 24,
-	"life": 12,
+	"life": 15,
 	"rewards": [
 		{
 			"type": "deckCard",
@@ -183,9 +500,9 @@
 },
 {
 	"name": "Angel Warrior",
-	"sprite": "sprites/dungeon/angelwarrior.atlas",
+	"sprite": "sprites/holy/angelwarrior.atlas",
 	"deck": [
-		"decks/angelwarrior.dck"
+		"decks/holy/angelwarrior.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -268,9 +585,9 @@
 },
 {
 	"name": "Amonkhet Minotaur",
-	"sprite": "sprites/warden.atlas",
+	"sprite": "sprites/unholy/warden.atlas",
 	"deck": [
-		"decks/amonkhet_minotaur.dck"
+		"decks/monsters/amonkhet_minotaur.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -353,9 +670,9 @@
 },
 {
 	"name": "Ape",
-	"sprite": "sprites/behemoth.atlas",
+	"sprite": "sprites/monsters/behemoth.atlas",
 	"deck": [
-		"decks/ape.json"
+		"decks/animals/ape.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -436,10 +753,442 @@
 	]
 },
 {
-	"name": "Archer",
-	"sprite": "sprites/archer_2.atlas",
+	"name": "Apprentice Black Wizard",
+	"sprite": "sprites/wizards/black_wizard.atlas",
 	"deck": [
-		"decks/human_archer.dck"
+		"decks/wizards/blackwizard_easy_artifact.dck",
+		"decks/wizards/blackwizard_easy_badmoon.dck",
+		"decks/wizards/blackwizard_easy_mill.dck",
+		"decks/wizards/blackwizard_easy.json"
+	],
+	"ai": "",
+	"randomizeDeck": true,
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 24,
+	"life": 10,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"basicland"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.5,
+			"count": 1,
+			"addMaxCount": 2,
+			"rarity": [
+				"uncommon"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.25,
+			"count": 1,
+			"addMaxCount": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.1,
+			"count": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 10,
+			"addMaxCount": 90
+		}
+	],
+	"colors": "B",
+	"questTags": [
+		"Wizard",
+		"Necromancer",
+		"IdentityBlack",
+		"BiomeColorless",
+		"BiomeBlack"
+	]
+},
+{
+	"name": "Apprentice Blue Wizard",
+	"sprite": "sprites/wizards/mage.atlas",
+	"deck": [
+		"decks/wizards/bluewizard_easy_artifact.dck",
+		"decks/wizards/bluewizard_easy_control.dck",
+		"decks/wizards/bluewizard_easy_thassa.dck",
+		"decks/wizards/bluewizard_easy.json"
+	],
+	"ai": "",
+	"flying": true,
+	"randomizeDeck": true,
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 25,
+	"life": 10,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"basicland"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.5,
+			"count": 1,
+			"addMaxCount": 2,
+			"rarity": [
+				"uncommon"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.25,
+			"count": 1,
+			"addMaxCount": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.1,
+			"count": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 0.3,
+			"count": 10,
+			"addMaxCount": 90
+		}
+	],
+	"colors": "U",
+	"questTags": [
+		"Wizard",
+		"Illusionist",
+		"Flying",
+		"Human",
+		"IdentityBlue",
+		"BiomeColorless",
+		"BiomeBlue"
+	]
+},
+{
+	"name": "Apprentice Green Wizard",
+	"sprite": "sprites/wizards/green_wiz1.atlas",
+	"deck": [
+		"decks/wizards/greenwizard_easy_elf.dck",
+		"decks/wizards/greenwizard_easy_enchantment.dck",
+		"decks/wizards/greenwizard_easy_vanilla.dck",
+		"decks/wizards/greenwizard_easy.json"
+	],
+	"ai": "",
+	"randomizeDeck": true,
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 24,
+	"life": 10,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"basicland"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.5,
+			"count": 1,
+			"addMaxCount": 2,
+			"rarity": [
+				"uncommon"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.25,
+			"count": 1,
+			"addMaxCount": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.1,
+			"count": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 0.3,
+			"count": 10,
+			"addMaxCount": 90
+		}
+	],
+	"colors": "G",
+	"questTags": [
+		"Nature",
+		"Wizard",
+		"Human",
+		"IdentityGreen",
+		"BiomeGreen",
+		"BiomeColorless"
+	]
+},
+{
+	"name": "Apprentice Red Wizard",
+	"sprite": "sprites/wizards/enchanter.atlas",
+	"deck": [
+		"decks/wizards/redwizard_easy_burn.dck",
+		"decks/wizards/redwizard_easy_dragons.dck",
+		"decks/wizards/redwizard_easy_gauntletofmight.dck",
+		"decks/wizards/redwizard_easy.json"
+	],
+	"ai": "",
+	"randomizeDeck": true,
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 24,
+	"life": 10,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"basicland"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.5,
+			"count": 1,
+			"addMaxCount": 2,
+			"rarity": [
+				"uncommon"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.25,
+			"count": 1,
+			"addMaxCount": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.1,
+			"count": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 0.3,
+			"count": 10,
+			"addMaxCount": 90
+		}
+	],
+	"colors": "R",
+	"questTags": [
+		"Wizard",
+		"Human",
+		"Fire",
+		"Pyromancer",
+		"IdentityRed",
+		"BiomeRed",
+		"BiomeColorless"
+	]
+},
+{
+	"name": "Apprentice White Wizard",
+	"sprite": "sprites/holy/priest.atlas",
+	"deck": [
+		"decks/wizards/whitewizard_easy_ajani.dck",
+		"decks/wizards/whitewizard_easy_wanderer.dck",
+		"decks/wizards/whitewizard_easy_angelhuman.dck"
+	],
+	"ai": "",
+	"randomizeDeck": true,
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 24,
+	"life": 10,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"basicland"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.5,
+			"count": 1,
+			"addMaxCount": 2,
+			"rarity": [
+				"uncommon"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.25,
+			"count": 1,
+			"addMaxCount": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.1,
+			"count": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 0.3,
+			"count": 10,
+			"addMaxCount": 90
+		}
+	],
+	"colors": "W",
+	"questTags": [
+		"Holy",
+		"Wizard",
+		"Human",
+		"Religious",
+		"IdentityWhite",
+		"BiomeColorless",
+		"BiomeWhite"
+	]
+},
+{
+	"name": "Archer",
+	"sprite": "sprites/humans/archer_2.atlas",
+	"deck": [
+		"decks/humans/human_archer.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -520,9 +1269,9 @@
 {
 	"name": "Archer Elite",
 	"nameOverride": "",
-	"sprite": "sprites/dungeon/bowmandefender.atlas",
+	"sprite": "sprites/humans/bowmandefender.atlas",
 	"deck": [
-		"decks/archerelite.dck"
+		"decks/humans/archerelite.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -594,15 +1343,15 @@
 {
 	"name": "Archaeologist",
 	"nameOverride": "",
-	"sprite": "sprites/dungeon/archaeologist.atlas",
+	"sprite": "sprites/humans/archaeologist.atlas",
 	"deck": [
-		"decks/archeologist.dck"
+		"decks/humans/archeologist.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
 	"difficulty": 0.1,
 	"speed": 21,
-	"scale":0.75,
+	"scale": 0.75,
 	"life": 18,
 	"rewards": [
 		{
@@ -641,9 +1390,9 @@
 },
 {
 	"name": "Armored Knight",
-	"sprite": "sprites/knight.atlas",
+	"sprite": "sprites/holy/knight.atlas",
 	"deck": [
-		"decks/armored_knight.dck"
+		"decks/holy/armored_knight.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -711,9 +1460,9 @@
 },
 {
 	"name": "Artifact Warrior",
-	"sprite": "sprites/dungeon/artifactsoldier.atlas",
+	"sprite": "sprites/constructs/artifactsoldier.atlas",
 	"deck": [
-		"decks/artifactwarrior.dck"
+		"decks/constructs/artifactwarrior.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -787,9 +1536,9 @@
 },
 {
 	"name": "Ashmouth Devil",
-	"sprite": "sprites/devil.atlas",
+	"sprite": "sprites/unholy/devil.atlas",
 	"deck": [
-		"decks/ashmouth_devil.dck"
+		"decks/unholy/ashmouth_devil.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -822,9 +1571,9 @@
 },
 {
 	"name": "Axgard Dwarf",
-	"sprite": "sprites/dwarf_8.atlas",
+	"sprite": "sprites/dwarves/dwarf_8.atlas",
 	"deck": [
-		"decks/axgard_dwarf.dck"
+		"decks/dwarves/axgard_dwarf.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -908,9 +1657,9 @@
 },
 {
 	"name": "Badger",
-	"sprite": "sprites/badger.atlas",
+	"sprite": "sprites/animals/badger.atlas",
 	"deck": [
-		"decks/badger.dck"
+		"decks/animals/badger.dck"
 	],
 	"ai": "",
 	"spawnRate": 0.5,
@@ -978,9 +1727,9 @@
 },
 {
 	"name": "Bandit",
-	"sprite": "sprites/dwarf_7.atlas",
+	"sprite": "sprites/dwarves/dwarf_7.atlas",
 	"deck": [
-		"decks/bandit.dck"
+		"decks/dwarves/bandit.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -1063,9 +1812,9 @@
 {
 	"name": "Barbarian",
 	"nameOverride": "",
-	"sprite": "sprites/dungeon/barbarian.atlas",
+	"sprite": "sprites/humans/barbarian.atlas",
 	"deck": [
-		"decks/barbarian.dck"
+		"decks/humans/barbarian.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -1115,9 +1864,9 @@
 },
 {
 	"name": "Bat",
-	"sprite": "sprites/bat.atlas",
+	"sprite": "sprites/animals/bat.atlas",
 	"deck": [
-		"decks/bat.dck"
+		"decks/animals/bat.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -1182,9 +1931,9 @@
 },
 {
 	"name": "Bear",
-	"sprite": "sprites/bear.atlas",
+	"sprite": "sprites/animals/bear.atlas",
 	"deck": [
-		"decks/bear.json"
+		"decks/animals/bear.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -1264,9 +2013,9 @@
 },
 {
 	"name": "Beastmaster",
-	"sprite": "sprites/calibou_elite.atlas",
+	"sprite": "sprites/humans/calibou_elite.atlas",
 	"deck": [
-		"decks/beastmaster.dck"
+		"decks/humans/beastmaster.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -1351,9 +2100,9 @@
 },
 {
 	"name": "Beholder",
-	"sprite": "sprites/beholder.atlas",
+	"sprite": "sprites/monsters/beholder.atlas",
 	"deck": [
-		"decks/beholder.dck"
+		"decks/monsters/beholder.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -1436,9 +2185,9 @@
 },
 {
 	"name": "Berserker",
-	"sprite": "sprites/dwarf_5.atlas",
+	"sprite": "sprites/dwarves/dwarf_5.atlas",
 	"deck": [
-		"decks/berserker.json"
+		"decks/dwarves/berserker.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -1475,9 +2224,9 @@
 },
 {
 	"name": "Big Zombie",
-	"sprite": "sprites/zombie_2.atlas",
+	"sprite": "sprites/unholy/zombie_2.atlas",
 	"deck": [
-		"decks/zombie_bad.json"
+		"decks/unholy/zombie_bad.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -1520,9 +2269,9 @@
 },
 {
 	"name": "Bird",
-	"sprite": "sprites/griffin_2.atlas",
+	"sprite": "sprites/animals/griffin_2.atlas",
 	"deck": [
-		"decks/bird_blue.json"
+		"decks/animals/bird_blue.json"
 	],
 	"ai": "",
 	"flying": true,
@@ -1607,9 +2356,9 @@
 },
 {
 	"name": "Black Sliver",
-	"sprite": "sprites/sliver_black.atlas",
+	"sprite": "sprites/monsters/sliver_black.atlas",
 	"deck": [
-		"decks/sliver_black.dck"
+		"decks/monsters/sliver_black.dck"
 	],
 	"spawnRate": 1,
 	"difficulty": 0.2,
@@ -1655,316 +2404,16 @@
 		"IdentityGrixis"
 	]
 },
-{
-	"name": "Black Wiz1",
-	"sprite": "sprites/black_wizard.atlas",
-	"deck": [
-		"decks/black_bad.json"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 24,
-	"life": 10,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 4,
-			"rarity": [
-				"common",
-				"basicland"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.5,
-			"count": 1,
-			"addMaxCount": 2,
-			"rarity": [
-				"uncommon"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.25,
-			"count": 1,
-			"addMaxCount": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.1,
-			"count": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Land"
-			]
-		},
-		{
-			"type": "gold",
-			"probability": 0.3,
-			"count": 10,
-			"addMaxCount": 90
-		}
-	],
-	"colors": "B",
-	"questTags": [
-		"Wizard",
-		"Necromancer",
-		"IdentityBlack",
-		"BiomeColorless",
-		"BiomeBlack"
-	]
-},
-{
-	"name": "Black Wiz2",
-	"sprite": "sprites/black_wiz2.atlas",
-	"deck": [
-		"decks/fear.dck"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 24,
-	"life": 10,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 8
-		},
-		{
-			"type": "gold",
-			"probability": 0.7,
-			"count": 20,
-			"addMaxCount": 80
-		}
-	],
-	"colors": "B",
-	"questTags": [
-		"Wizard",
-		"Necromancer",
-		"IdentityBlack",
-		"BiomeColorless",
-		"BiomeBlack"
-	]
-},
-{
-	"name": "Black Wiz3",
-	"sprite": "sprites/black_wiz3.atlas",
-	"deck": [
-		"decks/black_wiz3.dck"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 24,
-	"life": 10,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 8
-		},
-		{
-			"type": "gold",
-			"probability": 0.7,
-			"count": 20,
-			"addMaxCount": 80
-		}
-	],
-	"colors": "B",
-	"questTags": [
-		"Wizard",
-		"Necromancer",
-		"IdentityBlack",
-		"BiomeColorless",
-		"BiomeBlack"
-	]
-},
-{
-	"name": "Blue Wiz1",
-	"sprite": "sprites/mage.atlas",
-	"deck": [
-		"decks/blue_bad.json"
-	],
-	"ai": "",
-	"flying": true,
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 31,
-	"life": 10,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 4,
-			"rarity": [
-				"common",
-				"basicland"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.5,
-			"count": 1,
-			"addMaxCount": 2,
-			"rarity": [
-				"uncommon"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.25,
-			"count": 1,
-			"addMaxCount": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.1,
-			"count": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Land"
-			]
-		},
-		{
-			"type": "gold",
-			"probability": 0.3,
-			"count": 10,
-			"addMaxCount": 90
-		}
-	],
-	"colors": "U",
-	"questTags": [
-		"Wizard",
-		"Illusionist",
-		"Flying",
-		"Human",
-		"IdentityBlue",
-		"BiomeColorless",
-		"BiomeBlue"
-	]
-},
-{
-	"name": "Blue Wiz2",
-	"sprite": "sprites/blue_wiz2.atlas",
-	"deck": [
-		"decks/mill.dck"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 24,
-	"life": 10,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 4,
-			"addMaxCount": 6
-		},
-		{
-			"type": "gold",
-			"probability": 1,
-			"count": 80,
-			"addMaxCount": 40
-		}
-	],
-	"colors": "U",
-	"questTags": [
-		"Illusionist",
-		"Wizard",
-		"Human",
-		"IdentityBlue",
-		"BiomeColorless",
-		"BiomeBlue"
-	]
-},
-{
-	"name": "Blue Wiz3",
-	"sprite": "sprites/mage_2.atlas",
-	"deck": [
-		"decks/counter.dck"
-	],
-	"ai": "",
-	"flying": true,
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 31,
-	"life": 14,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 8
-		},
-		{
-			"type": "gold",
-			"count": 50,
-			"addMaxCount": 300
-		}
-	],
-	"colors": "U",
-	"questTags": [
-		"Human",
-		"Wizard",
-		"Illusionist",
-		"IdentityBlue",
-		"BiomeColorless",
-		"BiomeBlue"
-	]
-},
 {
 	"name": "Boar",
-	"sprite": "sprites/boar.atlas",
+	"sprite": "sprites/animals/boar.atlas",
 	"deck": [
-		"decks/boar.json"
+		"decks/animals/boar.json",
+		"decks/animals/boar_gruul.dck",
+		"decks/animals/boar_monogreenlifegain.dck"
 	],
 	"ai": "",
+	"randomizeDeck": true,
 	"spawnRate": 0.5,
 	"difficulty": 0.4,
 	"speed": 31,
@@ -2032,9 +2481,9 @@
 },
 {
 	"name": "Boggart",
-	"sprite": "sprites/goblin_2.atlas",
+	"sprite": "sprites/goblins/goblin_2.atlas",
 	"deck": [
-		"decks/eyeblight.dck"
+		"decks/goblins/eyeblight.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -2080,9 +2529,9 @@
 },
 {
 	"name": "Bull",
-	"sprite": "sprites/bull.atlas",
+	"sprite": "sprites/animals/bull.atlas",
 	"deck": [
-		"decks/bull.dck"
+		"decks/animals/bull.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -2149,9 +2598,9 @@
 },
 {
 	"name": "Bog Witch",
-	"sprite": "sprites/black_wiz3.atlas",
+	"sprite": "sprites/wizards/black_wiz3.atlas",
 	"deck": [
-		"decks/witch.dck"
+		"decks/unholy/witch.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -2203,9 +2652,9 @@
 {
 	"name": "Camel",
 	"nameOverride": "",
-	"sprite": "sprites/dungeon/camel.atlas",
+	"sprite": "sprites/animals/camel.atlas",
 	"deck": [
-		"decks/camel.dck"
+		"decks/animals/camel.dck"
 	],
 	"ai": "",
 	"randomizeDeck": true,
@@ -2276,94 +2725,11 @@
 		null
 	]
 },
-{
-	"name": "Cat",
-	"sprite": "sprites/lion.atlas",
-	"deck": [
-		"decks/cat.json"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 27,
-	"life": 15,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 4,
-			"rarity": [
-				"common",
-				"basicland"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.5,
-			"count": 1,
-			"addMaxCount": 2,
-			"rarity": [
-				"uncommon"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.25,
-			"count": 1,
-			"addMaxCount": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.1,
-			"count": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Land"
-			]
-		},
-		{
-			"type": "gold",
-			"probability": 0.3,
-			"count": 10,
-			"addMaxCount": 90
-		}
-	],
-	"colors": "GW",
-	"questTags": [
-		"Cat",
-		"Humanoid",
-		"Soldier",
-		"IdentityGreen",
-		"IdentityWhite",
-		"IdentitySelesnya",
-		"BiomeWhite"
-	]
-},
 {
 	"name": "Cathar",
-	"sprite": "sprites/cathar.atlas",
+	"sprite": "sprites/humans/cathar.atlas",
 	"deck": [
-		"decks/cathar.dck"
+		"decks/humans/cathar.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -2445,9 +2811,9 @@
 },
 {
 	"name": "Cave Spider",
-	"sprite": "sprites/spider_2.atlas",
+	"sprite": "sprites/arachnida/spider_cave.atlas",
 	"deck": [
-		"decks/cave_spider.dck"
+		"decks/arachnida/cave_spider.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -2498,9 +2864,9 @@
 },
 {
 	"name": "Centaur",
-	"sprite": "sprites/centaur.atlas",
+	"sprite": "sprites/monsters/centaur.atlas",
 	"deck": [
-		"decks/centaur.json"
+		"decks/monsters/centaur.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -2533,9 +2899,9 @@
 },
 {
 	"name": "Centaur Warrior",
-	"sprite": "sprites/centaur_2.atlas",
+	"sprite": "sprites/monsters/centaur_2.atlas",
 	"deck": [
-		"decks/centaur_warrior.dck"
+		"decks/monsters/centaur_warrior.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -2569,9 +2935,9 @@
 },
 {
 	"name": "Cephalid",
-	"sprite": "sprites/dungeon/cephalid.atlas",
+	"sprite": "sprites/monsters/mindflayer.atlas",
 	"deck": [
-		"decks/cephalid.dck"
+		"decks/monsters/cephalid.dck"
 	],
 	"ai": "",
 	"spawnRate": 0.8,
@@ -2662,12 +3028,12 @@
 {
 	"name": "Challenger 20",
 	"nameOverride": "Challenger",
-	"sprite": "sprites/doppelganger.atlas",
+	"sprite": "sprites/monsters/doppelganger.atlas",
 	"deck": [
-		"decks/challenger_20_allied_fires.dck",
-		"decks/challenger_20_cavalcade_charge.dck",
-		"decks/challenger_20_final_adventure.dck",
-		"decks/challenger_20_flash_of_ferocity.dck"
+		"decks/challenger/challenger_20_allied_fires.dck",
+		"decks/challenger/challenger_20_cavalcade_charge.dck",
+		"decks/challenger/challenger_20_final_adventure.dck",
+		"decks/challenger/challenger_20_flash_of_ferocity.dck"
 	],
 	"ai": "",
 	"randomizeDeck": true,
@@ -2756,12 +3122,12 @@
 {
 	"name": "Challenger 21",
 	"nameOverride": "Challenger",
-	"sprite": "sprites/doppelganger.atlas",
+	"sprite": "sprites/monsters/doppelganger.atlas",
 	"deck": [
-		"decks/challenger_21_azorius_control.dck",
-		"decks/challenger_21_dimir_rogue.dck",
-		"decks/challenger_21_mono-green_stompy.dck",
-		"decks/challenger_21_mono-red_aggro.dck"
+		"decks/challenger/challenger_21_azorius_control.dck",
+		"decks/challenger/challenger_21_dimir_rogue.dck",
+		"decks/challenger/challenger_21_mono-green_stompy.dck",
+		"decks/challenger/challenger_21_mono-red_aggro.dck"
 	],
 	"ai": "",
 	"randomizeDeck": true,
@@ -2850,12 +3216,12 @@
 {
 	"name": "Challenger 22",
 	"nameOverride": "Challenger",
-	"sprite": "sprites/doppelganger.atlas",
+	"sprite": "sprites/monsters/doppelganger.atlas",
 	"deck": [
-		"decks/challenger_22_dimir_control.dck",
-		"decks/challenger_22_gruul_stompy.dck",
-		"decks/challenger_22_mono_white_aggro.dck",
-		"decks/challenger_22_rakdos_vampires.dck"
+		"decks/challenger/challenger_22_dimir_control.dck",
+		"decks/challenger/challenger_22_gruul_stompy.dck",
+		"decks/challenger/challenger_22_mono_white_aggro.dck",
+		"decks/challenger/challenger_22_rakdos_vampires.dck"
 	],
 	"ai": "",
 	"randomizeDeck": true,
@@ -3047,9 +3413,9 @@
 },
 {
 	"name": "Chandra's Acolyte",
-	"sprite": "sprites/red_wiz2.atlas",
+	"sprite": "sprites/wizards/red_wiz2.atlas",
 	"deck": [
-		"decks/chandra1.dck"
+		"decks/wizards/chandra1.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -3152,9 +3518,9 @@
 },
 {
 	"name": "Chandra's Firestarter",
-	"sprite": "sprites/red_wiz3.atlas",
+	"sprite": "sprites/wizards/red_wiz3.atlas",
 	"deck": [
-		"decks/chandra2.dck"
+		"decks/wizards/chandra2.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -3257,9 +3623,9 @@
 },
 {
 	"name": "Chandra's Hellhound",
-	"sprite": "sprites/hellhound_2.atlas",
+	"sprite": "sprites/unholy/hellhound_2.atlas",
 	"deck": [
-		"decks/hellhound2.dck"
+		"decks/unholy/hellhound2.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -3361,9 +3727,9 @@
 },
 {
 	"name": "Chandra's Immolator",
-	"sprite": "sprites/red_wiz2.atlas",
+	"sprite": "sprites/wizards/red_wiz2.atlas",
 	"deck": [
-		"decks/chandra3.dck"
+		"decks/wizards/chandra3.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -3466,9 +3832,9 @@
 },
 {
 	"name": "Chandra's Lavamancer",
-	"sprite": "sprites/red_wiz3.atlas",
+	"sprite": "sprites/wizards/red_wiz3.atlas",
 	"deck": [
-		"decks/chandra4.dck"
+		"decks/wizards/chandra4.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -3571,9 +3937,9 @@
 },
 {
 	"name": "Chandra's Pyromancer",
-	"sprite": "sprites/red_wiz2.atlas",
+	"sprite": "sprites/wizards/red_wiz2.atlas",
 	"deck": [
-		"decks/chandra5.dck"
+		"decks/wizards/chandra5.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -3676,9 +4042,9 @@
 },
 {
 	"name": "Chandra's Scorcher",
-	"sprite": "sprites/red_wiz2.atlas",
+	"sprite": "sprites/wizards/red_wiz2.atlas",
 	"deck": [
-		"decks/chandra6.dck"
+		"decks/wizards/chandra6.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -3781,9 +4147,9 @@
 },
 {
 	"name": "Chicken",
-	"sprite": "sprites/dungeon/chicken.atlas",
+	"sprite": "sprites/animals/chicken.atlas",
 	"deck": [
-		"decks/chicken.dck"
+		"decks/animals/chicken.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -3828,10 +4194,10 @@
 	]
 },
 {
-	"name": "ClayGolem",
-	"sprite": "sprites/golem_2.atlas",
+	"name": "Clay Golem",
+	"sprite": "sprites/constructs/golem_2.atlas",
 	"deck": [
-		"decks/golem_good.json"
+		"decks/constructs/golem_good.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -3871,9 +4237,9 @@
 },
 {
 	"name": "Cleric",
-	"sprite": "sprites/cleric.atlas",
+	"sprite": "sprites/holy/cleric.atlas",
 	"deck": [
-		"decks/cleric.json"
+		"decks/holy/cleric.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -3954,9 +4320,9 @@
 {
 	"name": "Conjurer",
 	"nameOverride": "",
-	"sprite": "sprites/dungeon/warlockmaster.atlas",
+	"sprite": "sprites/miniboss/conjurer.atlas",
 	"deck": [
-		"decks/conjure.dck"
+		"decks/miniboss/conjure.dck"
 	],
 	"ai": "",
 	"boss": true,
@@ -4063,10 +4429,10 @@
 },
 {
 	"name": "Construct",
-	"sprite": "sprites/golem_3.atlas",
+	"sprite": "sprites/constructs/golem_3.atlas",
 	"deck": [
-		"decks/artificer.dck",
-		"decks/construct.json"
+		"decks/humans/artificer.dck",
+		"decks/constructs/construct.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -4132,9 +4498,9 @@
 },
 {
 	"name": "Copper Host Brutalizer",
-	"sprite": "sprites/copperhostbrutalizer.atlas",
+	"sprite": "sprites/phyrexians/copperhostbrutalizer.atlas",
 	"deck": [
-		"decks/copperhostbrutalizer.dck"
+		"decks/phyrexians/copperhostbrutalizer.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -4210,9 +4576,9 @@
 },
 {
 	"name": "Copper Host Infector",
-	"sprite": "sprites/copperhostinfector.atlas",
+	"sprite": "sprites/phyrexians/copperhostinfector.atlas",
 	"deck": [
-		"decks/copperhostinfector.json"
+		"decks/phyrexians/copperhostinfector.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -4288,10 +4654,10 @@
 },
 {
 	"name": "Crab",
-	"sprite": "sprites/crab.atlas",
+	"sprite": "sprites/animals/crab.atlas",
 	"deck": [
-		"decks/crab.json",
-		"decks/giant_crab"
+		"decks/animals/crab.json",
+		"decks/animals/giant_crab"
 	],
 	"ai": "",
 	"randomizeDeck": true,
@@ -4365,9 +4731,9 @@
 },
 {
 	"name": "Curselord",
-	"sprite": "sprites/black_wiz2.atlas",
+	"sprite": "sprites/wizards/black_wiz2.atlas",
 	"deck": [
-		"decks/curselord.dck"
+		"decks/wizards/curselord.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -4427,9 +4793,9 @@
 },
 {
 	"name": "Cyclops",
-	"sprite": "sprites/cyclops.atlas",
+	"sprite": "sprites/monsters/cyclops.atlas",
 	"deck": [
-		"decks/cyclops.dck"
+		"decks/monsters/cyclops.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -4463,9 +4829,9 @@
 },
 {
 	"name": "Dark Enchanter",
-	"sprite": "sprites/dreamwalker.atlas",
+	"sprite": "sprites/lizards/dreamwalker.atlas",
 	"deck": [
-		"decks/darkenchanter.dck"
+		"decks/lizards/darkenchanter.dck"
 	],
 	"ai": "",
 	"boss": true,
@@ -4531,9 +4897,9 @@
 },
 {
 	"name": "Dark Knight",
-	"sprite": "sprites/death_knight.atlas",
+	"sprite": "sprites/unholy/death_knight.atlas",
 	"deck": [
-		"decks/death_knight.json"
+		"decks/unholy/death_knight.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -4614,9 +4980,9 @@
 },
 {
 	"name": "Dark Spirit",
-	"sprite": "sprites/ghost.atlas",
+	"sprite": "sprites/unholy/ghost.atlas",
 	"deck": [
-		"decks/dark_spirit.dck"
+		"decks/unholy/dark_spirit.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -4695,9 +5061,9 @@
 },
 {
 	"name": "Dawnhart Witch",
-	"sprite": "sprites/dawnhart_witch.atlas",
+	"sprite": "sprites/unholy/dawnhart_witch.atlas",
 	"deck": [
-		"decks/dawnhart_witch.dck"
+		"decks/unholy/dawnhart_witch.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -4777,9 +5143,9 @@
 },
 {
 	"name": "Death Knight",
-	"sprite": "sprites/death_knight_2.atlas",
+	"sprite": "sprites/unholy/death_knight_2.atlas",
 	"deck": [
-		"decks/death_knight.dck"
+		"decks/unholy/death_knight.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -4860,12 +5226,16 @@
 },
 {
 	"name": "Demon",
-	"sprite": "sprites/demon_3.atlas",
+	"sprite": "sprites/unholy/demon_3.atlas",
 	"deck": [
-		"decks/demon.json"
+		"decks/unholy/demon.json",
+		"decks/unholy/demonshard.dck",
+		"decks/unholy/demonblackred.dck",
+		"decks/unholy/demonmonoblack.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
+	"randomizeDeck":true,
 	"difficulty": 0.1,
 	"speed": 31,
 	"life": 18,
@@ -4941,9 +5311,9 @@
 },
 {
 	"name": "Devil",
-	"sprite": "sprites/imp.atlas",
+	"sprite": "sprites/unholy/imp.atlas",
 	"deck": [
-		"decks/devil.json"
+		"decks/unholy/devil.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -4996,9 +5366,9 @@
 },
 {
 	"name": "Dimir Faerie",
-	"sprite": "sprites/pixie_dimir.atlas",
+	"sprite": "sprites/faeries/pixie_dimir.atlas",
 	"deck": [
-		"decks/dimir_faerie.dck"
+		"decks/faeries/dimir_faerie.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -5073,9 +5443,9 @@
 },
 {
 	"name": "Dino",
-	"sprite": "sprites/ancient.atlas",
+	"sprite": "sprites/lizards/ancient.atlas",
 	"deck": [
-		"decks/dinosaurs.json"
+		"decks/lizards/dinosaurs.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -5127,9 +5497,9 @@
 },
 {
 	"name": "Dinosaur",
-	"sprite": "sprites/ancient_2.atlas",
+	"sprite": "sprites/lizards/ancient_2.atlas",
 	"deck": [
-		"decks/dinosaur_w_r.dck"
+		"decks/lizards/dinosaur_w_r.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -5180,9 +5550,9 @@
 },
 {
 	"name": "Disciple of Teferi",
-	"sprite": "sprites/monk.atlas",
+	"sprite": "sprites/holy/monk.atlas",
 	"deck": [
-		"decks/disciple_of_teferi.dck"
+		"decks/humans/disciple_of_teferi.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -5252,9 +5622,9 @@
 },
 {
 	"name": "Djinn",
-	"sprite": "sprites/djinn.atlas",
+	"sprite": "sprites/monsters/djinn.atlas",
 	"deck": [
-		"decks/djinn.json"
+		"decks/monsters/djinn.json"
 	],
 	"ai": "",
 	"flying": true,
@@ -5336,10 +5706,10 @@
 },
 {
 	"name": "Dog",
-	"sprite": "sprites/dog.atlas",
+	"sprite": "sprites/animals/dog.atlas",
 	"deck": [
-		"decks/dog.json",
-		"decks/dog.dck"
+		"decks/animals/dog.json",
+		"decks/animals/dog.dck"
 	],
 	"ai": "",
 	"randomizeDeck": true,
@@ -5404,9 +5774,9 @@
 },
 {
 	"name": "Doppelganger",
-	"sprite": "sprites/doppelganger.atlas",
+	"sprite": "sprites/monsters/doppelganger.atlas",
 	"deck": [
-		"decks/mimic.dck"
+		"decks/monsters/mimic.dck"
 	],
 	"copyPlayerDeck": true,
 	"ai": "",
@@ -5453,9 +5823,9 @@
 },
 {
 	"name": "Dragon",
-	"sprite": "sprites/dragon.atlas",
+	"sprite": "sprites/monsters/dragon.atlas",
 	"deck": [
-		"decks/dragon.dck"
+		"decks/monsters/dragon.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -5537,9 +5907,9 @@
 },
 {
 	"name": "Dross Gladiator",
-	"sprite": "sprites/drossgladiator.atlas",
+	"sprite": "sprites/phyrexians/drossgladiator.atlas",
 	"deck": [
-		"decks/drossgladiator.json"
+		"decks/phyrexians/drossgladiator.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -5617,9 +5987,9 @@
 },
 {
 	"name": "Dross Grimnarch",
-	"sprite": "sprites/drossgrimnarch.atlas",
+	"sprite": "sprites/phyrexians/drossgrimnarch.atlas",
 	"deck": [
-		"decks/drossgrimnarch.dck"
+		"decks/phyrexians/drossgrimnarch.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -5698,9 +6068,9 @@
 },
 {
 	"name": "Dwarf",
-	"sprite": "sprites/dwarf_2.atlas",
+	"sprite": "sprites/dwarves/dwarf_2.atlas",
 	"deck": [
-		"decks/dwarf.json"
+		"decks/dwarves/dwarf.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -5784,9 +6154,9 @@
 {
 	"name": "Dwarf Demolisher",
 	"nameOverride": "",
-	"sprite": "sprites/dwarf_3.atlas",
+	"sprite": "sprites/dwarves/dwarf_3.atlas",
 	"deck": [
-		"decks/dwarfdemolisher.dck"
+		"decks/dwarves/dwarfdemolisher.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -5858,9 +6228,9 @@
 {
 	"name": "Dwarf Mercenary",
 	"nameOverride": "",
-	"sprite": "sprites/dwarf_4.atlas",
+	"sprite": "sprites/dwarves/dwarf_4.atlas",
 	"deck": [
-		"decks/dwarfmercenary.dck"
+		"decks/dwarves/dwarfmercenary.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -5944,9 +6314,9 @@
 {
 	"name": "Dwarf Pilot",
 	"nameOverride": "",
-	"sprite": "sprites/dwarfpilot.atlas",
+	"sprite": "sprites/dwarves/dwarfpilot.atlas",
 	"deck": [
-		"decks/dwarfpilot.dck"
+		"decks/dwarves/dwarfpilot.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -6017,9 +6387,9 @@
 },
 {
 	"name": "Efreet",
-	"sprite": "sprites/efreet_2.atlas",
+	"sprite": "sprites/monsters/efreet_2.atlas",
 	"deck": [
-		"decks/efreet.dck"
+		"decks/monsters/efreet.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -6054,9 +6424,9 @@
 },
 {
 	"name": "Eldraine Faerie",
-	"sprite": "sprites/pixie.atlas",
+	"sprite": "sprites/faeries/pixie.atlas",
 	"deck": [
-		"decks/eldraine_faerie.dck"
+		"decks/faeries/eldraine_faerie.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -6139,9 +6509,9 @@
 },
 {
 	"name": "Eldraine Knight",
-	"sprite": "sprites/paladin_2.atlas",
+	"sprite": "sprites/holy/paladin_2.atlas",
 	"deck": [
-		"decks/eldraine_knight.dck"
+		"decks/holy/eldraine_knight.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -6223,9 +6593,9 @@
 },
 {
 	"name": "Eldrazi",
-	"sprite": "sprites/mindelemental.atlas",
+	"sprite": "sprites/elementals/mindelemental.atlas",
 	"deck": [
-		"decks/eldrazi.json"
+		"decks/monsters/eldrazi.json"
 	],
 	"ai": "",
 	"flying": true,
@@ -6309,9 +6679,9 @@
 },
 {
 	"name": "Elephant",
-	"sprite": "sprites/dungeon/elephant.atlas",
+	"sprite": "sprites/animals/elephant.atlas",
 	"deck": [
-		"decks/elephant.json"
+		"decks/animals/elephant.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -6361,9 +6731,9 @@
 },
 {
 	"name": "Elemental",
-	"sprite": "sprites/crystalelemental.atlas",
+	"sprite": "sprites/elementals/crystalelemental.atlas",
 	"deck": [
-		"decks/elemental_blue.json"
+		"decks/elementals/elemental_blue.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -6441,9 +6811,9 @@
 },
 {
 	"name": "Elf",
-	"sprite": "sprites/druid.atlas",
+	"sprite": "sprites/elves/druid.atlas",
 	"deck": [
-		"decks/elf_bad.json"
+		"decks/elves/elf_bad.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -6486,9 +6856,9 @@
 },
 {
 	"name": "Elf warrior",
-	"sprite": "sprites/hunter.atlas",
+	"sprite": "sprites/elves/hunter.atlas",
 	"deck": [
-		"decks/elf_mid.json"
+		"decks/elves/elf_mid.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -6531,9 +6901,9 @@
 },
 {
 	"name": "Elk",
-	"sprite": "sprites/deer_2.atlas",
+	"sprite": "sprites/animals/deer_2.atlas",
 	"deck": [
-		"decks/elk.dck"
+		"decks/animals/elk.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -6648,9 +7018,9 @@
 },
 {
 	"name": "Eye",
-	"sprite": "sprites/eye.atlas",
+	"sprite": "sprites/monsters/eye.atlas",
 	"deck": [
-		"decks/eye.dck"
+		"decks/monsters/eye.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -6718,9 +7088,9 @@
 },
 {
 	"name": "Faerie",
-	"sprite": "sprites/pixie_2.atlas",
+	"sprite": "sprites/faeries/pixie_2.atlas",
 	"deck": [
-		"decks/faerie.json"
+		"decks/faeries/faerie.json"
 	],
 	"ai": "",
 	"flying": true,
@@ -6803,9 +7173,9 @@
 {
 	"name": "Farmer",
 	"nameOverride": "",
-	"sprite": "sprites/farmer.atlas",
+	"sprite": "sprites/humans/farmer.atlas",
 	"deck": [
-		"decks/farmer.dck"
+		"decks/humans/farmer.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -6889,9 +7259,9 @@
 {
 	"name": "Fire Dragon",
 	"nameOverride": "",
-	"sprite": "sprites/dungeon/firedragon.atlas",
+	"sprite": "sprites/monsters/firedragon.atlas",
 	"deck": [
-		"decks/firedragon.dck"
+		"decks/monsters/firedragon.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -6970,9 +7340,9 @@
 },
 {
 	"name": "Fire Elemental",
-	"sprite": "sprites/fireelemental.atlas",
+	"sprite": "sprites/elementals/fireelemental.atlas",
 	"deck": [
-		"decks/fire_elemental.dck"
+		"decks/elementals/fire_elemental.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -7053,9 +7423,9 @@
 },
 {
 	"name": "Fire Giant",
-	"sprite": "sprites/dungeon/firegiant.atlas",
+	"sprite": "sprites/giants/firegiant.atlas",
 	"deck": [
-		"decks/firegiant.dck"
+		"decks/giants/firegiant.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -7119,9 +7489,9 @@
 },
 {
 	"name": "Flame Elemental",
-	"sprite": "sprites/magmaelemental.atlas",
+	"sprite": "sprites/elementals/magmaelemental.atlas",
 	"deck": [
-		"decks/flame_elemental.dck"
+		"decks/elementals/flame_elemental.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -7200,9 +7570,9 @@
 },
 {
 	"name": "Flying Witch",
-	"sprite": "sprites/dungeon/flyingwitch.atlas",
+	"sprite": "sprites/unholy/flyingwitch.atlas",
 	"deck": [
-		"decks/witch.dck"
+		"decks/unholy/witch.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -7264,9 +7634,9 @@
 },
 {
 	"name": "Forest Giant",
-	"sprite": "sprites/dungeon/forestgiant.atlas",
+	"sprite": "sprites/giants/forestgiant.atlas",
 	"deck": [
-		"decks/foresttitan.dck"
+		"decks/giants/foresttitan.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -7330,11 +7700,13 @@
 },
 {
 	"name": "Fox",
-	"sprite": "sprites/fox.atlas",
+	"sprite": "sprites/animals/fox.atlas",
 	"deck": [
-		"decks/fox.json"
+		"decks/animals/fox.json",
+		"decks/animals/fox_greenwhite.json"
 	],
 	"ai": "",
+	"randomizeDeck": true,
 	"spawnRate": 1,
 	"difficulty": 0.1,
 	"speed": 20,
@@ -7392,9 +7764,9 @@
 },
 {
 	"name": "Frog",
-	"sprite": "sprites/frog.atlas",
+	"sprite": "sprites/animals/frog.atlas",
 	"deck": [
-		"decks/frog.json"
+		"decks/animals/frog.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -7459,9 +7831,9 @@
 },
 {
 	"name": "Frost Titan",
-	"sprite": "sprites/titan.atlas",
+	"sprite": "sprites/giants/titan.atlas",
 	"deck": [
-		"decks/frost_titan.dck"
+		"decks/giants/frost_titan.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -7546,9 +7918,9 @@
 },
 {
 	"name": "Fungus",
-	"sprite": "sprites/fungus.atlas",
+	"sprite": "sprites/monsters/fungus.atlas",
 	"deck": [
-		"decks/fungus.json"
+		"decks/monsters/fungus.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -7632,9 +8004,9 @@
 },
 {
 	"name": "Furnace Goblin",
-	"sprite": "sprites/furnacegoblin.atlas",
+	"sprite": "sprites/phyrexians/furnacegoblin.atlas",
 	"deck": [
-		"decks/furnacegoblin.json"
+		"decks/phyrexians/furnacegoblin.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -7711,9 +8083,9 @@
 },
 {
 	"name": "Furnace Tormentor",
-	"sprite": "sprites/furnacetormentor.atlas",
+	"sprite": "sprites/phyrexians/furnacetormentor.atlas",
 	"deck": [
-		"decks/furnacetormentor.dck"
+		"decks/phyrexians/furnacetormentor.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -7792,15 +8164,15 @@
 },
 {
 	"name": "Gargoyle",
-	"sprite": "sprites/gargoyle.atlas",
+	"sprite": "sprites/monsters/gargoyle.atlas",
 	"deck": [
-		"decks/gargoyle.json"
+		"decks/monsters/gargoyle.json"
 	],
 	"ai": "",
 	"flying": true,
 	"spawnRate": 1,
 	"difficulty": 0.1,
-	"speed": 31,
+	"speed": 23,
 	"life": 17,
 	"rewards": [
 		{
@@ -7882,15 +8254,15 @@
 },
 {
 	"name": "Gargoyle 2",
-	"sprite": "sprites/gargoyle_2.atlas",
+	"sprite": "sprites/monsters/gargoyle_2.atlas",
 	"deck": [
-		"decks/gargoyle.dck"
+		"decks/monsters/gargoyle.dck"
 	],
 	"ai": "",
 	"flying": true,
 	"spawnRate": 0.5,
 	"difficulty": 0.1,
-	"speed": 31,
+	"speed": 25,
 	"life": 16,
 	"rewards": [
 		{
@@ -8092,9 +8464,9 @@
 },
 {
 	"name": "Geist",
-	"sprite": "sprites/ghost.atlas",
+	"sprite": "sprites/unholy/ghost.atlas",
 	"deck": [
-		"decks/ghost_blue.dck"
+		"decks/unholy/ghost_blue.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -8174,9 +8546,9 @@
 },
 {
 	"name": "Ghoul",
-	"sprite": "sprites/ghoul.atlas",
+	"sprite": "sprites/unholy/ghoul.atlas",
 	"deck": [
-		"decks/ghoul.dck"
+		"decks/unholy/ghoul.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -8209,9 +8581,9 @@
 },
 {
 	"name": "Ghost",
-	"sprite": "sprites/ghost_2.atlas",
+	"sprite": "sprites/unholy/ghost_2.atlas",
 	"deck": [
-		"decks/ghost.json"
+		"decks/unholy/ghost.json"
 	],
 	"ai": "",
 	"flying": true,
@@ -8292,9 +8664,9 @@
 },
 {
 	"name": "Giant Spider",
-	"sprite": "sprites/spider_2.atlas",
+	"sprite": "sprites/arachnida/spider_purple.atlas",
 	"deck": [
-		"decks/spider_token.dck"
+		"decks/arachnida/spider_token.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -8329,9 +8701,9 @@
 },
 {
 	"name": "Gitaxian Scientist",
-	"sprite": "sprites/gitaxianscientist.atlas",
+	"sprite": "sprites/phyrexians/gitaxianscientist.atlas",
 	"deck": [
-		"decks/gitaxianscientist.dck"
+		"decks/phyrexians/gitaxianscientist.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -8411,9 +8783,9 @@
 },
 {
 	"name": "Gitaxian Underling",
-	"sprite": "sprites/gitaxianunderling.atlas",
+	"sprite": "sprites/phyrexians/gitaxianunderling.atlas",
 	"deck": [
-		"decks/gitaxianunderling.json"
+		"decks/phyrexians/gitaxianunderling.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -8491,9 +8863,9 @@
 {
 	"name": "Grave Titan",
 	"nameOverride": "",
-	"sprite": "sprites/dungeon/gravetitan.atlas",
+	"sprite": "sprites/giants/gravetitan.atlas",
 	"deck": [
-		"decks/gravetitan.dck"
+		"decks/giants/gravetitan.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -8548,9 +8920,9 @@
 },
 {
 	"name": "Greater Zombie",
-	"sprite": "sprites/zombie.atlas",
+	"sprite": "sprites/unholy/zombie.atlas",
 	"deck": [
-		"decks/zombie_greater.dck"
+		"decks/unholy/zombie_greater.dck"
 	],
 	"spawnRate": 1,
 	"difficulty": 0.2,
@@ -8752,9 +9124,9 @@
 },
 {
 	"name": "Gorilla",
-	"sprite": "sprites/dungeon/gorilla.atlas",
+	"sprite": "sprites/animals/gorilla.atlas",
 	"deck": [
-		"decks/gorilla.dck"
+		"decks/animals/gorilla.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -8828,9 +9200,9 @@
 {
 	"name": "Loamspeaker",
 	"nameOverride": "",
-	"sprite": "sprites/shaman.atlas",
+	"sprite": "sprites/lizards/shaman.atlas",
 	"deck": [
-		"decks/loamspeaker.dck"
+		"decks/lizards/loamspeaker.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -8913,9 +9285,9 @@
 {
 	"name": "Gladiator",
 	"nameOverride": "",
-	"sprite": "sprites/dungeon/gladiator.atlas",
+	"sprite": "sprites/humans/gladiator.atlas",
 	"deck": [
-		"decks/gladiator.dck"
+		"decks/humans/gladiator.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -8968,9 +9340,9 @@
 },
 {
 	"name": "Goblin",
-	"sprite": "sprites/goblin.atlas",
+	"sprite": "sprites/goblins/goblin.atlas",
 	"deck": [
-		"decks/goblin_bad.json"
+		"decks/goblins/goblin_bad.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -9023,9 +9395,9 @@
 },
 {
 	"name": "Goblin Artificer",
-	"sprite": "sprites/goblin.atlas",
+	"sprite": "sprites/goblins/goblin.atlas",
 	"deck": [
-		"decks/goblin_artificer.dck"
+		"decks/goblins/goblin_artificer.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -9086,9 +9458,9 @@
 },
 {
 	"name": "Goblin Chief",
-	"sprite": "sprites/wolf_rider_2.atlas",
+	"sprite": "sprites/goblins/wolf_rider_2.atlas",
 	"deck": [
-		"decks/goblin_good.json"
+		"decks/goblins/goblin_good.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -9138,9 +9510,9 @@
 },
 {
 	"name": "Goblin pack",
-	"sprite": "sprites/goblin_group.atlas",
+	"sprite": "sprites/goblins/goblin_group.atlas",
 	"deck": [
-		"decks/goblin_bad.json"
+		"decks/goblins/goblin_bad.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -9201,9 +9573,9 @@
 },
 {
 	"name": "Goblin Warrior",
-	"sprite": "sprites/wolf_rider.atlas",
+	"sprite": "sprites/goblins/wolf_rider.atlas",
 	"deck": [
-		"decks/goblin_mid.json"
+		"decks/goblins/goblin_mid.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -9250,9 +9622,9 @@
 },
 {
 	"name": "Golem",
-	"sprite": "sprites/golem.atlas",
+	"sprite": "sprites/constructs/golem.atlas",
 	"deck": [
-		"decks/golem.json"
+		"decks/constructs/golem.json"
 	],
 	"ai": "",
 	"spawnRate": 0.1,
@@ -9300,9 +9672,9 @@
 },
 {
 	"name": "Golem that is Generous",
-	"sprite": "sprites/golem.atlas",
+	"sprite": "sprites/constructs/golem.atlas",
 	"deck": [
-		"decks/golem.json"
+		"decks/constructs/golem.json"
 	],
 	"ai": "",
 	"spawnRate": 0.1,
@@ -9361,9 +9733,9 @@
 },
 {
 	"name": "Golgari Elf",
-	"sprite": "sprites/elf_golgari.atlas",
+	"sprite": "sprites/elves/elf_golgari.atlas",
 	"deck": [
-		"decks/elf_golgari.dck"
+		"decks/elves/elf_golgari.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -9429,9 +9801,9 @@
 },
 {
 	"name": "Golgari Fungus",
-	"sprite": "sprites/fungus_golgari.atlas",
+	"sprite": "sprites/monsters/fungus_golgari.atlas",
 	"deck": [
-		"decks/fungus_golgari.dck"
+		"decks/monsters/fungus_golgari.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -9491,9 +9863,9 @@
 },
 {
 	"name": "Golgari Treefolk",
-	"sprite": "sprites/treant_golgari.atlas",
+	"sprite": "sprites/monsters/treant_golgari.atlas",
 	"deck": [
-		"decks/treefolk_golgari.dck"
+		"decks/monsters/treefolk_golgari.dck"
 	],
 	"spawnRate": 1,
 	"difficulty": 0.2,
@@ -9576,9 +9948,9 @@
 },
 {
 	"name": "Gorgon",
-	"sprite": "sprites/gorgone.atlas",
+	"sprite": "sprites/monsters/gorgone.atlas",
 	"deck": [
-		"decks/gorgon.dck"
+		"decks/monsters/gorgon.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -9660,9 +10032,9 @@
 },
 {
 	"name": "Gorgon 2",
-	"sprite": "sprites/gorgonen.atlas",
+	"sprite": "sprites/monsters/gorgonen.atlas",
 	"deck": [
-		"decks/gorgon_2.dck"
+		"decks/monsters/gorgon_2.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -9744,9 +10116,9 @@
 },
 {
 	"name": "Green Beast",
-	"sprite": "sprites/basilisk.atlas",
+	"sprite": "sprites/lizards/basilisk.atlas",
 	"deck": [
-		"decks/beast_green.json"
+		"decks/monsters/beast_green.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -9825,257 +10197,11 @@
 		"BiomeGreen"
 	]
 },
-{
-	"name": "Green Wiz1",
-	"sprite": "sprites/green_wiz1.atlas",
-	"deck": [
-		"decks/green_bad.json"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 24,
-	"life": 10,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 4,
-			"rarity": [
-				"common",
-				"basicland"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.5,
-			"count": 1,
-			"addMaxCount": 2,
-			"rarity": [
-				"uncommon"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.25,
-			"count": 1,
-			"addMaxCount": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.1,
-			"count": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Land"
-			]
-		},
-		{
-			"type": "gold",
-			"probability": 0.3,
-			"count": 10,
-			"addMaxCount": 90
-		}
-	],
-	"colors": "G",
-	"questTags": [
-		"Nature",
-		"Wizard",
-		"Human",
-		"IdentityGreen",
-		"BiomeGreen",
-		"BiomeColorless"
-	]
-},
-{
-	"name": "Green Wiz2",
-	"sprite": "sprites/green_wiz2.atlas",
-	"deck": [
-		"decks/trample.dck"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 24,
-	"life": 10,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 4,
-			"rarity": [
-				"common",
-				"uncommon"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.5,
-			"count": 1,
-			"addMaxCount": 2,
-			"rarity": [
-				"uncommon"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.25,
-			"count": 1,
-			"addMaxCount": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.1,
-			"count": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Land"
-			]
-		},
-		{
-			"type": "gold",
-			"probability": 0.3,
-			"count": 10,
-			"addMaxCount": 90
-		}
-	],
-	"colors": "G",
-	"questTags": [
-		"Nature",
-		"Wizard",
-		"Human",
-		"IdentityGreen",
-		"BiomeGreen",
-		"BiomeColorless"
-	]
-},
-{
-	"name": "Green Wiz3",
-	"sprite": "sprites/green_wiz3.atlas",
-	"deck": [
-		"decks/ramp.dck"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 24,
-	"life": 10,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 4,
-			"rarity": [
-				"common",
-				"basicland"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.5,
-			"count": 1,
-			"addMaxCount": 2,
-			"rarity": [
-				"uncommon"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.25,
-			"count": 1,
-			"addMaxCount": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.1,
-			"count": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Land"
-			]
-		},
-		{
-			"type": "gold",
-			"probability": 0.3,
-			"count": 10,
-			"addMaxCount": 90
-		}
-	],
-	"colors": "G",
-	"questTags": [
-		"Nature",
-		"Wizard",
-		"Human",
-		"IdentityGreen",
-		"BiomeGreen",
-		"BiomeColorless"
-	]
-},
 {
 	"name": "Griffin",
-	"sprite": "sprites/griffin.atlas",
+	"sprite": "sprites/animals/griffin.atlas",
 	"deck": [
-		"decks/griffin.json"
+		"decks/animals/griffin.json"
 	],
 	"ai": "",
 	"flying": true,
@@ -10191,9 +10317,9 @@
 },
 {
 	"name": "Harpy",
-	"sprite": "sprites/harpy.atlas",
+	"sprite": "sprites/monsters/harpy.atlas",
 	"deck": [
-		"decks/harpy.dck"
+		"decks/monsters/harpy.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -10274,9 +10400,9 @@
 },
 {
 	"name": "Harpy 2",
-	"sprite": "sprites/harpy_2.atlas",
+	"sprite": "sprites/monsters/harpy_2.atlas",
 	"deck": [
-		"decks/harpy_2.dck"
+		"decks/monsters/harpy_2.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -10359,9 +10485,9 @@
 },
 {
 	"name": "Hellhound",
-	"sprite": "sprites/hellhound_2.atlas",
+	"sprite": "sprites/unholy/hellhound_2.atlas",
 	"deck": [
-		"decks/hellhound.dck"
+		"decks/unholy/hellhound.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -10447,7 +10573,7 @@
 	"name": "Hidden Bush",
 	"sprite": "sprites/dungeon/hiddenbush.atlas",
 	"deck": [
-		"decks/plant.dck"
+		"decks/monsters/plant.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -10500,7 +10626,7 @@
 	"name": "Hidden Snake",
 	"sprite": "sprites/dungeon/cobradungeon.atlas",
 	"deck": [
-		"decks/snake.json"
+		"decks/lizards/snake.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -10551,9 +10677,9 @@
 },
 {
 	"name": "High Elf",
-	"sprite": "sprites/druid_2.atlas",
+	"sprite": "sprites/elves/druid_2.atlas",
 	"deck": [
-		"decks/elf_good.json"
+		"decks/elves/elf_good.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -10599,9 +10725,9 @@
 },
 {
 	"name": "High Vampire",
-	"sprite": "sprites/vampire_2.atlas",
+	"sprite": "sprites/unholy/vampire_2.atlas",
 	"deck": [
-		"decks/vampire.json"
+		"decks/unholy/vampire.json"
 	],
 	"ai": "",
 	"flying": true,
@@ -10685,9 +10811,9 @@
 },
 {
 	"name": "Hippo",
-	"sprite": "sprites/dungeon/hippo.atlas",
+	"sprite": "sprites/animals/hippo.atlas",
 	"deck": [
-		"decks/hippo.dck"
+		"decks/animals/hippo.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -10733,9 +10859,9 @@
 },
 {
 	"name": "Homarid",
-	"sprite": "sprites/dungeon/homarid.atlas",
+	"sprite": "sprites/monsters/homarid.atlas",
 	"deck": [
-		"decks/homarid.dck"
+		"decks/monsters/homarid.dck"
 	],
 	"ai": "",
 	"spawnRate": 0.8,
@@ -10794,9 +10920,9 @@
 },
 {
 	"name": "Horror",
-	"sprite": "sprites/leech_2.atlas",
+	"sprite": "sprites/monsters/leech_2.atlas",
 	"deck": [
-		"decks/horror.dck"
+		"decks/monsters/horror.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -10878,9 +11004,9 @@
 },
 {
 	"name": "Horse",
-	"sprite": "sprites/dungeon/horse.atlas",
+	"sprite": "sprites/animals/horse.atlas",
 	"deck": [
-		"decks/horse.dck"
+		"decks/animals/horse.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -10935,9 +11061,9 @@
 },
 {
 	"name": "Horseman",
-	"sprite": "sprites/cavalier_2.atlas",
+	"sprite": "sprites/humans/cavalier_2.atlas",
 	"deck": [
-		"decks/horsemanship.dck"
+		"decks/humans/horsemanship.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -10982,9 +11108,9 @@
 },
 {
 	"name": "Human",
-	"sprite": "sprites/pikeman.atlas",
+	"sprite": "sprites/humans/pikeman.atlas",
 	"deck": [
-		"decks/human_bad.json"
+		"decks/humans/human_bad.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -11029,9 +11155,9 @@
 },
 {
 	"name": "Human elite",
-	"sprite": "sprites/legionite.atlas",
+	"sprite": "sprites/humans/legionite.atlas",
 	"deck": [
-		"decks/human_good.json"
+		"decks/humans/human_good.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -11075,9 +11201,9 @@
 },
 {
 	"name": "Human guard",
-	"sprite": "sprites/swordsman.atlas",
+	"sprite": "sprites/humans/swordsman.atlas",
 	"deck": [
-		"decks/human_mid.json"
+		"decks/humans/human_mid.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -11123,9 +11249,9 @@
 {
 	"name": "Human Mercenary",
 	"nameOverride": "",
-	"sprite": "sprites/swordsman_3.atlas",
+	"sprite": "sprites/humans/swordsman_3.atlas",
 	"deck": [
-		"decks/humanmercenary.dck"
+		"decks/humans/humanmercenary.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -11207,9 +11333,9 @@
 },
 {
 	"name": "Hydra",
-	"sprite": "sprites/hydra.atlas",
+	"sprite": "sprites/monsters/hydra.atlas",
 	"deck": [
-		"decks/hydra.json"
+		"decks/monsters/hydra.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -11253,9 +11379,9 @@
 },
 {
 	"name": "Illusionist",
-	"sprite": "sprites/blue_wiz2.atlas",
+	"sprite": "sprites/wizards/blue_wiz2.atlas",
 	"deck": [
-		"decks/illusion.dck"
+		"decks/wizards/illusion.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -11303,9 +11429,9 @@
 },
 {
 	"name": "Insect",
-	"sprite": "sprites/dragonfly.atlas",
+	"sprite": "sprites/arachnida/dragonfly.atlas",
 	"deck": [
-		"decks/insect.dck"
+		"decks/arachnida/insect.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -11364,9 +11490,9 @@
 },
 {
 	"name": "Immersturm Demon",
-	"sprite": "sprites/devil_2.atlas",
+	"sprite": "sprites/unholy/devil_2.atlas",
 	"deck": [
-		"decks/immersturm_demon.dck"
+		"decks/unholy/immersturm_demon.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -11448,9 +11574,9 @@
 },
 {
 	"name": "Jackal Warrior",
-	"sprite": "sprites/jackalwarrior.atlas",
+	"sprite": "sprites/monsters/jackalwarrior.atlas",
 	"deck": [
-		"decks/jackal.dck"
+		"decks/monsters/jackal.dck"
 	],
 	"ai": "",
 	"spawnRate": 0.3,
@@ -11578,9 +11704,9 @@
 },
 {
 	"name": "Jellyfish",
-	"sprite": "sprites/jellyfish.atlas",
+	"sprite": "sprites/animals/jellyfish.atlas",
 	"deck": [
-		"decks/jellyfish.dck"
+		"decks/animals/jellyfish.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -11638,9 +11764,9 @@
 },
 {
 	"name": "Kavu",
-	"sprite": "sprites/kavu.atlas",
+	"sprite": "sprites/monsters/kavu.atlas",
 	"deck": [
-		"decks/kavu.dck"
+		"decks/monsters/kavu.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -11728,9 +11854,9 @@
 },
 {
 	"name": "Khan",
-	"sprite": "sprites/cavalier.atlas",
+	"sprite": "sprites/humans/cavalier.atlas",
 	"deck": [
-		"decks/mardu.dck"
+		"decks/humans/mardu.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -11907,9 +12033,9 @@
 },
 {
 	"name": "Knight",
-	"sprite": "sprites/paladin.atlas",
+	"sprite": "sprites/holy/paladin.atlas",
 	"deck": [
-		"decks/knight.json"
+		"decks/holy/knight.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -11953,9 +12079,9 @@
 {
 	"name": "Knight Mercenary",
 	"nameOverride": "",
-	"sprite": "sprites/cavalier_2.atlas",
+	"sprite": "sprites/humans/cavalier_2.atlas",
 	"deck": [
-		"decks/knightmercenary.dck"
+		"decks/humans/knightmercenary.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -12036,10 +12162,400 @@
 	]
 },
 {
-	"name": "Kobold",
-	"sprite": "sprites/kobold.atlas",
+	"name": "Kobold Dragoncaller",
+	"nameOverride": "",
+	"sprite": "sprites/kobolds/kobolddragoncaller.atlas",
 	"deck": [
-		"decks/kobold.dck"
+		"decks/kobolds/koboldworker.dck"
+	],
+	"ai": "",
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 31,
+	"scale": 0.75,
+	"life": 12,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 8,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
+		},
+		{
+			"type": "card",
+			"probability": 0.5,
+			"count": 1,
+			"rarity": [
+				"Rare"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 50,
+			"addMaxCount": 100
+		},
+		{
+			"type": "card",
+			"probability": 1,
+			"count": 1,
+			"rarity": [
+				"uncommon",
+				"common"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		}
+	],
+	"colors": "RB",
+	"questTags": [
+		"Kobold",
+		"Coward",
+		"Sneaky",
+		"Small",
+		"Humanoid",
+		"Thief",
+		"IdentityRed",
+		"IdentityBlack",
+		"IdentityRakdos",
+		"BiomeRed"
+	]
+},
+{
+	"name": "Kobold Pyromancer",
+	"nameOverride": "",
+	"sprite": "sprites/kobolds/koboldpyromancer.atlas",
+	"deck": [
+		"decks/kobolds/koboldworker.dck"
+	],
+	"ai": "",
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 31,
+	"scale": 0.75,
+	"life": 12,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 8,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
+		},
+		{
+			"type": "card",
+			"probability": 0.5,
+			"count": 1,
+			"rarity": [
+				"Rare"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 50,
+			"addMaxCount": 100
+		},
+		{
+			"type": "card",
+			"probability": 1,
+			"count": 1,
+			"rarity": [
+				"uncommon",
+				"common"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		}
+	],
+	"colors": "RB",
+	"questTags": [
+		"Kobold",
+		"Coward",
+		"Sneaky",
+		"Small",
+		"Humanoid",
+		"Thief",
+		"IdentityRed",
+		"IdentityBlack",
+		"IdentityRakdos",
+		"BiomeRed"
+	]
+},
+{
+	"name": "Kobold Shaman",
+	"nameOverride": "",
+	"sprite": "sprites/kobolds/koboldshaman.atlas",
+	"deck": [
+		"decks/kobolds/koboldworker.dck"
+	],
+	"ai": "",
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 31,
+	"scale": 0.75,
+	"life": 12,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 8,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
+		},
+		{
+			"type": "card",
+			"probability": 0.5,
+			"count": 1,
+			"rarity": [
+				"Rare"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 50,
+			"addMaxCount": 100
+		},
+		{
+			"type": "card",
+			"probability": 1,
+			"count": 1,
+			"rarity": [
+				"uncommon",
+				"common"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		}
+	],
+	"colors": "RB",
+	"questTags": [
+		"Kobold",
+		"Coward",
+		"Sneaky",
+		"Small",
+		"Humanoid",
+		"Thief",
+		"IdentityRed",
+		"IdentityBlack",
+		"IdentityRakdos",
+		"BiomeRed"
+	]
+},
+{
+	"name": "Kobold Slinger",
+	"nameOverride": "",
+	"sprite": "sprites/kobolds/koboldshaman.atlas",
+	"deck": [
+		"decks/kobolds/koboldworker.dck"
+	],
+	"ai": "",
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 31,
+	"scale": 0.75,
+	"life": 12,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 8,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
+		},
+		{
+			"type": "card",
+			"probability": 0.5,
+			"count": 1,
+			"rarity": [
+				"Rare"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 50,
+			"addMaxCount": 100
+		},
+		{
+			"type": "card",
+			"probability": 1,
+			"count": 1,
+			"rarity": [
+				"uncommon",
+				"common"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		}
+	],
+	"colors": "RB",
+	"questTags": [
+		"Kobold",
+		"Coward",
+		"Sneaky",
+		"Small",
+		"Humanoid",
+		"Thief",
+		"IdentityRed",
+		"IdentityBlack",
+		"IdentityRakdos",
+		"BiomeRed"
+	]
+},
+{
+	"name": "Kobold Trapmaster",
+	"nameOverride": "",
+	"sprite": "sprites/kobolds/koboldtrapmaster.atlas",
+	"deck": [
+		"decks/kobolds/koboldworker.dck"
+	],
+	"ai": "",
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 31,
+	"scale": 0.75,
+	"life": 12,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 8,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
+		},
+		{
+			"type": "card",
+			"probability": 0.5,
+			"count": 1,
+			"rarity": [
+				"Rare"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 50,
+			"addMaxCount": 100
+		},
+		{
+			"type": "card",
+			"probability": 1,
+			"count": 1,
+			"rarity": [
+				"uncommon",
+				"common"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		}
+	],
+	"colors": "RB",
+	"questTags": [
+		"Kobold",
+		"Coward",
+		"Sneaky",
+		"Small",
+		"Humanoid",
+		"Thief",
+		"IdentityRed",
+		"IdentityBlack",
+		"IdentityRakdos",
+		"BiomeRed"
+	]
+},
+{
+	"name": "Kobold Warrior",
+	"nameOverride": "",
+	"sprite": "sprites/kobolds/koboldwarrior.atlas",
+	"deck": [
+		"decks/kobolds/koboldworker.dck"
+	],
+	"ai": "",
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 31,
+	"scale": 0.75,
+	"life": 12,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 8,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
+		},
+		{
+			"type": "card",
+			"probability": 0.5,
+			"count": 1,
+			"rarity": [
+				"Rare"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 50,
+			"addMaxCount": 100
+		},
+		{
+			"type": "card",
+			"probability": 1,
+			"count": 1,
+			"rarity": [
+				"uncommon",
+				"common"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		}
+	],
+	"colors": "RB",
+	"questTags": [
+		"Kobold",
+		"Coward",
+		"Sneaky",
+		"Small",
+		"Humanoid",
+		"Thief",
+		"IdentityRed",
+		"IdentityBlack",
+		"IdentityRakdos",
+		"BiomeRed"
+	]
+},
+{
+	"name": "Kobold Worker",
+	"sprite": "sprites/kobolds/koboldworker.atlas",
+	"deck": [
+		"decks/kobolds/koboldworker.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -12101,9 +12617,9 @@
 },
 {
 	"name": "Kor Warrior",
-	"sprite": "sprites/mineguard.atlas",
+	"sprite": "sprites/kor/mineguard.atlas",
 	"deck": [
-		"decks/kor_warrior.dck"
+		"decks/kor/kor_warrior.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -12158,9 +12674,9 @@
 },
 {
 	"name": "Lich",
-	"sprite": "sprites/lich_2.atlas",
+	"sprite": "sprites/unholy/lich_2.atlas",
 	"deck": [
-		"decks/lich.dck"
+		"decks/unholy/lich.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -12283,10 +12799,93 @@
 	]
 },
 {
-	"name": "Lightning Elemental",
-	"sprite": "sprites/lightningelemental.atlas",
+	"name": "Leonin Warrior",
+	"sprite": "sprites/leonin/lion.atlas",
 	"deck": [
-		"decks/lightning_elemental.dck"
+		"decks/animals/cat.json"
+	],
+	"ai": "",
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 27,
+	"life": 15,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"basicland"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.5,
+			"count": 1,
+			"addMaxCount": 2,
+			"rarity": [
+				"uncommon"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.25,
+			"count": 1,
+			"addMaxCount": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.1,
+			"count": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 0.3,
+			"count": 10,
+			"addMaxCount": 90
+		}
+	],
+	"colors": "GW",
+	"questTags": [
+		"Cat",
+		"Humanoid",
+		"Soldier",
+		"IdentityGreen",
+		"IdentityWhite",
+		"IdentitySelesnya",
+		"BiomeWhite"
+	]
+},
+{
+	"name": "Lightning Elemental",
+	"sprite": "sprites/elementals/lightningelemental.atlas",
+	"deck": [
+		"decks/elementals/lightning_elemental.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -12388,7 +12987,7 @@
 },
 {
 	"name": "Liliana",
-	"sprite": "sprites/black_wiz3.atlas",
+	"sprite": "sprites/wizards/black_wiz3.atlas",
 	"deck": [
 		"decks/miniboss/liliana_zombies.dck"
 	],
@@ -12492,9 +13091,9 @@
 },
 {
 	"name": "Liliana's Alchemist",
-	"sprite": "sprites/dimir_wiz.atlas",
+	"sprite": "sprites/wizards/dimir_wiz.atlas",
 	"deck": [
-		"decks/dimir_ninja.dck"
+		"decks/wizards/dimir_ninja.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -12573,9 +13172,9 @@
 },
 {
 	"name": "Liliana's Herbalist",
-	"sprite": "sprites/black_wizard.atlas",
+	"sprite": "sprites/wizards/black_wizard.atlas",
 	"deck": [
-		"decks/lilianas_herbalist.dck"
+		"decks/wizards/lilianas_herbalist.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -12696,9 +13295,9 @@
 },
 {
 	"name": "Magma Elemental",
-	"sprite": "sprites/magmaelemental.atlas",
+	"sprite": "sprites/elementals/magmaelemental.atlas",
 	"deck": [
-		"decks/magma_elemental.dck"
+		"decks/elementals/magma_elemental.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -12801,9 +13400,9 @@
 },
 {
 	"name": "Magma Fire Elemental",
-	"sprite": "sprites/magmafireelemental.atlas",
+	"sprite": "sprites/elementals/magmafireelemental.atlas",
 	"deck": [
-		"decks/magma_elemental.dck"
+		"decks/elementals/magma_elemental.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -12863,10 +13462,298 @@
 	]
 },
 {
-	"name": "Merfolk",
-	"sprite": "sprites/waterelemental.atlas",
+	"name": "Master Black Wizard",
+	"sprite": "sprites/wizards/black_wiz3.atlas",
 	"deck": [
-		"decks/merfolk_bad.json"
+		"decks/wizards/blackwizard_hard_gravepact.dck",
+		"decks/wizards/blackwizard_hard_knight.dck",
+		"decks/wizards/blackwizard_hard_liliana.dck",
+		"decks/wizards/blackwizard_hard_sacrifice.dck"
+	],
+	"ai": "",
+	"randomizeDeck": true,
+	"spawnRate": 0.5,
+	"difficulty": 0.1,
+	"speed": 25,
+	"life": 20,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 8
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 100,
+			"addMaxCount": 200
+		}
+	],
+	"colors": "B",
+	"questTags": [
+		"Wizard",
+		"Necromancer",
+		"IdentityBlack",
+		"BiomeColorless",
+		"BiomeBlack"
+	]
+},
+{
+	"name": "Master Blue Wizard",
+	"sprite": "sprites/wizards/mage_2.atlas",
+	"deck": [
+		"decks/wizards/bluewizard_hard_control.dck",
+		"decks/wizards/bluewizard_hard_control2.dck",
+		"decks/wizards/bluewizard_hard_artifact.dck",
+		"decks/wizards/bluewizard_hard_bounce.dck"
+	],
+	"ai": "",
+	"flying": true,
+	"randomizeDeck": true,
+	"spawnRate": 0.5,
+	"difficulty": 0.1,
+	"speed": 25,
+	"life": 20,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 8
+		},
+		{
+			"type": "gold",
+			"count": 50,
+			"addMaxCount": 300
+		}
+	],
+	"colors": "U",
+	"questTags": [
+		"Human",
+		"Wizard",
+		"Illusionist",
+		"IdentityBlue",
+		"BiomeColorless",
+		"BiomeBlue"
+	]
+},
+{
+	"name": "Master Green Wizard",
+	"sprite": "sprites/wizards/green_wiz3.atlas",
+	"deck": [
+		"decks/wizards/greenwizard_hard_ramp.dck",
+		"decks/wizards/greenwizard_hard_rampbis.dck",
+		"decks/wizards/greenwizard_hard_sapproling.dck"
+	],
+	"ai": "",
+	"randomizeDeck": true,
+	"spawnRate": 0.5,
+	"difficulty": 0.1,
+	"speed": 24,
+	"life": 20,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"basicland"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.5,
+			"count": 1,
+			"addMaxCount": 2,
+			"rarity": [
+				"uncommon"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.25,
+			"count": 1,
+			"addMaxCount": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.1,
+			"count": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 0.3,
+			"count": 10,
+			"addMaxCount": 90
+		}
+	],
+	"colors": "G",
+	"questTags": [
+		"Nature",
+		"Wizard",
+		"Human",
+		"IdentityGreen",
+		"BiomeGreen",
+		"BiomeColorless"
+	]
+},
+{
+	"name": "Master Red Wizard",
+	"sprite": "sprites/wizards/red_wiz3.atlas",
+	"deck": [
+		"decks/wizards/redwizard_hard_burn.dck",
+		"decks/wizards/redwizard_hard_dragons.dck",
+		"decks/wizards/redwizard_hard_fight.dck",
+		"decks/wizards/redwizard_hard_lavaaxe.dck"
+	],
+	"ai": "",
+	"randomizeDeck": true,
+	"spawnRate": 0.5,
+	"difficulty": 0.1,
+	"speed": 24,
+	"life": 20,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 8
+		},
+		{
+			"type": "gold",
+			"count": 50,
+			"addMaxCount": 300
+		}
+	],
+	"colors": "R",
+	"questTags": [
+		"Wizard",
+		"Human",
+		"Fire",
+		"Pyromancer",
+		"IdentityRed",
+		"BiomeRed",
+		"BiomeColorless"
+	]
+},
+{
+	"name": "Master White Wizard",
+	"sprite": "sprites/wizards/white_wiz3.atlas",
+	"deck": [
+		"decks/wizards/whitewizard_hard_humility.dck",
+		"decks/wizards/whitewizard_hard_hatebears.dck",
+		"decks/wizards/whitewizard_hard_humansoldier.dck",
+		"decks/wizards/whitewizard_hard_armaggedon.dck",
+		"decks/wizards/whitewizard_hard_enchantments.dck"
+	],
+	"ai": "",
+	"randomizeDeck": true,
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 24,
+	"life": 10,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"basicland"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.5,
+			"count": 1,
+			"addMaxCount": 2,
+			"rarity": [
+				"uncommon"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.25,
+			"count": 1,
+			"addMaxCount": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Creature",
+				"Artifact",
+				"Enchantment",
+				"Instant",
+				"Sorcery"
+			]
+		},
+		{
+			"type": "deckCard",
+			"probability": 0.1,
+			"count": 1,
+			"rarity": [
+				"rare"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 0.3,
+			"count": 10,
+			"addMaxCount": 90
+		}
+	],
+	"colors": "W",
+	"questTags": [
+		"Holy",
+		"Wizard",
+		"Human",
+		"IdentityWhite",
+		"BiomeColorless",
+		"BiomeWhite"
+	]
+},
+{
+	"name": "Merfolk",
+	"sprite": "sprites/elementals/waterelemental.atlas",
+	"deck": [
+		"decks/merfolk/merfolk_bad.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -12912,9 +13799,9 @@
 },
 {
 	"name": "Merfolk Avatar",
-	"sprite": "sprites/iceelemental.atlas",
+	"sprite": "sprites/elementals/iceelemental.atlas",
 	"deck": [
-		"decks/merfolk_good.json"
+		"decks/merfolk/merfolk_good.json"
 	],
 	"ai": "",
 	"flying": true,
@@ -12962,9 +13849,9 @@
 },
 {
 	"name": "Merfolk Fighter",
-	"sprite": "sprites/merfolk.atlas",
+	"sprite": "sprites/merfolk/merfolk.atlas",
 	"deck": [
-		"decks/merfolk_lords.dck"
+		"decks/merfolk/merfolk_lords.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -13021,9 +13908,9 @@
 },
 {
 	"name": "Merfolk Lord",
-	"sprite": "sprites/merfolk_lord.atlas",
+	"sprite": "sprites/merfolk/merfolk_lord.atlas",
 	"deck": [
-		"decks/merfolk_lord2.dck"
+		"decks/merfolk/merfolk_lord2.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -13082,9 +13969,9 @@
 },
 {
 	"name": "Merfolk Soldier",
-	"sprite": "sprites/mermaid.atlas",
+	"sprite": "sprites/merfolk/mermaid.atlas",
 	"deck": [
-		"decks/merfolk_v_goblins.dck"
+		"decks/merfolk/merfolk_v_goblins.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -13131,9 +14018,9 @@
 },
 {
 	"name": "Merfolk warrior",
-	"sprite": "sprites/airelemental.atlas",
+	"sprite": "sprites/elementals/airelemental.atlas",
 	"deck": [
-		"decks/merfolk_mid.json"
+		"decks/merfolk/merfolk_mid.json"
 	],
 	"ai": "",
 	"flying": true,
@@ -13181,9 +14068,9 @@
 },
 {
 	"name": "Mimic",
-	"sprite": "sprites/mimic.atlas",
+	"sprite": "sprites/dungeon/mimic.atlas",
 	"deck": [
-		"decks/mimic.dck"
+		"decks/dungeon/mimic.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -13265,9 +14152,9 @@
 },
 {
 	"name": "Mindclaw Shaman",
-	"sprite": "sprites/dreamwalker.atlas",
+	"sprite": "sprites/lizards/dreamwalker.atlas",
 	"deck": [
-		"decks/mindclaw_shaman.dck"
+		"decks/lizards/mindclaw_shaman.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -13353,12 +14240,16 @@
 },
 {
 	"name": "Minotaur",
-	"sprite": "sprites/minotaur.atlas",
+	"sprite": "sprites/monsters/minotaur.atlas",
 	"deck": [
-		"decks/minotaur.json"
+		"decks/monsters/minotaur.json",
+		"decks/monsters/minotaurblackredmadness.dck",
+		"decks/monsters/minotaurmid.dck",
+		"decks/monsters/minotaurmonored.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
+	"randomizeDeck":true,
 	"difficulty": 0.1,
 	"speed": 25,
 	"life": 16,
@@ -13436,9 +14327,9 @@
 },
 {
 	"name": "Minotaur Flayer",
-	"sprite": "sprites/warden_2.atlas",
+	"sprite": "sprites/unholy/warden_2.atlas",
 	"deck": [
-		"decks/minotaur.dck"
+		"decks/monsters/minotaur.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -13522,10 +14413,10 @@
 },
 {
 	"name": "Monk",
-	"sprite": "sprites/monk.atlas",
+	"sprite": "sprites/holy/monk.atlas",
 	"deck": [
-		"decks/angel.json",
-		"decks/monk.json"
+		"decks/holy/angel.json",
+		"decks/holy/monk.json"
 	],
 	"ai": "",
 	"randomizeDeck": true,
@@ -13605,9 +14496,9 @@
 },
 {
 	"name": "Mummy",
-	"sprite": "sprites/mummy.atlas",
+	"sprite": "sprites/unholy/mummy.atlas",
 	"deck": [
-		"decks/mummy.dck"
+		"decks/unholy/mummy.dck"
 	],
 	"ai": "",
 	"spawnRate": 0.5,
@@ -13736,9 +14627,9 @@
 },
 {
 	"name": "Necromancer",
-	"sprite": "sprites/black_wiz2.atlas",
+	"sprite": "sprites/wizards/black_wiz2.atlas",
 	"deck": [
-		"decks/reanimator.dck"
+		"decks/wizards/reanimator.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -13789,10 +14680,74 @@
 	]
 },
 {
-	"name": "Octopus",
-	"sprite": "sprites/octopus.atlas",
+	"name": "Nezumi Ninja",
+	"sprite": "sprites/nezumi/humanoidrat.atlas",
 	"deck": [
-		"decks/octopus.dck"
+		"decks/nezumi/humanoidrat.dck"
+	],
+	"ai": "",
+	"spawnRate": 1,
+	"difficulty": 0.1,
+	"speed": 15,
+	"scale": 0.75,
+	"life": 10,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 2,
+			"addMaxCount": 4,
+			"rarity": [
+				"common",
+				"uncommon"
+			]
+		},
+		{
+			"type": "card",
+			"probability": 0.5,
+			"count": 1,
+			"rarity": [
+				"Rare"
+			],
+			"cardText": "Rat"
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 50,
+			"addMaxCount": 100
+		},
+		{
+			"type": "card",
+			"probability": 1,
+			"count": 1,
+			"rarity": [
+				"uncommon",
+				"common"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		}
+	],
+	"questTags": [
+		"Humanoid",
+		"Ninja",
+		"Bandit",
+		"Rat",
+		"Sneaky",
+		"Thief",
+		"Subterranean",
+		"Scavenger",
+		"IdentityBlack",
+		"BiomeBlack"
+	]
+},
+{
+	"name": "Octopus",
+	"sprite": "sprites/animals/octopus.atlas",
+	"deck": [
+		"decks/animals/octopus.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -13852,11 +14807,15 @@
 },
 {
 	"name": "Ooze",
-	"sprite": "sprites/ooze.atlas",
+	"sprite": "sprites/monsters/ooze.atlas",
 	"deck": [
-		"decks/ooze.json"
+		"decks/monsters/ooze.json",
+		"decks/monsters/ooze_greenblackred.dck",
+		"decks/monsters/ooze_monogreen.dck",
+		"decks/monsters/ooze_greenblue.dck"
 	],
 	"ai": "",
+	"randomizeDeck": true,
 	"spawnRate": 1,
 	"difficulty": 0.1,
 	"speed": 15,
@@ -14007,9 +14966,9 @@
 },
 {
 	"name": "Owl",
-	"sprite": "sprites/owl.atlas",
+	"sprite": "sprites/animals/owl.atlas",
 	"deck": [
-		"decks/owl.dck"
+		"decks/animals/owl.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -14076,9 +15035,9 @@
 },
 {
 	"name": "Orzhov Cleric",
-	"sprite": "sprites/cleric_orzhov.atlas",
+	"sprite": "sprites/holy/cleric_orzhov.atlas",
 	"deck": [
-		"decks/cleric_orzhov.dck"
+		"decks/holy/cleric_orzhov.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -14161,9 +15120,9 @@
 },
 {
 	"name": "Pirate",
-	"sprite": "sprites/pirate.atlas",
+	"sprite": "sprites/humans/pirate.atlas",
 	"deck": [
-		"decks/pirate.dck"
+		"decks/humans/pirate.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -14241,10 +15200,10 @@
 },
 {
 	"name": "Plant",
-	"sprite": "sprites/plant.atlas",
+	"sprite": "sprites/monsters/plant.atlas",
 	"deck": [
-		"decks/plant.json",
-		"decks/plant.dck"
+		"decks/monsters/plant.json",
+		"decks/monsters/plant.dck"
 	],
 	"ai": "",
 	"randomizeDeck": true,
@@ -14302,15 +15261,15 @@
 {
 	"name": "Pyromancer",
 	"nameOverride": "",
-	"sprite": "sprites/dungeon/pyromancer.atlas",
+	"sprite": "sprites/wizards/pyromancer.atlas",
 	"deck": [
-		"decks/pyromancer.dck"
+		"decks/wizards/pyromancer.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
 	"difficulty": 0.1,
 	"speed": 21,
-	"scale":0.75,
+	"scale": 0.75,
 	"life": 18,
 	"rewards": [
 		{
@@ -14350,9 +15309,9 @@
 },
 {
 	"name": "Orthodoxy Angel",
-	"sprite": "sprites/phyrexianangel.atlas",
+	"sprite": "sprites/phyrexians/phyrexianangel.atlas",
 	"deck": [
-		"decks/phyrexianangel.dck"
+		"decks/phyrexians/phyrexianangel.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -14430,9 +15389,9 @@
 },
 {
 	"name": "Orthodoxy Duelist",
-	"sprite": "sprites/phyrexianduelist.atlas",
+	"sprite": "sprites/phyrexians/phyrexianduelist.atlas",
 	"deck": [
-		"decks/phyrexianduelist.json"
+		"decks/phyrexians/phyrexianduelist.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -14510,9 +15469,9 @@
 },
 {
 	"name": "Phoenix",
-	"sprite": "sprites/phoenix.atlas",
+	"sprite": "sprites/monsters/phoenix.atlas",
 	"deck": [
-		"decks/phoenix.dck"
+		"decks/monsters/phoenix.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -14617,9 +15576,9 @@
 },
 {
 	"name": "Rakdos Devil",
-	"sprite": "sprites/juggler.atlas",
+	"sprite": "sprites/unholy/juggler.atlas",
 	"deck": [
-		"decks/rakdos_devil.dck"
+		"decks/unholy/rakdos_devil.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -14656,10 +15615,10 @@
 	]
 },
 {
-	"name": "Rakdos Wiz",
-	"sprite": "sprites/rakdos_wiz.atlas",
+	"name": "Rakdos Wizard",
+	"sprite": "sprites/wizards/rakdos_wiz.atlas",
 	"deck": [
-		"decks/rakdos_vamps.dck"
+		"decks/wizards/rakdos_vamps.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -14735,75 +15694,11 @@
 		"IdentityRakdos"
 	]
 },
-{
-	"name": "Rat Ninja",
-	"sprite": "sprites/humanoidrat.atlas",
-	"deck": [
-		"decks/humanoidrat.dck"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 15,
-	"scale": 0.75,
-	"life": 10,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 4,
-			"rarity": [
-				"common",
-				"uncommon"
-			]
-		},
-		{
-			"type": "card",
-			"probability": 0.5,
-			"count": 1,
-			"rarity": [
-				"Rare"
-			],
-			"cardText": "Rat"
-		},
-		{
-			"type": "gold",
-			"probability": 1,
-			"count": 50,
-			"addMaxCount": 100
-		},
-		{
-			"type": "card",
-			"probability": 1,
-			"count": 1,
-			"rarity": [
-				"uncommon",
-				"common"
-			],
-			"cardTypes": [
-				"Land"
-			]
-		}
-	],
-	"questTags": [
-		"Humanoid",
-		"Ninja",
-		"Bandit",
-		"Rat",
-		"Sneaky",
-		"Thief",
-		"Subterranean",
-		"Scavenger",
-		"IdentityBlack",
-		"BiomeBlack"
-	]
-},
 {
 	"name": "Raven",
-	"sprite": "sprites/raven.atlas",
+	"sprite": "sprites/animals/raven.atlas",
 	"deck": [
-		"decks/raven.dck"
+		"decks/animals/raven.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -14874,9 +15769,9 @@
 },
 {
 	"name": "Red Beast",
-	"sprite": "sprites/basilisk_2.atlas",
+	"sprite": "sprites/lizards/basilisk_2.atlas",
 	"deck": [
-		"decks/beast_red.json"
+		"decks/monsters/beast_red.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -14957,9 +15852,9 @@
 },
 {
 	"name": "Reassembling Skeleton",
-	"sprite": "sprites/skeleton.atlas",
+	"sprite": "sprites/unholy/skeleton.atlas",
 	"deck": [
-		"decks/reassemblingskeleton.dck"
+		"decks/unholy/reassemblingskeleton.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -14988,164 +15883,11 @@
 		"BiomeBlack"
 	]
 },
-{
-	"name": "Red Wiz1",
-	"sprite": "sprites/enchanter.atlas",
-	"deck": [
-		"decks/red_bad.json"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 24,
-	"life": 8,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 4,
-			"rarity": [
-				"common",
-				"basicland"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.5,
-			"count": 1,
-			"addMaxCount": 2,
-			"rarity": [
-				"uncommon"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.25,
-			"count": 1,
-			"addMaxCount": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.1,
-			"count": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Land"
-			]
-		},
-		{
-			"type": "gold",
-			"probability": 0.3,
-			"count": 10,
-			"addMaxCount": 90
-		}
-	],
-	"colors": "R",
-	"questTags": [
-		"Wizard",
-		"Human",
-		"Fire",
-		"Pyromancer",
-		"IdentityRed",
-		"BiomeRed",
-		"BiomeColorless"
-	]
-},
-{
-	"name": "Red Wiz2",
-	"sprite": "sprites/red_wiz2.atlas",
-	"deck": [
-		"decks/haste_burn.dck"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 24,
-	"life": 10,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 8
-		},
-		{
-			"type": "gold",
-			"count": 25,
-			"addMaxCount": 200
-		}
-	],
-	"colors": "R",
-	"questTags": [
-		"Wizard",
-		"Human",
-		"Fire",
-		"Pyromancer",
-		"IdentityRed",
-		"BiomeRed",
-		"BiomeColorless"
-	]
-},
-{
-	"name": "Red Wiz3",
-	"sprite": "sprites/red_wiz3.atlas",
-	"deck": [
-		"decks/lava_axe.dck"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 24,
-	"life": 14,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 8
-		},
-		{
-			"type": "gold",
-			"count": 50,
-			"addMaxCount": 300
-		}
-	],
-	"colors": "R",
-	"questTags": [
-		"Wizard",
-		"Human",
-		"Fire",
-		"Pyromancer",
-		"IdentityRed",
-		"BiomeRed",
-		"BiomeColorless"
-	]
-},
 {
 	"name": "Rogue",
-	"sprite": "sprites/rogue.atlas",
+	"sprite": "sprites/humans/rogue.atlas",
 	"deck": [
-		"decks/rogue.json"
+		"decks/humans/rogue.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -15177,10 +15919,64 @@
 	]
 },
 {
-	"name": "Sand Golem",
-	"sprite": "sprites/dungeon/sandelemental.atlas",
+	"name": "Runelord",
+	"sprite": "sprites/wizards/runescribe.atlas",
 	"deck": [
-		"decks/sandgolem.dck"
+		"decks/wizards/runelord.dck"
+	],
+	"ai": "",
+	"spawnRate": 0.5,
+	"difficulty": 0.1,
+	"speed": 25,
+	"life": 20,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 3,
+			"addMaxCount": 6
+		},
+		{
+			"type": "card",
+			"probability": 0.5,
+			"count": 4,
+			"rarity": [
+				"Rare"
+			]
+		},
+		{
+			"type": "card",
+			"probability": 1,
+			"count": 3,
+			"rarity": [
+				"uncomon",
+				"common"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 50,
+			"addMaxCount": 100
+		}
+	],
+	"colors": "B",
+	"questTags": [
+		"Necromancer",
+		"Unholy",
+		"Wizard",
+		"Human",
+		"IdentityBlack"
+	]
+},
+{
+	"name": "Sand Golem",
+	"sprite": "sprites/elementals/sandelemental.atlas",
+	"deck": [
+		"decks/elementals/sandgolem.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -15225,9 +16021,9 @@
 },
 {
 	"name": "Sandwurm",
-	"sprite": "sprites/dungeon/sandwurm.atlas",
+	"sprite": "sprites/monsters/sandwurm.atlas",
 	"deck": [
-		"decks/sandwurm.dck"
+		"decks/monsters/sandwurm.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -15269,9 +16065,9 @@
 },
 {
 	"name": "Satyr",
-	"sprite": "sprites/satyr.atlas",
+	"sprite": "sprites/monsters/satyr.atlas",
 	"deck": [
-		"decks/satyr.dck"
+		"decks/monsters/satyr.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -15353,9 +16149,9 @@
 },
 {
 	"name": "Scarab",
-	"sprite": "sprites/dungeon/scarab.atlas",
+	"sprite": "sprites/arachnida/scarab.atlas",
 	"deck": [
-		"decks/scarab.dck"
+		"decks/arachnida/scarab.dck"
 	],
 	"ai": "",
 	"spawnRate": 0.8,
@@ -15413,9 +16209,9 @@
 },
 {
 	"name": "Scarecrow",
-	"sprite": "sprites/dungeon/scarecrow.atlas",
+	"sprite": "sprites/monsters/scarecrow.atlas",
 	"deck": [
-		"decks/scarecrow.dck"
+		"decks/monsters/scarecrow.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -15472,9 +16268,9 @@
 },
 {
 	"name": "Scarecrow Captain",
-	"sprite": "sprites/dungeon/scarecrow.atlas",
+	"sprite": "sprites/monsters/scarecrow.atlas",
 	"deck": [
-		"decks/scarecrowcaptain.dck"
+		"decks/monsters/scarecrowcaptain.dck"
 	],
 	"ai": "",
 	"boss": true,
@@ -15537,9 +16333,9 @@
 },
 {
 	"name": "Scorpion",
-	"sprite": "sprites/scorpion.atlas",
+	"sprite": "sprites/arachnida/scorpion.atlas",
 	"deck": [
-		"decks/scorpion.dck"
+		"decks/arachnida/scorpion.dck"
 	],
 	"ai": "",
 	"spawnRate": 0.8,
@@ -15598,9 +16394,9 @@
 },
 {
 	"name": "Sea Monster",
-	"sprite": "sprites/leech_2.atlas",
+	"sprite": "sprites/monsters/leech_2.atlas",
 	"deck": [
-		"decks/sea_monster.dck"
+		"decks/monsters/sea_monster.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -15679,9 +16475,9 @@
 },
 {
 	"name": "Shaman",
-	"sprite": "sprites/shaman_2.atlas",
+	"sprite": "sprites/lizards/shaman_2.atlas",
 	"deck": [
-		"decks/shaman.json"
+		"decks/lizards/shaman.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -15764,9 +16560,9 @@
 {
 	"name": "Shaman of Zedruu",
 	"nameOverride": "",
-	"sprite": "sprites/pikelizard.atlas",
+	"sprite": "sprites/lizards/pikelizard.atlas",
 	"deck": [
-		"decks/shamanelite.dck"
+		"decks/lizards/shamanelite.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -15847,10 +16643,67 @@
 	]
 },
 {
-	"name": "Skeleton",
-	"sprite": "sprites/skeleton.atlas",
+	"name": "Simic Wizard",
+	"sprite": "sprites/lizards/lizardwizard.atlas",
 	"deck": [
-		"decks/skeleton.dck"
+		"decks/wizards/simicwizard_intruderalarm.dck",
+		"decks/wizards/simicwizard_evolve.dck"
+	],
+	"ai": "",
+	"randomizeDeck": true,
+	"spawnRate": 0.5,
+	"difficulty": 0.1,
+	"speed": 25,
+	"scale": 0.75,
+	"life": 20,
+	"rewards": [
+		{
+			"type": "deckCard",
+			"probability": 1,
+			"count": 3,
+			"addMaxCount": 6
+		},
+		{
+			"type": "card",
+			"probability": 0.5,
+			"count": 4,
+			"rarity": [
+				"Rare"
+			]
+		},
+		{
+			"type": "card",
+			"probability": 1,
+			"count": 3,
+			"rarity": [
+				"uncomon",
+				"common"
+			],
+			"cardTypes": [
+				"Land"
+			]
+		},
+		{
+			"type": "gold",
+			"probability": 1,
+			"count": 50,
+			"addMaxCount": 100
+		}
+	],
+	"colors": "B",
+	"questTags": [
+		"Necromancer",
+		"Unholy",
+		"Wizard",
+		"Human",
+		"IdentityBlack"
+	]
+},
+{
+	"name": "Skeleton",
+	"sprite": "sprites/unholy/skeleton.atlas",
+	"deck": [
+		"decks/unholy/skeleton.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -15881,9 +16734,9 @@
 },
 {
 	"name": "Skeleton Soldier",
-	"sprite": "sprites/skeleton_2.atlas",
+	"sprite": "sprites/unholy/skeleton_2.atlas",
 	"deck": [
-		"decks/skeleton_2.dck"
+		"decks/unholy/skeleton_2.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -15915,9 +16768,9 @@
 },
 {
 	"name": "Skeleton Champion",
-	"sprite": "sprites/skeleton_2.atlas",
+	"sprite": "sprites/unholy/skeleton_2.atlas",
 	"deck": [
-		"decks/skeleton_champion.dck"
+		"decks/unholy/skeleton_champion.dck"
 	],
 	"spawnRate": 1,
 	"difficulty": 0.2,
@@ -16081,9 +16934,9 @@
 },
 {
 	"name": "Sliver",
-	"sprite": "sprites/sliver.atlas",
+	"sprite": "sprites/monsters/sliver.atlas",
 	"deck": [
-		"decks/sliver.json"
+		"decks/monsters/sliver.json"
 	],
 	"ai": "",
 	"spawnRate": 0.5,
@@ -16245,9 +17098,9 @@
 },
 {
 	"name": "Snake",
-	"sprite": "sprites/big_snake.atlas",
+	"sprite": "sprites/lizards/big_snake.atlas",
 	"deck": [
-		"decks/snake.json"
+		"decks/lizards/snake.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -16329,9 +17182,9 @@
 },
 {
 	"name": "Spider",
-	"sprite": "sprites/spider.atlas",
+	"sprite": "sprites/arachnida/spider_black.atlas",
 	"deck": [
-		"decks/spider.json"
+		"decks/arachnida/spider.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -16414,9 +17267,9 @@
 },
 {
 	"name": "Storm Titan",
-	"sprite": "sprites/dungeon/stormtitan.atlas",
+	"sprite": "sprites/giants/stormtitan.atlas",
 	"deck": [
-		"decks/stormtitan.dck"
+		"decks/giant/stormtitan.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -16468,11 +17321,15 @@
 },
 {
 	"name": "Stray Cat",
-	"sprite": "sprites/cat.atlas",
+	"sprite": "sprites/animals/cat.atlas",
 	"deck": [
-		"decks/straycat.dck"
+		"decks/animals/cat_greenblack.dck",
+		"decks/animals/straycat.dck",
+		"decks/animals/cat_greenwhite.dck",
+		"decks/animals/cat_greenwhite2.dck"
 	],
 	"ai": "",
+	"randomizeDeck": true,
 	"spawnRate": 1,
 	"difficulty": 0.1,
 	"speed": 15,
@@ -16528,9 +17385,9 @@
 },
 {
 	"name": "Sun Giant",
-	"sprite": "sprites/dungeon/ascendedtitan.atlas",
+	"sprite": "sprites/giants/ascendedtitan.atlas",
 	"deck": [
-		"decks/sun titan.dck"
+		"decks/giants/sun titan.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -16589,9 +17446,9 @@
 },
 {
 	"name": "Squirrel",
-	"sprite": "sprites/squirrel.atlas",
+	"sprite": "sprites/animals/squirrel.atlas",
 	"deck": [
-		"decks/squirrel.dck"
+		"decks/animals/squirrel.dck"
 	],
 	"ai": "",
 	"spawnRate": 0.5,
@@ -16640,9 +17497,9 @@
 },
 {
 	"name": "Swamp Troll",
-	"sprite": "sprites/dungeon/swamptroll.atlas",
+	"sprite": "sprites/monsters/swamptroll.atlas",
 	"deck": [
-		"decks/swamptroll.dck"
+		"decks/monsters/swamptroll.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -16739,9 +17596,9 @@
 },
 {
 	"name": "Symbiote",
-	"sprite": "sprites/basilisk_3.atlas",
+	"sprite": "sprites/lizards/basilisk_3.atlas",
 	"deck": [
-		"decks/symbiote.dck"
+		"decks/lizards/symbiote.dck"
 	],
 	"ai": "",
 	"spawnRate": 0.5,
@@ -16825,9 +17682,9 @@
 },
 {
 	"name": "Tarkir Djinn",
-	"sprite": "sprites/djinn_2.atlas",
+	"sprite": "sprites/monsters/djinn_2.atlas",
 	"deck": [
-		"decks/djinn_tarkir.dck"
+		"decks/monsters/djinn_tarkir.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -16939,7 +17796,7 @@
 {
 	"name": "The Cheff",
 	"nameOverride": "",
-	"sprite": "sprites/dungeon/ironcheffboss.atlas",
+	"sprite": "sprites/miniboss/ironcheffboss.atlas",
 	"deck": [
 		"decks/miniboss/thecheff.dck"
 	],
@@ -17147,9 +18004,9 @@
 },
 {
 	"name": "Torturer",
-	"sprite": "sprites/dungeon/torturer.atlas",
+	"sprite": "sprites/miniboss/torturer.atlas",
 	"deck": [
-		"decks/torturer.dck"
+		"decks/miniboss/torturer.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -17204,9 +18061,9 @@
 },
 {
 	"name": "Turtle",
-	"sprite": "sprites/turtle.atlas",
+	"sprite": "sprites/animals/turtle.atlas",
 	"deck": [
-		"decks/turtle.json"
+		"decks/animals/turtle.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -17268,9 +18125,9 @@
 },
 {
 	"name": "Treefolk",
-	"sprite": "sprites/treant.atlas",
+	"sprite": "sprites/monsters/treant.atlas",
 	"deck": [
-		"decks/treefolk.json"
+		"decks/monsters/treefolk.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -17324,9 +18181,9 @@
 },
 {
 	"name": "Treefolk Guardian",
-	"sprite": "sprites/treant_2.atlas",
+	"sprite": "sprites/monsters/treant_2.atlas",
 	"deck": [
-		"decks/treefolk.dck"
+		"decks/monsters/treefolk.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -17407,9 +18264,9 @@
 },
 {
 	"name": "Troll",
-	"sprite": "sprites/troll.atlas",
+	"sprite": "sprites/monsters/troll.atlas",
 	"deck": [
-		"decks/troll.json"
+		"decks/monsters/troll.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -17490,9 +18347,9 @@
 },
 {
 	"name": "Vampire",
-	"sprite": "sprites/vampire.atlas",
+	"sprite": "sprites/unholy/vampire.atlas",
 	"deck": [
-		"decks/vampire.dck"
+		"decks/unholy/vampire.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -17522,9 +18379,9 @@
 },
 {
 	"name": "Vampire Lord",
-	"sprite": "sprites/vampire_3.atlas",
+	"sprite": "sprites/unholy/vampire_3.atlas",
 	"deck": [
-		"decks/vampire_blood_token_fly.dck"
+		"decks/unholy/vampire_blood_token_fly.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -17555,9 +18412,9 @@
 },
 {
 	"name": "Viashino",
-	"sprite": "sprites/battler.atlas",
+	"sprite": "sprites/lizards/battler.atlas",
 	"deck": [
-		"decks/viashino.dck"
+		"decks/lizards/viashino.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -17639,9 +18496,9 @@
 },
 {
 	"name": "Viper",
-	"sprite": "sprites/big_snake_2.atlas",
+	"sprite": "sprites/lizards/big_snake_2.atlas",
 	"deck": [
-		"decks/snake.dck"
+		"decks/lizards/snake.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -17726,9 +18583,9 @@
 },
 {
 	"name": "Volcano Elemental",
-	"sprite": "sprites/volcanoelemental.atlas",
+	"sprite": "sprites/elementals/volcanoelemental.atlas",
 	"deck": [
-		"decks/br_elemental.dck"
+		"decks/elementals/br_elemental.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -17832,9 +18689,9 @@
 },
 {
 	"name": "Walking Brain",
-	"sprite": "sprites/walkingbrain.atlas",
+	"sprite": "sprites/monsters/walkingbrain.atlas",
 	"deck": [
-		"decks/walkingbrain.dck"
+		"decks/monsters/walkingbrain.dck"
 	],
 	"ai": "",
 	"spawnRate": 0.3,
@@ -17894,9 +18751,9 @@
 },
 {
 	"name": "Wasp",
-	"sprite": "sprites/dungeon/wasp.atlas",
+	"sprite": "sprites/arachnida/wasp.atlas",
 	"deck": [
-		"decks/insect.dck"
+		"decks/arachnida/insect.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -17954,9 +18811,9 @@
 },
 {
 	"name": "Werewolf",
-	"sprite": "sprites/hellhound.atlas",
+	"sprite": "sprites/unholy/hellhound.atlas",
 	"deck": [
-		"decks/werewolf.dck"
+		"decks/monsters/werewolf.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -17995,9 +18852,9 @@
 },
 {
 	"name": "White Dwarf",
-	"sprite": "sprites/dwarf_6.atlas",
+	"sprite": "sprites/dwarves/dwarf_6.atlas",
 	"deck": [
-		"decks/white_dwarf.dck"
+		"decks/dwarves/white_dwarf.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -18028,262 +18885,13 @@
 		"BiomeWhite"
 	]
 },
-{
-	"name": "White Wiz1",
-	"sprite": "sprites/priest.atlas",
-	"deck": [
-		"decks/white_bad.json"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 24,
-	"life": 10,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 4,
-			"rarity": [
-				"common",
-				"basicland"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.5,
-			"count": 1,
-			"addMaxCount": 2,
-			"rarity": [
-				"uncommon"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.25,
-			"count": 1,
-			"addMaxCount": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.1,
-			"count": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Land"
-			]
-		},
-		{
-			"type": "gold",
-			"probability": 0.3,
-			"count": 10,
-			"addMaxCount": 90
-		}
-	],
-	"colors": "W",
-	"questTags": [
-		"Holy",
-		"Wizard",
-		"Human",
-		"Religious",
-		"IdentityWhite",
-		"BiomeColorless",
-		"BiomeWhite"
-	]
-},
-{
-	"name": "White Wiz2",
-	"sprite": "sprites/white_wiz2.atlas",
-	"deck": [
-		"decks/basri.dck"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 24,
-	"life": 10,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 4,
-			"rarity": [
-				"common",
-				"basicland"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.5,
-			"count": 1,
-			"addMaxCount": 2,
-			"rarity": [
-				"uncommon"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.25,
-			"count": 1,
-			"addMaxCount": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.1,
-			"count": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Land"
-			]
-		},
-		{
-			"type": "gold",
-			"probability": 0.3,
-			"count": 10,
-			"addMaxCount": 90
-		}
-	],
-	"colors": "W",
-	"questTags": [
-		"Holy",
-		"Wizard",
-		"Human",
-		"Religious",
-		"Passive",
-		"IdentityWhite",
-		"BiomeColorless",
-		"BiomeWhite"
-	]
-},
-{
-	"name": "White Wiz3",
-	"sprite": "sprites/white_wiz3.atlas",
-	"deck": [
-		"decks/human_soldier_token.dck"
-	],
-	"ai": "",
-	"spawnRate": 1,
-	"difficulty": 0.1,
-	"speed": 24,
-	"life": 10,
-	"rewards": [
-		{
-			"type": "deckCard",
-			"probability": 1,
-			"count": 2,
-			"addMaxCount": 4,
-			"rarity": [
-				"common",
-				"basicland"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.5,
-			"count": 1,
-			"addMaxCount": 2,
-			"rarity": [
-				"uncommon"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.25,
-			"count": 1,
-			"addMaxCount": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Creature",
-				"Artifact",
-				"Enchantment",
-				"Instant",
-				"Sorcery"
-			]
-		},
-		{
-			"type": "deckCard",
-			"probability": 0.1,
-			"count": 1,
-			"rarity": [
-				"rare"
-			],
-			"cardTypes": [
-				"Land"
-			]
-		},
-		{
-			"type": "gold",
-			"probability": 0.3,
-			"count": 10,
-			"addMaxCount": 90
-		}
-	],
-	"colors": "W",
-	"questTags": [
-		"Holy",
-		"Wizard",
-		"Human",
-		"IdentityWhite",
-		"BiomeColorless",
-		"BiomeWhite"
-	]
-},
 {
 	"name": "Wild Rat",
-	"sprite": "sprites/wildrat.atlas",
+	"sprite": "sprites/animals/wildrat.atlas",
 	"deck": [
-		"decks/infectrat.dck",
-		"decks/rat.json",
-		"decks/ratswarm.dck"
+		"decks/animals/infectrat.dck",
+		"decks/animals/rat.json",
+		"decks/animals/ratswarm.dck"
 	],
 	"ai": "",
 	"randomizeDeck": true,
@@ -18346,9 +18954,9 @@
 },
 {
 	"name": "Wild-Magic Sorcerer",
-	"sprite": "sprites/dreamwalker_2.atlas",
+	"sprite": "sprites/lizards/dreamwalker_2.atlas",
 	"deck": [
-		"decks/wild-magic_sorcerer.dck"
+		"decks/wizards/wild-magic_sorcerer.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -18432,9 +19040,9 @@
 },
 {
 	"name": "Wolf",
-	"sprite": "sprites/dungeon/wolf.atlas",
+	"sprite": "sprites/animals/wolf.atlas",
 	"deck": [
-		"decks/wolfboss.dck"
+		"decks/animals/wolfboss.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -18494,9 +19102,9 @@
 },
 {
 	"name": "Wurm",
-	"sprite": "sprites/wurm.atlas",
+	"sprite": "sprites/monsters/wurm.atlas",
 	"deck": [
-		"decks/wurm.json"
+		"decks/monsters/wurm.json"
 	],
 	"ai": "reckless",
 	"spawnRate": 1,
@@ -18539,9 +19147,9 @@
 },
 {
 	"name": "Vulture",
-	"sprite": "sprites/dungeon/vulture.atlas",
+	"sprite": "sprites/animals/vulture.atlas",
 	"deck": [
-		"decks/vulture.dck"
+		"decks/animals/vulture.dck"
 	],
 	"ai": "",
 	"flying": true,
@@ -18591,9 +19199,9 @@
 },
 {
 	"name": "Water Elemental",
-	"sprite": "sprites/waterelemental_2.atlas",
+	"sprite": "sprites/elementals/waterelemental_2.atlas",
 	"deck": [
-		"decks/water_elemental.dck"
+		"decks/elementals/water_elemental.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -18636,9 +19244,9 @@
 },
 {
 	"name": "Witch",
-	"sprite": "sprites/dungeon/witch.atlas",
+	"sprite": "sprites/unholy/witchlarge.atlas",
 	"deck": [
-		"decks/witch.dck"
+		"decks/unholy/witch.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -18821,9 +19429,9 @@
 },
 {
 	"name": "Yeti",
-	"sprite": "sprites/yeti_2.atlas",
+	"sprite": "sprites/monsters/yeti_2.atlas",
 	"deck": [
-		"decks/yeti.dck"
+		"decks/monsters/yeti.dck"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -18980,9 +19588,9 @@
 },
 {
 	"name": "Zombie",
-	"sprite": "sprites/zombie.atlas",
+	"sprite": "sprites/unholy/zombie.atlas",
 	"deck": [
-		"decks/zombie_bad.json"
+		"decks/unholy/zombie_bad.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
@@ -19027,9 +19635,9 @@
 },
 {
 	"name": "Zombie Lord",
-	"sprite": "sprites/lich.atlas",
+	"sprite": "sprites/unholy/lich.atlas",
 	"deck": [
-		"decks/zombie_good.json"
+		"decks/unholy/zombie_good.json"
 	],
 	"ai": "",
 	"spawnRate": 1,
diff --git a/forge-gui/res/adventure/Shandalar/world/green.json b/forge-gui/res/adventure/Shandalar/world/green.json
index 1dd2f7f1acb..791bdc38e73 100644
--- a/forge-gui/res/adventure/Shandalar/world/green.json
+++ b/forge-gui/res/adventure/Shandalar/world/green.json
@@ -33,7 +33,9 @@
 	"Wood"
 ],
 "enemies": [
+	"Adept Green Wizard",
 	"Ape",
+	"Apprentice Green Wizard",
 	"Badger",
 	"Bear",
 	"Beastmaster",
@@ -55,12 +57,10 @@
 	"Gorgon",
 	"Gorgon 2",
 	"Green Beast",
-	"Green Wiz1",
-	"Green Wiz2",
-	"Green Wiz3",
 	"High Elf",
 	"Hydra",
 	"Kavu",
+	"Master Green Wizard",
 	"Ooze",
 	"Owl",
 	"Plant",
diff --git a/forge-gui/res/adventure/Shandalar/world/quests.json b/forge-gui/res/adventure/Shandalar/world/quests.json
index 233cf117bd1..b7c743ca2f3 100644
--- a/forge-gui/res/adventure/Shandalar/world/quests.json
+++ b/forge-gui/res/adventure/Shandalar/world/quests.json
@@ -5970,45 +5970,5 @@
 		"waste_town_identity",
 		"waste_town_tribal"
 	]
-},
-{
-	"id": 24,
-	"isTemplate": true,
-	"name": "Zedruu's Downfall",
-	"description": "Defeat Zedruu and her leutenants",
-	"offerDialog": {},
-	"prologue": {},
-	"epilogue": {},
-	"failureDialog": {},
-	"declinedDialog": {
-		"text": "Come back tomorrow and perhaps I'll have something that you'll actually be willing to do.",
-		"options": [
-			{
-				"name": "(Catching the not so subtle hint, you leave.)"
-			}
-		]
-	},
-	"stages": [
-		{
-			"id": 1,
-			"name": "Leave",
-			"mapFlag": "",
-			"mapFlagValue": 1,
-			"objective": "Leave",
-			"prologue": {},
-			"epilogue": {},
-			"POIToken": ""
-		},
-		{
-			"id": 2,
-			"name": "New Stage",
-			"mapFlag": "",
-			"mapFlagValue": 1,
-			"objective": "Travel",
-			"prologue": {},
-			"epilogue": {},
-			"POIToken": ""
-		}
-	]
 }
 ]
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/world/red.json b/forge-gui/res/adventure/Shandalar/world/red.json
index 675fc5ef2d4..0e363211f6c 100644
--- a/forge-gui/res/adventure/Shandalar/world/red.json
+++ b/forge-gui/res/adventure/Shandalar/world/red.json
@@ -29,7 +29,9 @@
 	"Gravel"
 ],
 "enemies": [
+	"Adept Red Wizard",
 	"Amonkhet Minotaur",
+	"Apprentice Red Wizard",
 	"Ashmouth Devil",
 	"Axgard Dwarf",
 	"Berserker",
@@ -57,13 +59,11 @@
 	"Kavu",
 	"Khan",
 	"Kobold",
+	"Master Red Wizard",
 	"Mindclaw Shaman",
 	"Minotaur",
 	"Minotaur Flayer",
 	"Red Beast",
-	"Red Wiz1",
-	"Red Wiz2",
-	"Red Wiz3",
 	"Scorpion",
 	"Shaman",
 	"Troll",
diff --git a/forge-gui/res/adventure/Shandalar/world/shops.json b/forge-gui/res/adventure/Shandalar/world/shops.json
index af92104b1ff..268c12bb7cf 100644
--- a/forge-gui/res/adventure/Shandalar/world/shops.json
+++ b/forge-gui/res/adventure/Shandalar/world/shops.json
@@ -4460,6 +4460,125 @@
 		}
 	  ]
 	}
+	]
+		},{
+  "name":"SmallCats",
+  "description":"The Feline Kingdom",
+  "spriteAtlas":"maps/tileset/buildings.atlas",
+  "sprite":"CatShop",
+  "rewards": [
+  {
+	  "count":8,
+	  "type":"Union",
+	  "cardUnion": [
+		{
+		  "count":1,
+		  "subTypes": ["Cat"]
+		},
+		{
+		  "count":1,
+		  "cardText": "Cat"
+		}
+	  ]
+	}
+	]
+			},{
+  "name":"Shapeshifter",
+  "description":"Proteus' Endless Shapes",
+  "spriteAtlas":"maps/tileset/buildings.atlas",
+  "sprite":"ShapeshifterShop",
+  "rewards": [
+  {
+	  "count":8,
+	  "type":"Union",
+	  "cardUnion": [
+		{
+		  "count":1,
+		  "subTypes": ["Shapeshifter"]
+		},
+		{
+		  "count":1,
+		  "cardText": "Shapeshifter"
+		}
+	  ]
+	}
+	]
+			},{
+  "name":"Gods",
+  "description":"Al's Dose of Apotheosis",
+  "spriteAtlas":"maps/tileset/buildings.atlas",
+  "sprite":"GodMinigodShop",
+  "rewards": [
+  {
+	  "count":4,
+	  "type":"Union",
+	  "cardUnion": [
+		{
+		  "count":1,
+		  "subTypes": ["God"]
+		},
+		{
+		  "count":1,
+		  "cardText": "God"
+		}
+	  ]
+	},
+	{
+	  "count":4,
+	  "type":"Union",
+	  "cardUnion": [
+		{
+		  "count":1,
+		  "subTypes": ["Demigod"]
+		},
+		{
+		  "count":1,
+		  "cardText": "Demigod"
+		}
+	  ]
+	  }
+	  ]
+},{
+  "name":"Insects",
+  "description":"Grist's Bug Greenhouse",
+  "spriteAtlas":"maps/tileset/buildings.atlas",
+  "sprite":"InsectShop",
+  "rewards": [
+  {
+	  "count":8,
+	  "type":"Union",
+	  "cardUnion": [
+		{
+		  "count":1,
+		  "subTypes": ["Insect"]
+		},
+		{
+		  "count":1,
+		  "cardText": "Insect"
+		}
+	  ]
+	}
+	]
+},{
+  "name":"Eldrazi",
+  "description":"Eldritch Emissaries",
+  "spriteAtlas":"maps/tileset/buildings.atlas",
+  "sprite":"EldraziShop",
+  "rewards": [
+  {
+	  "count":8,
+	  "type":"Union",
+	  "cardUnion": [
+		{
+		  "count":1,
+		  "subTypes": ["Eldrazi"]
+		},
+		{
+		  "count":1,
+		  "cardText": "Eldrazi"
+		}
+	  ]
+	}
 	]
 },{
   "name":"Pirate",
diff --git a/forge-gui/res/adventure/Shandalar/world/waste.json b/forge-gui/res/adventure/Shandalar/world/waste.json
index b3a8d7745eb..1ea6a30fd89 100644
--- a/forge-gui/res/adventure/Shandalar/world/waste.json
+++ b/forge-gui/res/adventure/Shandalar/world/waste.json
@@ -28,19 +28,23 @@
 	"WasteRock"
 ],
 "enemies": [
+	"Adept Black Wizard",
+	"Adept Blue Wizard",
+	"Adept Green Wizard",
+	"Adept Red Wizard",
+	"Adept White Wizard",
+	"Apprentice Black Wizard",
+	"Apprentice Blue Wizard",
+	"Apprentice Green Wizard",
+    "Apprentice Red Wizard",
+	"Apprentice White Wizard",
 	"Bandit",
 	"Bat",
-	"Black Wiz1",
-	"Black Wiz2",
-	"Black Wiz3",
-	"Blue Wiz1",
-	"Blue Wiz2",
-	"Blue Wiz3",
 	"Boar",
 	"Challenger 20",
 	"Challenger 21",
 	"Challenger 22",
-	"ClayGolem",
+	"Clay Golem",
 	"Construct",
 	"Dog",
 	"Doppelganger",
@@ -49,21 +53,17 @@
 	"Gargoyle",
 	"Gargoyle 2",
 	"Golem",
-	"Green Wiz1",
-	"Green Wiz2",
-	"Green Wiz3",
 	"Insect",
+	"Master Black Wizard",
+	"Master Blue Wizard",
+	"Master Green Wizard",
+    "Master Red Wizard",
+	"Master White Wizard",
 	"Mummy",
 	"Ooze",
 	"Pirate",
 	"Raven",
-	"Red Wiz1",
-	"Red Wiz2",
-	"Red Wiz3",
 	"Sliver",
-	"White Wiz1",
-	"White Wiz2",
-	"White Wiz3",
 	"Wild Rat"
 ],
 "pointsOfInterest": [
diff --git a/forge-gui/res/adventure/Shandalar/world/white.json b/forge-gui/res/adventure/Shandalar/world/white.json
index 76d6ead08c1..b3326d8a6fd 100644
--- a/forge-gui/res/adventure/Shandalar/world/white.json
+++ b/forge-gui/res/adventure/Shandalar/world/white.json
@@ -29,12 +29,14 @@
 	"DarkGras"
 ],
 "enemies": [
+	"Adept White Wizard",
 	"Adventurer",
 	"Aether Channeler",
+	"Apprentice White Wizard",
 	"Archer",
 	"Armored Knight",
 	"Beastmaster",
-	"Cat",
+	"Leonin Warrior",
 	"Cathar",
 	"Challenger 20",
 	"Challenger 21",
@@ -53,17 +55,16 @@
 	"Insect",
 	"Knight",
 	"Kor Warrior",
+	"Master White Wizard",
 	"Monk",
 	"Orthodoxy Duelist",
 	"Owl",
 	"Raven",
+	"Runelord",
 	"Scorpion",
 	"Scarab",
 	"Stray Cat",
-	"White Dwarf",
-	"White Wiz1",
-	"White Wiz2",
-	"White Wiz3"
+	"White Dwarf"
 ],
 "pointsOfInterest": [
 	"White Castle",