diff --git a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
index 0cae3853cde..0589b21d86f 100644
--- a/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
+++ b/forge-gui/res/adventure/Shandalar/maps/main.tiled-session
@@ -3,13 +3,13 @@
         "height": 4300,
         "width": 2
     },
-    "activeFile": "map/factory_3.tmx",
+    "activeFile": "map/tibalt_f1.tmx",
     "automapping.whileDrawing": false,
     "expandedProjectPaths": [
-        "tileset",
         "map/main_story",
         "map",
-        "obj"
+        "obj",
+        "tileset"
     ],
     "file.lastUsedOpenFilter": "All Files (*)",
     "fileStates": {
@@ -51,7 +51,7 @@
             "scale": 2,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 239.75,
+                "x": 239.5,
                 "y": 136.25
             }
         },
@@ -62,7 +62,7 @@
             "scale": 2,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 399.75,
+                "x": 399.5,
                 "y": 319.75
             }
         },
@@ -1584,8 +1584,8 @@
             "scale": 2,
             "selectedLayer": 6,
             "viewCenter": {
-                "x": 190.5,
-                "y": 136.25
+                "x": 295.5,
+                "y": 152.75
             }
         },
         "map/factory_3.tmx": {
@@ -1593,10 +1593,10 @@
                 4
             ],
             "scale": 2,
-            "selectedLayer": 0,
+            "selectedLayer": 6,
             "viewCenter": {
-                "x": 138.5,
-                "y": 152.75
+                "x": 240.5,
+                "y": 136.25
             }
         },
         "map/factory_4.tmx": {
@@ -2068,8 +2068,8 @@
             "scale": 2.177083333333333,
             "selectedLayer": 3,
             "viewCenter": {
-                "x": 235.86602870813402,
-                "y": 132.05741626794259
+                "x": 79.00478468899522,
+                "y": 136.65071770334927
             }
         },
         "map/kobold_mine.tmx": {
@@ -2111,11 +2111,14 @@
             }
         },
         "map/magetower_1.tmx": {
-            "scale": 4,
-            "selectedLayer": 2,
+            "expandedObjectLayers": [
+                4
+            ],
+            "scale": 2,
+            "selectedLayer": 4,
             "viewCenter": {
-                "x": 218.375,
-                "y": 153.125
+                "x": 218,
+                "y": 153.25
             }
         },
         "map/magetower_10.tmx": {
@@ -2155,8 +2158,8 @@
             "scale": 2,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 449,
-                "y": 401.25
+                "x": 219,
+                "y": 400.75
             }
         },
         "map/magetower_14.tmx": {
@@ -2168,10 +2171,13 @@
             }
         },
         "map/magetower_2.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
             "scale": 2,
-            "selectedLayer": 0,
+            "selectedLayer": 4,
             "viewCenter": {
-                "x": 344,
+                "x": 229.5,
                 "y": 152.75
             }
         },
@@ -2183,31 +2189,34 @@
             "selectedLayer": 4,
             "viewCenter": {
                 "x": 224.25,
-                "y": 123.375
+                "y": 117.5
             }
         },
         "map/magetower_4.tmx": {
             "scale": 2,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 239.75,
-                "y": 136
+                "x": 239,
+                "y": 116.75
             }
         },
         "map/magetower_5.tmx": {
             "scale": 1.3694556451612903,
-            "selectedLayer": 0,
+            "selectedLayer": 5,
             "viewCenter": {
-                "x": 232.5741626794259,
-                "y": 136.55060728744942
+                "x": 232.9392712550608,
+                "y": 136.91571586308427
             }
         },
         "map/magetower_6.tmx": {
+            "expandedObjectLayers": [
+                4
+            ],
             "scale": 2,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 239.75,
-                "y": 136
+                "x": 239.5,
+                "y": 136.25
             }
         },
         "map/magetower_7.tmx": {
@@ -2460,14 +2469,14 @@
         },
         "map/main_story/templeofchandra.tmx": {
             "expandedObjectLayers": [
-                7,
-                2
+                2,
+                7
             ],
-            "scale": 1.5,
+            "scale": 2,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 465.3333333333333,
-                "y": 405.66666666666663
+                "x": 849,
+                "y": 624.75
             }
         },
         "map/main_story/templeofliliana.tmx": {
@@ -3087,8 +3096,8 @@
             "scale": 2,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 248,
-                "y": 176.25
+                "x": 243.75,
+                "y": 171.75
             }
         },
         "map/tibalt_f1.tmx": {
@@ -3096,10 +3105,10 @@
                 12
             ],
             "scale": 3,
-            "selectedLayer": 5,
+            "selectedLayer": 0,
             "viewCenter": {
-                "x": 368,
-                "y": 223.83333333333331
+                "x": 419,
+                "y": 11.5
             }
         },
         "map/tibalt_f2.tmx": {
@@ -3109,8 +3118,8 @@
             "scale": 3,
             "selectedLayer": 4,
             "viewCenter": {
-                "x": 176,
-                "y": 167.83333333333334
+                "x": 173.16666666666666,
+                "y": 165.16666666666666
             }
         },
         "map/tileset/buildings.tsx": {
@@ -3212,9 +3221,9 @@
                 4
             ],
             "scale": 2,
-            "selectedLayer": 0,
+            "selectedLayer": 4,
             "viewCenter": {
-                "x": 329.5,
+                "x": 392.5,
                 "y": 204.25
             }
         },
@@ -3243,7 +3252,7 @@
         },
         "tileset/main.tsx": {
             "dynamicWrapping": false,
-            "scaleInDock": 2,
+            "scaleInDock": 1,
             "scaleInEditor": 1
         }
     },
@@ -3257,26 +3266,27 @@
     "map.tileWidth": 16,
     "map.width": 90,
     "openFiles": [
-        "map/magetower_3.tmx",
-        "map/kiora_island.tmx",
-        "map/factory_2.tmx",
-        "map/factory_3.tmx"
+        "map/xira.tmx",
+        "map/tibalt_f1.tmx",
+        "map/tibalt_f2.tmx",
+        "map/tibalt.tmx",
+        "map/main_story/templeofchandra.tmx"
     ],
     "project": "main.tiled-project",
     "property.type": "string",
     "recentFiles": [
-        "map/magetower_3.tmx",
-        "map/kiora_island.tmx",
-        "map/factory_2.tmx",
-        "map/factory_3.tmx",
-        "map/magetower_2.tmx",
-        "map/magetower_14.tmx",
-        "map/magetower_13.tmx",
-        "map/graveyard_3.tmx",
-        "map/graveyard_2.tmx",
-        "map/fort_10.tmx",
-        "map/fort_2.tmx",
-        "map/fort_8.tmx"
+        "map/xira.tmx",
+        "map/main_story/templeofchandra.tmx",
+        "map/tibalt.tmx",
+        "map/tibalt_f2.tmx",
+        "map/tibalt_f1.tmx",
+        "map/aerie_1B.tmx",
+        "map/aerie_1C.tmx",
+        "map/cave_6.tmx",
+        "map/cave_5.tmx",
+        "map/cave_4.tmx",
+        "map/cave_3.tmx",
+        "map/cave_2.tmx"
     ],
     "resizeMap.removeObjects": true,
     "textEdit.monospace": true
diff --git a/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.atlas b/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.atlas
index 433fbdbccd1..190b415b030 100644
--- a/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.atlas
+++ b/forge-gui/res/adventure/Shandalar/sprites/dungeon/chicken.atlas
@@ -4,8 +4,8 @@ format: RGBA8888
 filter: Nearest,Nearest
 repeat: none  
 Avatar        
-  xy: 41, 82
-  size: 16, 13     
+  xy: 133, 4
+  size: 9, 7     
 Idle 
   xy: 0, 0
   size: 14, 14