diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Akroma presence.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Akroma presence.fullborder.jpg
deleted file mode 100644
index 8fadf0efb9b..00000000000
Binary files a/forge-gui/res/adventure/Shandalar/custom_card_pics/Akroma presence.fullborder.jpg and /dev/null differ
diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Akroma's Presence.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Akroma's Presence.fullborder.jpg
new file mode 100644
index 00000000000..ab5d29ed245
Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/custom_card_pics/Akroma's Presence.fullborder.jpg differ
diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Ghalta presence.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Ghalta presence.fullborder.jpg
deleted file mode 100644
index f6d4c923d8e..00000000000
Binary files a/forge-gui/res/adventure/Shandalar/custom_card_pics/Ghalta presence.fullborder.jpg and /dev/null differ
diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Ghalta's Presence.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Ghalta's Presence.fullborder.jpg
new file mode 100644
index 00000000000..c80b566c60c
Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/custom_card_pics/Ghalta's Presence.fullborder.jpg differ
diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Griselbrand presence.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Griselbrand presence.fullborder.jpg
deleted file mode 100644
index fda6dd05d1a..00000000000
Binary files a/forge-gui/res/adventure/Shandalar/custom_card_pics/Griselbrand presence.fullborder.jpg and /dev/null differ
diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Griselbrand's Presence.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Griselbrand's Presence.fullborder.jpg
new file mode 100644
index 00000000000..00c78b96c7e
Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/custom_card_pics/Griselbrand's Presence.fullborder.jpg differ
diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Lathliss presence.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Lathliss presence.fullborder.jpg
deleted file mode 100644
index 066175f337a..00000000000
Binary files a/forge-gui/res/adventure/Shandalar/custom_card_pics/Lathliss presence.fullborder.jpg and /dev/null differ
diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Lathliss' Presence.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Lathliss' Presence.fullborder.jpg
new file mode 100644
index 00000000000..a607bbfd7c4
Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/custom_card_pics/Lathliss' Presence.fullborder.jpg differ
diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Lorthos presence.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Lorthos presence.fullborder.jpg
deleted file mode 100644
index bc08a519d53..00000000000
Binary files a/forge-gui/res/adventure/Shandalar/custom_card_pics/Lorthos presence.fullborder.jpg and /dev/null differ
diff --git a/forge-gui/res/adventure/Shandalar/custom_card_pics/Lorthos' Presence.fullborder.jpg b/forge-gui/res/adventure/Shandalar/custom_card_pics/Lorthos' Presence.fullborder.jpg
new file mode 100644
index 00000000000..34c5b44cc0b
Binary files /dev/null and b/forge-gui/res/adventure/Shandalar/custom_card_pics/Lorthos' Presence.fullborder.jpg differ
diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/akroma_presence.txt b/forge-gui/res/adventure/Shandalar/custom_cards/akroma_presence.txt
index 0a141b0ec9d..032be5784c9 100644
--- a/forge-gui/res/adventure/Shandalar/custom_cards/akroma_presence.txt
+++ b/forge-gui/res/adventure/Shandalar/custom_cards/akroma_presence.txt
@@ -1,8 +1,7 @@
-Name:Akroma presence
+Name:Akroma's Presence
ManaCost:no cost
Colors:White
Types:Enchantment
-K:Hexproof
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ At the beginning of your upkeep you gain 4 life.
-SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 4
-Oracle: At the beginning of your upkeep gain 4 life.
\ No newline at end of file
+R:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card.OppCtrl,Emblem.OppCtrl | ValidTarget$ You,Permanent.YouCtrl | ReplaceWith$ DBReplace | PreventionEffect$ True | Description$ If a source an opponent controls would deal damage to you or a permanent you control, prevent 1 of that damage.
+SVar:DBReplace:DB$ ReplaceDamage | Amount$ 1
+Oracle:If a source an opponent controls would deal damage to you or a permanent you control, prevent 1 of that damage.
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/ghalta_presence.txt b/forge-gui/res/adventure/Shandalar/custom_cards/ghalta_presence.txt
deleted file mode 100644
index 2ff6ffe56d5..00000000000
--- a/forge-gui/res/adventure/Shandalar/custom_cards/ghalta_presence.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Name:Ghalta presence
-ManaCost:no cost
-Colors:Green
-Types:Enchantment
-K:Hexproof
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDestroyAll | TriggerDescription$ At the beginning of your upkeep, destroy all artifacts, enchantments and planeswalkers you dont control.
-SVar:TrigDestroyAll:DB$ DestroyAll | ValidCards$ Artifact.YouDontCtrl,Enchantment.YouDontCtrl,Planeswalker.YouDontCtrl |
-Oracle:At the beginning of your upkeep, destroy all artifacts, enchantments and planeswalkers you dont control.
diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/ghaltas_presence.txt b/forge-gui/res/adventure/Shandalar/custom_cards/ghaltas_presence.txt
new file mode 100644
index 00000000000..1ebdea0bf8a
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/custom_cards/ghaltas_presence.txt
@@ -0,0 +1,7 @@
+Name:Ghalta's Presence
+ManaCost:no cost
+Colors:Green
+Types:Enchantment
+S:Mode$ Continuous | Affected$ Card | AddHiddenKeyword$ This spell can't be countered. | AffectedZone$ Stack | EffectZone$ Command | Description$ Spells can't be countered.
+S:Mode$ RaiseCost | ValidCard$ Card.nonCreature,Card.nonBattle | Type$ Spell | Activator$ Opponent | EffectZone$ Command | Amount$ 2 | Description$ Noncreature, nonbattle spells your opponent cast cost {2} more to cast.
+Oracle:Spells can't be countered.\nNoncreature, nonbattle spells your opponent cast cost {2} more to cast.
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/griselbrand_presence.txt b/forge-gui/res/adventure/Shandalar/custom_cards/griselbrand_presence.txt
index c20453d3ecf..6fd02921ebc 100644
--- a/forge-gui/res/adventure/Shandalar/custom_cards/griselbrand_presence.txt
+++ b/forge-gui/res/adventure/Shandalar/custom_cards/griselbrand_presence.txt
@@ -1,10 +1,8 @@
-Name:Griselbrand presence
+Name:Griselbrand's Presence
ManaCost:no cost
Colors:Black
Types:Enchantment
-K:Hexproof
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ At the beginning of your end step, each opponent loses 1 life and you gain 1 life.
-SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainOneLife
-SVar:DBGainOneLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-DeckHas:Ability$LifeGain
-Oracle:At the beginning of your end step, each opponent loses 1 life and you gain 1 life.
\ No newline at end of file
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigDraw | TriggerDescription$ At the beginning of your upkeep, you draw a card and each opponent loses 1 life.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | Defined$ Opponent | LifeAmount$ 1
+Oracle:At the beginning of your upkeep, you draw a card and each opponent loses 1 life.
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/lathliss_presence.txt b/forge-gui/res/adventure/Shandalar/custom_cards/lathliss_presence.txt
index 6c26cc6bd4d..e62cb9818d1 100644
--- a/forge-gui/res/adventure/Shandalar/custom_cards/lathliss_presence.txt
+++ b/forge-gui/res/adventure/Shandalar/custom_cards/lathliss_presence.txt
@@ -1,8 +1,8 @@
-Name:Lathliss presence
+Name:Lathliss' Presence
ManaCost:no cost
Colors:Red
Types:Enchantment
-K:Hexproof
-T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each upkeep, CARDNAME deals 2 damage to every none red creature.
-SVar:TrigDamage:DB$ DamageAll | ValidCards$ Creature.nonRed | NumDmg$ 2
-Oracle:At the beginning of each upkeep, Lathliss presence deals 2 damage to every none red creature.
\ No newline at end of file
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Command | Execute$ TrigDamage | ValidPlayer$ You | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 1 damage to each creature and planeswalker you don't control.
+SVar:TrigDamage:DB$ DamageAll | ValidCards$ Creature.YouDontCtrl,Planeswalker.YouDontCtrl | ValidDescription$ each creature and each planeswalker | NumDmg$ 1
+S:Mode$ Continuous | Affected$ Creature.OppCtrl | EffectZone$ Command | AddHiddenKeyword$ Damage isn't removed from CARDNAME during cleanup steps. | Description$ Damage isn't removed from creatures and planeswalkers your opponents control during cleanup steps.
+Oracle:At the beginning of your upkeep, Lathliss's Presence deals 1 damage to each creature and planeswalker you don't control\nDamage isn't removed from creatures and planeswalkers your opponents control during cleanup steps.
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/custom_cards/lorthos_presence.txt b/forge-gui/res/adventure/Shandalar/custom_cards/lorthos_presence.txt
index 457370d7d3a..f42992dfe6e 100644
--- a/forge-gui/res/adventure/Shandalar/custom_cards/lorthos_presence.txt
+++ b/forge-gui/res/adventure/Shandalar/custom_cards/lorthos_presence.txt
@@ -1,7 +1,7 @@
-Name:Lorthos presence
+Name:Lorthos' Presence
ManaCost:no cost
Colors:Blue
Types:Enchantment
-K:Hexproof
-S:Mode$ Continuous | Affected$ Player.Opponent | AddKeyword$ UntapAdjust:Land:1 | SVarCompare$ EQ1 | Description$ Opponents can't untap more than one land during their untap steps.
-Oracle:Opponents can't untap more than one land during their untap steps.
\ No newline at end of file
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Permanent.nonLand+OppCtrl | TriggerZones$ Command | Execute$ TrigStunCounter | TriggerDescription$ Whenever a nonland permanent enters the battlefield under an opponent's control, put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
+SVar:TrigStunCounter:DB$ PutCounter | Defined$ TriggeredCard | CounterType$ Stun | CounterNum$ 1
+Oracle:Whenever a nonland permanent enters the battlefield under an opponent's control, put a stun counter on it. (If a permanent with a stun counter would become untapped, remove one from it instead.)
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/decks/animals/lion.dck b/forge-gui/res/adventure/Shandalar/decks/animals/lion.dck
new file mode 100644
index 00000000000..b20b18d3ccc
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/animals/lion.dck
@@ -0,0 +1,27 @@
+[metadata]
+Name=lion
+[Avatar]
+
+[Main]
+4 Cubwarden|IKO|1
+2 Disenchant|CN2|1
+4 Fateful Absence|MID|1
+4 Felidar Retreat|ZNR|1
+2 Guardian Lions|M13|1
+2 Huntmaster Liger|IKO|1
+4 Jamuraan Lion|VIS|1
+4 Lion Sash|NEO|1
+24 Plains|DMU|3
+4 Savannah Lions|J22|1
+4 Silvercoat Lion|M10|1
+2 Whitemane Lion|TSR|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/animals/rhino.dck b/forge-gui/res/adventure/Shandalar/decks/animals/rhino.dck
new file mode 100644
index 00000000000..5b79aacb014
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/animals/rhino.dck
@@ -0,0 +1,30 @@
+[metadata]
+Name=rhino
+[Avatar]
+
+[Main]
+4 Charging Rhino|TMP|1
+2 Crash the Party|NCC|1
+4 Crashing Footfalls|MH1|1
+9 Forest|10E|1
+2 Forest|10E|2
+7 Forest|10E|3
+6 Forest|10E|4
+2 Killer Service|NCC|1
+3 Overwhelming Stampede|C19|1
+4 Rampant Growth|C16|1
+4 Rhox|10E|1
+4 Stampeding Rhino|W17|1
+4 Thundering Ceratok|WAR|1
+1 Titan of Industry|SNC|1
+4 Wild Ceratok|GRN|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/animals/tiger.dck b/forge-gui/res/adventure/Shandalar/decks/animals/tiger.dck
new file mode 100644
index 00000000000..1d4f0cd1ef2
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/animals/tiger.dck
@@ -0,0 +1,29 @@
+[metadata]
+Name=tiger
+[Avatar]
+
+[Main]
+4 Cave Tiger|USG|1
+4 Feral Prowler|JMP|1
+12 Forest|M21|1
+5 Forest|M21|2
+7 Forest|M21|3
+3 Giant Growth|MB1|1
+2 Giant Regrowth|YSNC|1
+4 Keeper of Fables|ELD|1
+4 Prey Upon|J22|1
+3 Sabertooth Mauler|M21|1
+2 Savage Swipe|MH1|1
+4 Scythe Leopard|BFZ|1
+4 Scythe Tiger|ZEN|1
+2 Stalking Tiger|10E|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/boss/akroma.dck b/forge-gui/res/adventure/Shandalar/decks/boss/akroma.dck
index 1451706dc7c..46e27a42f40 100644
--- a/forge-gui/res/adventure/Shandalar/decks/boss/akroma.dck
+++ b/forge-gui/res/adventure/Shandalar/decks/boss/akroma.dck
@@ -1,27 +1,40 @@
[metadata]
Name=Akroma
[Main]
-4 Adaptive Automaton
-4 Angel of Jubilation
-1 Angelic Arbiter
-4 Angelic Curator
-4 Angelic Page
-2 Archangel of Thune
-2 Archangel of Tithes
-1 Avacyn, Angel of Hope
-1 Deathless Angel
-1 Entreat the Angels
-3 Herald of War
-4 Herald's Horn
-1 Iona, Shield of Emeria
-4 Kabira Crossroads
-10 Plains
-4 Mox Pearl
-1 Pristine Angel
-1 Seraph of the Sword
-1 Akroma, Angel of Wrath
-4 Seraph Sanctuary
-1 Sunblast Angel
-2 Vanquisher's Banner
+2 Akroma's Memorial|TSR|1
+4 Akroma's Vengeance|C20|1
+4 Akroma, Angel of Wrath|SLD|1
+2 Akroma, Vision of Ixidor|CMR|1
+1 Angel of Eternal Dawn|YMID|1
+1 Angel of Finality|AFC|1
+4 Angel of Sanctions|C19|1
+4 Angel of Vitality|M20|1
+2 Archangel Elspeth|MOM|1
+4 Archangel of Thune|2XM|1
+2 Avacyn, Angel of Hope|J17|1
+4 Baneslayer Angel|M21|1
+4 Bishop of Wings|M20|1
+4 Court of Grace|CMR|1
+2 Decree of Justice|C14|1
+4 Emeria Shepherd|ZNC|1
+4 Entreat the Angels|PLIST|1
+4 Giada, Font of Hope|SNC|1
+1 Herald of Vengeance|YSNC|1
+4 Kabira Crossroads|C17|1
+4 Karmic Guide|AFC|1
+1 Linvala, Keeper of Silence|MM3|1
+4 Lyra Dawnbringer|J22|1
+12 Plains|C19|1
+15 Plains|C19|2
+11 Plains|C19|3
+4 Radiant Fountain|IMA|1
+2 Radiant, Archangel|VMA|1
+4 Resplendent Angel|M19|1
+4 Righteous Valkyrie|J21|1
+4 Seraph Sanctuary|DDQ|1
+1 Serra Paragon|DMU|1
+3 Serra the Benevolent|J21|1
+2 The Book of Exalted Deeds|AFR|1
+2 Valkyrie Harbinger|KHM|1
diff --git a/forge-gui/res/adventure/Shandalar/decks/boss/ghalta.dck b/forge-gui/res/adventure/Shandalar/decks/boss/ghalta.dck
index 2817e134308..a4cb502157a 100644
--- a/forge-gui/res/adventure/Shandalar/decks/boss/ghalta.dck
+++ b/forge-gui/res/adventure/Shandalar/decks/boss/ghalta.dck
@@ -1,15 +1,30 @@
[metadata]
Name=Ghalta
[Main]
-4 Commune with Dinosaurs
-4 Drover of the Mighty
-20 Forest
-4 Mox Emerald
-4 Ghalta, Primal Hunger
-4 Gigantosaurus
-4 Ranging Raptors
-4 Runic Armasaur
-4 Savage Stomp
-2 Verdant Sun's Avatar
-4 Wayward Swordtooth
-2 Shifting Ceratops
+2 Ancient Imperiosaur|MOM|1
+2 Apex Altisaur|C19|1
+4 Apex Devastator|CMR|1
+4 Carnage Tyrant|XLN|1
+4 Drover of the Mighty|JMP|1
+4 Elvish Mystic|C14|1
+11 Forest|C19|1
+8 Forest|C19|2
+6 Forest|C19|3
+20 Forest|MOM|1
+4 Ghalta, Primal Hunger|JMP|1
+4 Giant Regrowth|YSNC|1
+4 Gigantosaurus|PLIST|1
+2 Goreclaw, Terror of Qal Sisma|M19|1
+2 Rampaging Brontodon|G18|1
+4 Rampant Growth|NCC|1
+4 Regal Behemoth|CN2|1
+1 Return to Nature|MOC|1
+2 Runic Armasaur|M19|1
+4 Savage Stomp|JMP|1
+4 Shifting Ceratops|M20|1
+2 The Great Henge|ELD|1
+2 The Tarrasque|AFR|1
+4 Topiary Stomper|SNC|1
+1 Verdant Sun's Avatar|C21|1
+4 Wayward Swordtooth|RIX|1
+4 Wild Growth|DMR|1
diff --git a/forge-gui/res/adventure/Shandalar/decks/boss/griselbrand.dck b/forge-gui/res/adventure/Shandalar/decks/boss/griselbrand.dck
index ce30ae45c3b..7385fb2ed8b 100644
--- a/forge-gui/res/adventure/Shandalar/decks/boss/griselbrand.dck
+++ b/forge-gui/res/adventure/Shandalar/decks/boss/griselbrand.dck
@@ -1,29 +1,41 @@
[metadata]
Name=Griselbrand
[Main]
-1 All Hallow's Eve
-1 Bottomless Vault
-3 Cabal Coffers
-4 Cabal Ritual
-1 Carnifex Demon
-4 Consume Spirit
-2 Corrupt
-2 Damnation
-4 Dark Ritual
-1 Demon of Death's Gate
-3 Demonic Tutor
-1 Havoc Demon
-1 Griselbrand
-1 Mutilate
-1 Pestilence Demon
-1 Promise of Power
-2 Reiver Demon
-4 Sign in Blood
-2 Soot Imp
-2 Stronghold Overseer
-15 Swamp
-4 Mox Jet
-2 Tendrils of Corruption
-1 Urborg, Tomb of Yawgmoth
-3 Will-o'-the-Wisp
+4 Animate Dead|VMA|1
+4 Archfiend of Depravity|SCD|1
+2 Archfiend of Despair|BBD|1
+3 Cabal Coffers|MH2|1
+1 Carnifex Demon|AJMP|1
+4 Damnation|2X2|1
+1 Demon of Death's Gate|PLIST|1
+4 Demon's Disciple|ZNR|1
+2 Demonlord Belzenlok|DOM|1
+4 Doom Blade|GN3|1
+4 Griselbrand|PGPX|1
+3 Harvester of Souls|JMP|1
+4 Infernal Grasp|PSVC|1
+3 Infernal Sovereign|MOC|1
+4 Liliana's Contract|SLD|1
+4 Manor Guardian|J21|1
+4 Master of the Feast|JOU|1
+4 Nightmare Shepherd|THB|1
+2 Ob Nixilis of the Black Oath|PZ1|1
+4 Ob Nixilis, the Fallen|PLIST|1
+2 Ob Nixilis, Unshackled|2X2|1
+4 Overseer of the Damned|SCD|1
+1 Pestilence Demon|DDR|1
+4 Reanimate|UMA|1
+4 Reaper from the Abyss|J22|1
+2 Reiver Demon|CMA|1
+2 Reiver Demon|COM|1
+2 Seizan, Perverter of Truth|CHK|1
+2 Soulhunter Rakshasa|ANB|1
+2 Stronghold Overseer|TSP|1
+15 Swamp|MOM|1
+9 Swamp|SCD|1
+7 Swamp|SCD|2
+4 Swamp|SCD|3
+9 Swamp|SCD|4
+1 Urborg, Tomb of Yawgmoth|TSR|1
+2 Vilis, Broker of Blood|M20|1
diff --git a/forge-gui/res/adventure/Shandalar/decks/boss/lathliss.dck b/forge-gui/res/adventure/Shandalar/decks/boss/lathliss.dck
index ddfd1c30055..5d31dcbe1b2 100644
--- a/forge-gui/res/adventure/Shandalar/decks/boss/lathliss.dck
+++ b/forge-gui/res/adventure/Shandalar/decks/boss/lathliss.dck
@@ -1,27 +1,40 @@
[metadata]
Name=Lathliss
[Main]
-3 Archwing Dragon
-3 Chain Lightning
-3 Draconic Roar
-2 Dragon Tempest
-1 Dragon Tyrant
-2 Dragon's Hoard
-3 Dragonspeaker Shaman
-1 Drakuseth, Maw of Flames
-2 Dwarven Hold
-4 Dwarven Mine
-1 Gamble
-2 Kilnmouth Dragon
-1 Lathliss, Dragon Queen
-4 Lightning Bolt
-1 Mana Flare
-12 Mountain
-1 Nesting Dragon
-2 Pyromancy
-1 Ruby Medallion
-4 Mox Ruby
-3 Thunderbreak Regent
-2 Valakut, the Molten Pinnacle
-1 Wheel of Fortune
-1 Zirilan of the Claw
\ No newline at end of file
+3 Ancient Copper Dragon|CLB|1
+2 Balefire Dragon|UMA|1
+3 Blasphemous Act|VOC|1
+4 Chaos Dragon|AFC|1
+2 Crucible of Fire|IMA|1
+4 Dragon Tempest|GN3|1
+4 Dragonlord's Servant|JMP|1
+1 Dragonspeaker Shaman|C17|1
+3 Dragonspeaker Shaman|SCD|1
+2 Drakuseth, Maw of Flames|GN3|1
+2 Dwarven Hold|5ED|1
+4 Dwarven Mine|ELD|1
+4 Glorybringer|AKH|1
+4 Goldspan Dragon|KHM|1
+2 Hellkite Tyrant|C21|1
+2 Inferno of the Star Mounts|AFR|1
+1 Lathliss, Dragon Queen|J22|1
+3 Lathliss, Dragon Queen|PRES|1
+2 Lightning Bolt|30A|1
+4 Magmaquake|C15|1
+8 Mountain|C19|1
+8 Mountain|C19|2
+10 Mountain|C19|3
+12 Mountain|MOM|1
+4 Orb of Dragonkind|AFR|1
+2 Sarkhan the Masterless|WAR|1
+2 Sarkhan, the Dragonspeaker|J22|1
+2 Sarkhan, Wanderer to Shiv|J21|1
+4 Shivan Dragon|30A|1
+1 Terror of Mount Velus|AFC|1
+4 Terror of the Peaks|M21|1
+2 Themberchaud|SLD|1
+4 Town-Razer Tyrant|YMID|1
+3 Tyrant of Kher Ridges|BRO|1
+2 Utvara Hellkite|GK2|1
+2 Valakut, the Molten Pinnacle|ZNE|1
+2 Wrathful Red Dragon|CLB|1
\ No newline at end of file
diff --git a/forge-gui/res/adventure/Shandalar/decks/boss/lorthos.dck b/forge-gui/res/adventure/Shandalar/decks/boss/lorthos.dck
index d023af7970b..0d4834cfd47 100644
--- a/forge-gui/res/adventure/Shandalar/decks/boss/lorthos.dck
+++ b/forge-gui/res/adventure/Shandalar/decks/boss/lorthos.dck
@@ -1,19 +1,31 @@
[metadata]
Name=Lorthos
[Main]
-4 AEtherplasm
-4 Counterspell
-2 Deep-Sea Kraken
-4 Guile
-4 High Tide
-2 Inkwell Leviathan
-20 Island
-4 Mox Sapphire
-4 Kederekt Leviathan
-1 Lorthos, the Tidemaker
-4 Mana Drain
-2 Time Walk
-1 Quest for Ula's Temple
-4 Stormtide Leviathan
+4 Boomerang|10E|1
+4 Counterspell|SLD|1
+2 Deep-Sea Kraken|DDS|1
+4 Hullbreaker Horror|CLB|1
+2 Inkwell Leviathan|2XM|1
+5 Island|JMP|1
+3 Island|JMP|2
+3 Island|JMP|4
+2 Island|JMP|5
+4 Island|JMP|6
+2 Island|JMP|7
+5 Island|JMP|8
+20 Island|MOM|1
+4 Kederekt Leviathan|2X2|1
+4 Kenessos, Priest of Thassa|J22|1
+4 Kiora Bests the Sea God|THB|1
+3 Lorthos, the Tidemaker|C14|1
+1 Lorthos, the Tidemaker|PLIST|1
+4 Mana Drain|2X2|1
+4 Nadir Kraken|MOC|1
+4 Quest for Ula's Temple|WWK|1
+4 Reef Worm|C21|1
+2 Show and Tell|CN2|1
+4 Spawning Kraken|C21|1
+4 Stormtide Leviathan|CMR|1
+4 Whelming Wave|JMP|1
diff --git a/forge-gui/res/adventure/Shandalar/decks/monsters/bonedragon.dck b/forge-gui/res/adventure/Shandalar/decks/dragons/bonedragon.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/monsters/bonedragon.dck
rename to forge-gui/res/adventure/Shandalar/decks/dragons/bonedragon.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/monsters/dragon.dck b/forge-gui/res/adventure/Shandalar/decks/dragons/dragon.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/monsters/dragon.dck
rename to forge-gui/res/adventure/Shandalar/decks/dragons/dragon.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/monsters/firedragon.dck b/forge-gui/res/adventure/Shandalar/decks/dragons/firedragon.dck
similarity index 100%
rename from forge-gui/res/adventure/Shandalar/decks/monsters/firedragon.dck
rename to forge-gui/res/adventure/Shandalar/decks/dragons/firedragon.dck
diff --git a/forge-gui/res/adventure/Shandalar/decks/giants/wanderinggiant.dck b/forge-gui/res/adventure/Shandalar/decks/giants/wanderinggiant.dck
new file mode 100644
index 00000000000..44b8e8e9c0a
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/giants/wanderinggiant.dck
@@ -0,0 +1,36 @@
+[metadata]
+Name=wanderinggiant
+[Avatar]
+
+[Main]
+2 Bonebreaker Giant|M12|1
+2 Bonecrusher Giant|CLB|1
+3 Craven Giant|TPR|1
+3 Crush Underfoot|LRW|1
+2 Desolation Giant|CM2|1
+1 Fire Giant's Fury|KHM|1
+4 Hammer Dropper|MB1|1
+4 Hill Giant|10E|1
+4 Hundred-Handed One|THS|1
+2 Lowland Giant|TPR|1
+5 Mountain|10E|1
+4 Mountain|10E|2
+3 Mountain|10E|3
+4 Mountain|10E|4
+1 Plains|10E|1
+1 Plains|10E|2
+2 Plains|10E|3
+4 Plains|10E|4
+3 Shock|DDN|1
+2 Stinkdrinker Daredevil|LRW|1
+4 Two-Headed Giant of Foriys|PRM|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/goblins/goblinking.dck b/forge-gui/res/adventure/Shandalar/decks/goblins/goblinking.dck
new file mode 100644
index 00000000000..0cb77438230
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/goblins/goblinking.dck
@@ -0,0 +1,31 @@
+[metadata]
+Name=goblinking
+[Avatar]
+
+[Main]
+3 Blood Moon|A25|1
+3 Conspicuous Snoop|M21|1
+4 Den of the Bugbear|AFR|1
+4 Goblin Burrows|EVG|1
+4 Goblin Bushwhacker|ZEN|1
+4 Goblin Grenade|DDT|1
+4 Goblin Guide|TD1|1
+4 Goblin King|30A|1
+4 Krenko's Command|DDT|1
+4 Krenko, Tin Street Kingpin|MOC|1
+4 Mogg War Marshal|EMA|1
+5 Mountain|DMU|1
+3 Mountain|DMU|2
+6 Mountain|DMU|4
+1 Muxus, Goblin Grandee|J22|1
+3 Squee, Dubious Monarch|DMU|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/humans/archaeologist.dck b/forge-gui/res/adventure/Shandalar/decks/humans/archaeologist.dck
new file mode 100644
index 00000000000..e7281e734c9
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/humans/archaeologist.dck
@@ -0,0 +1,39 @@
+[metadata]
+Name=archaeologist
+[Avatar]
+
+[Main]
+4 Ancient Den|C21|1
+2 Angel of the Ruins|MOC|1
+1 Archaeomancer's Map|C21|1
+2 Argivian Archaeologist|PRM|1
+2 Bennie Bracks, Zoologist|NCC|1
+1 Brilliant Restoration|NEO|1
+2 Digsite Engineer|C21|1
+2 Dispatch|MM2|1
+2 Eiganjo, Seat of the Empire|NEO|1
+4 Esper Sentinel|J21|1
+1 Filigree Vector|MOC|1
+2 Ghalma the Shaper|YONE|1
+4 Glass Casket|ELD|1
+2 Lita, Mechanical Engineer|J22|1
+3 Myr Battlesphere|MOC|1
+2 Myrsmith|2XM|1
+10 Plains|J22|1
+2 Plains|J22|2
+4 Plains|J22|3
+1 Robaran Mercenaries|DMC|1
+2 Steel Overseer|J22|1
+2 Tempered Steel|2XM|1
+2 Teshar, Ancestor's Apostle|DOM|1
+1 Traxos, Scourge of Kroog|DMC|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/humans/archeologist.dck b/forge-gui/res/adventure/Shandalar/decks/humans/archeologist.dck
deleted file mode 100644
index a70b7a2c6e7..00000000000
--- a/forge-gui/res/adventure/Shandalar/decks/humans/archeologist.dck
+++ /dev/null
@@ -1,43 +0,0 @@
-[metadata]
-Name=archeologist
-[Avatar]
-
-[Main]
-2 Adaptive Automaton|2XM|1
-1 Argivian Archaeologist|PRM|1
-2 Brilliant Restoration|NEO|1
-2 Cityscape Leveler|BRO|1
-3 Daring Archaeologist|DOM|1
-2 Dispatch|MM2|1
-2 Esper Sentinel|MH2|1
-2 Fallaji Archaeologist|BRO|1
-4 Fellwar Stone|ONC|1
-1 Forsaken Monument|ZNR|1
-2 Ghalma the Shaper|YONE|1
-2 Glacial Fortress|XLN|1
-2 Hallowed Fountain|RNA|1
-2 Irrigated Farmland|C20|1
-6 Island|BRO|4
-1 Karn, Legacy Reforged|MAT|1
-1 Losheel, Clockwork Scholar|C21|1
-3 Mishra's Foundry|BRO|1
-1 Myr Battlesphere|2XM|1
-2 Mystic Archaeologist|M19|1
-6 Plains|BRO|4
-1 Platoon Dispenser|BRO|1
-2 Port Town|VOC|1
-2 Sai, Master Thopterist|NEC|1
-1 Schema Thief|MOC|1
-2 Spine of Ish Sah|MOC|1
-2 Thoughtcast|MM2|1
-1 Urza, Prince of Kroog|BRO|1
-[Sideboard]
-
-[Planes]
-
-[Schemes]
-
-[Conspiracy]
-
-[Dungeon]
-
diff --git a/forge-gui/res/adventure/Shandalar/decks/humans/enchantress.dck b/forge-gui/res/adventure/Shandalar/decks/humans/enchantress.dck
new file mode 100644
index 00000000000..939cd1109f7
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/humans/enchantress.dck
@@ -0,0 +1,31 @@
+[metadata]
+Name=enchantress
+[Avatar]
+
+[Main]
+4 All That Glitters|ELD|1
+4 Archon of Sun's Grace|THB|1
+4 Cave of the Frost Dragon|AFR|1
+4 Darksteel Mutation|VOC|1
+4 Daybreak Coronet|MM2|1
+4 Ethereal Armor|Q06|1
+4 Gryff's Boon|SOI|1
+4 Kor Spiritdancer|PCA|1
+2 Mantle of the Ancients|AFC|1
+4 Mesa Enchantress|DMR|1
+6 Plains|ELD|1
+4 Plains|ELD|2
+2 Plains|ELD|3
+2 Plains|ELD|4
+4 Serra's Sanctum|USG|1
+4 Swords to Plowshares|DMR|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/humans/humanelite.dck b/forge-gui/res/adventure/Shandalar/decks/humans/humanelite.dck
new file mode 100644
index 00000000000..f57be380002
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/humans/humanelite.dck
@@ -0,0 +1,30 @@
+[metadata]
+Name=humanelite
+[Avatar]
+
+[Main]
+4 Castle Ardenvale|NCC|1
+4 Champion of the Parish|DDQ|1
+4 Cleansing Nova|KHC|1
+2 Devout Chaplain|AVR|1
+4 Esper Sentinel|MH2|1
+2 Expedition Supplier|YMID|1
+2 Kytheon, Hero of Akros|ORI|1
+4 Mother of Runes|EMA|1
+6 Plains|C19|1
+6 Plains|C19|2
+8 Plains|C19|3
+4 Swords to Plowshares|AFC|1
+4 Thalia's Lieutenant|SOI|1
+4 Thalia, Guardian of Thraben|SLD|1
+2 Thalia, Heretic Cathar|PEMN|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/humans/tokens.dck b/forge-gui/res/adventure/Shandalar/decks/humans/tokens.dck
new file mode 100644
index 00000000000..c9de46a5c83
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/humans/tokens.dck
@@ -0,0 +1,32 @@
+[metadata]
+Name=tokens
+[Avatar]
+
+[Main]
+4 Benalish Marshal|GNT|1
+4 Castle Ardenvale|ONC|1
+1 Cathars' Crusade|CM2|1
+1 Elspeth Tirel|ONC|1
+4 Esper Sentinel|J21|1
+2 Finale of Glory|WAR|1
+2 Glorious Anthem|M21|1
+2 Hero of Bladehold|MOC|1
+4 Honor of the Pure|M12|1
+3 Intangible Virtue|HA5|1
+2 Martial Coup|V14|1
+3 Myrel, Shield of Argive|BRO|1
+7 Plains|WAR|1
+4 Plains|WAR|2
+9 Plains|WAR|3
+4 Precinct Captain|E01|1
+4 Secure the Wastes|DTK|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/unholy/ghoulgravecrawler.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/ghoulgravecrawler.dck
new file mode 100644
index 00000000000..7f4454bd7bd
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/unholy/ghoulgravecrawler.dck
@@ -0,0 +1,34 @@
+[metadata]
+Name=ghoulgravecrawler
+[Avatar]
+
+[Main]
+4 Champion of the Perished|SCD|1
+2 Damnation|SLD|1
+4 Diregraf Colossus|MIC|1
+4 Doom Blade|GN3|1
+1 Ghoulcaller Gisa|CC2|1
+4 Ghoulish Procession|MID|1
+1 Ghouls' Night Out|MIC|1
+1 Gorex, the Tombshell|MIC|1
+4 Gravecrawler|MB1|1
+2 Graveyard Marshal|M19|1
+1 Haunting Voyage|KHM|1
+4 Jadar, Ghoulcaller of Nephalia|MID|1
+1 Mikaeus, the Unhallowed|UMA|1
+1 Rot Hulk|GNT|1
+3 Swamp|SCD|1
+7 Swamp|SCD|2
+7 Swamp|SCD|3
+7 Swamp|SCD|4
+2 Zombie Master|30A|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/unholy/wraithswampwalk.dck b/forge-gui/res/adventure/Shandalar/decks/unholy/wraithswampwalk.dck
new file mode 100644
index 00000000000..846d4d81db6
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/unholy/wraithswampwalk.dck
@@ -0,0 +1,21 @@
+[metadata]
+Name=wraithswampwalk
+[Main]
+4 Anurid Murkdiver|ONS|1
+4 Bog Raiders|USG|1
+4 Bog Tatters|ZEN|1
+4 Bog Wraith|30A|1
+4 Contaminated Ground|ROE|1
+4 Dirtwater Wraith|MIR|1
+4 Evil Presence|30A|1
+2 Mind Sludge|ZEN|1
+2 Snuff Out|DDD|1
+4 Street Wraith|DMR|1
+6 Swamp|ZEN|1
+2 Swamp|ZEN|2
+1 Swamp|ZEN|4
+2 Swamp|ZEN|5
+6 Swamp|ZEN|6
+2 Swamp|ZEN|7
+1 Swamp|ZEN|8
+4 Urborg, Tomb of Yawgmoth|UMA|1
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/archmage.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/archmage.dck
new file mode 100644
index 00000000000..332ead23e84
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/archmage.dck
@@ -0,0 +1,31 @@
+[metadata]
+Name=archmage
+[Avatar]
+
+[Main]
+4 Aether Channeler|DMU|1
+1 Azami, Lady of Scrolls|C17|1
+3 Barrin, Tolarian Archmage|M21|1
+4 Counterspell|30A|1
+3 Cyclonic Rift|MM3|1
+3 Evacuation|10E|1
+6 Island|ISD|1
+9 Island|ISD|2
+9 Island|ISD|3
+2 Naban, Dean of Iteration|DOM|1
+2 River's Rebuke|NCC|1
+3 Snapcaster Mage|ISD|1
+3 Sower of Temptation|SLD|1
+2 Time Warp|E02|1
+2 Venser, Shaper Savant|TSR|1
+4 Wizard Class|PLIST|1
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/decks/wizards/millwizard.dck b/forge-gui/res/adventure/Shandalar/decks/wizards/millwizard.dck
new file mode 100644
index 00000000000..330ecfe9cda
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/decks/wizards/millwizard.dck
@@ -0,0 +1,31 @@
+[metadata]
+Name=millwizard
+[Avatar]
+
+[Main]
+4 An Offer You Can't Refuse|SNC|1
+2 Bruvac the Grandiloquent|JMP|1
+2 Court of Cunning|CMR|1
+2 Dreamborn Muse|COM|1
+4 Drowned Secrets|GRN|1
+2 Fractured Sanity|MH2|1
+2 Grindstone|PRM|1
+24 Island|GRN|1
+2 Maddening Cacophony|ZNR|1
+2 Memory Erosion|CM2|1
+3 Propaganda|C20|1
+1 Realmbreaker, the Invasion Tree|MOM|1
+4 Ruin Crab|ZNR|1
+2 Startled Awake|SOI|1
+2 Thought Collapse|RNA|1
+2 Zellix, Sanity Flayer|CLB|2
+[Sideboard]
+
+[Planes]
+
+[Schemes]
+
+[Conspiracy]
+
+[Dungeon]
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castles/black_castle.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castles/black_castle.tmx
new file mode 100644
index 00000000000..5e0c19e94e0
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castles/black_castle.tmx
@@ -0,0 +1,245 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castles/black_castle_f1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castles/black_castle_f1.tmx
new file mode 100644
index 00000000000..9070f8180a6
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castles/black_castle_f1.tmx
@@ -0,0 +1,92 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castles/blue_castle.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castles/blue_castle.tmx
new file mode 100644
index 00000000000..decb19152e7
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castles/blue_castle.tmx
@@ -0,0 +1,236 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castles/blue_castle_f1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castles/blue_castle_f1.tmx
new file mode 100644
index 00000000000..69bc81012b1
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castles/blue_castle_f1.tmx
@@ -0,0 +1,92 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castles/green_castle.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castles/green_castle.tmx
new file mode 100644
index 00000000000..b00c4490382
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castles/green_castle.tmx
@@ -0,0 +1,236 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castles/green_castle_f1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castles/green_castle_f1.tmx
new file mode 100644
index 00000000000..04287369643
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castles/green_castle_f1.tmx
@@ -0,0 +1,92 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castles/red_castle.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castles/red_castle.tmx
new file mode 100644
index 00000000000..98a5cd38c8d
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castles/red_castle.tmx
@@ -0,0 +1,240 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castles/red_castle_f1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castles/red_castle_f1.tmx
new file mode 100644
index 00000000000..2170b67aae2
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castles/red_castle_f1.tmx
@@ -0,0 +1,92 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castles/wastetown..tmx b/forge-gui/res/adventure/Shandalar/maps/map/castles/wastetown..tmx
new file mode 100644
index 00000000000..6841760098f
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castles/wastetown..tmx
@@ -0,0 +1,86 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castles/white_castle.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castles/white_castle.tmx
new file mode 100644
index 00000000000..77f7d095277
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castles/white_castle.tmx
@@ -0,0 +1,229 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/castles/white_castle_f1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/castles/white_castle_f1.tmx
new file mode 100644
index 00000000000..2ecb607936b
--- /dev/null
+++ b/forge-gui/res/adventure/Shandalar/maps/map/castles/white_castle_f1.tmx
@@ -0,0 +1,92 @@
+
+
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/black_castle.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/black_castle.tmx
deleted file mode 100644
index 5ab0337f3f2..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/black_castle.tmx
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/black_castle_f1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/black_castle_f1.tmx
deleted file mode 100644
index b20cfd35a74..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/black_castle_f1.tmx
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/blue_castle.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/blue_castle.tmx
deleted file mode 100644
index 326323b2e20..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/blue_castle.tmx
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/blue_castle_f1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/blue_castle_f1.tmx
deleted file mode 100644
index 06a8a90fc49..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/blue_castle_f1.tmx
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/final_castle.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/final_castle.tmx
deleted file mode 100644
index c0fd25282db..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/final_castle.tmx
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/green_castle.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/green_castle.tmx
deleted file mode 100644
index 56cc33c9a80..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/green_castle.tmx
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/green_castle_f1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/green_castle_f1.tmx
deleted file mode 100644
index 9a22f8f7ee9..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/green_castle_f1.tmx
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/red_castle.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/red_castle.tmx
deleted file mode 100644
index 65dc919a18c..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/red_castle.tmx
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/red_castle_f1.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/red_castle_f1.tmx
deleted file mode 100644
index 1367226c9ca..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/red_castle_f1.tmx
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/white_castle.tmx b/forge-gui/res/adventure/Shandalar/maps/map/main_story/white_castle.tmx
deleted file mode 100644
index 48842fb4ace..00000000000
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/white_castle.tmx
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
diff --git a/forge-gui/res/adventure/Shandalar/maps/map/main_story/colorless_castle.tmx b/forge-gui/res/adventure/Shandalar/maps/map/minibosses/emrakul.tmx
similarity index 94%
rename from forge-gui/res/adventure/Shandalar/maps/map/main_story/colorless_castle.tmx
rename to forge-gui/res/adventure/Shandalar/maps/map/minibosses/emrakul.tmx
index b803cc5d4db..05f8889a9bb 100644
--- a/forge-gui/res/adventure/Shandalar/maps/map/main_story/colorless_castle.tmx
+++ b/forge-gui/res/adventure/Shandalar/maps/map/minibosses/emrakul.tmx
@@ -1,5 +1,5 @@
-