diff --git a/AndorsTrail/assets/translation/cs.mo b/AndorsTrail/assets/translation/cs.mo
index bc6fb0155..bf3b0b4df 100644
Binary files a/AndorsTrail/assets/translation/cs.mo and b/AndorsTrail/assets/translation/cs.mo differ
diff --git a/AndorsTrail/assets/translation/de.mo b/AndorsTrail/assets/translation/de.mo
index beb256d18..0d44e480b 100644
Binary files a/AndorsTrail/assets/translation/de.mo and b/AndorsTrail/assets/translation/de.mo differ
diff --git a/AndorsTrail/assets/translation/pl.mo b/AndorsTrail/assets/translation/pl.mo
index 184c6b4b0..49cd11bd9 100644
Binary files a/AndorsTrail/assets/translation/pl.mo and b/AndorsTrail/assets/translation/pl.mo differ
diff --git a/AndorsTrail/assets/translation/pt_BR.mo b/AndorsTrail/assets/translation/pt_BR.mo
index 9fa4703a2..b6e63bac1 100644
Binary files a/AndorsTrail/assets/translation/pt_BR.mo and b/AndorsTrail/assets/translation/pt_BR.mo differ
diff --git a/AndorsTrail/assets/translation/ru.mo b/AndorsTrail/assets/translation/ru.mo
index cd92ca667..9f972e48a 100644
Binary files a/AndorsTrail/assets/translation/ru.mo and b/AndorsTrail/assets/translation/ru.mo differ
diff --git a/AndorsTrail/assets/translation/zh_CN.mo b/AndorsTrail/assets/translation/zh_CN.mo
index 05b19254e..4cae89d2d 100644
Binary files a/AndorsTrail/assets/translation/zh_CN.mo and b/AndorsTrail/assets/translation/zh_CN.mo differ
diff --git a/AndorsTrail/res/raw/conversationlist_sullengard.json b/AndorsTrail/res/raw/conversationlist_sullengard.json
index 84fedc57a..d0f39650f 100644
--- a/AndorsTrail/res/raw/conversationlist_sullengard.json
+++ b/AndorsTrail/res/raw/conversationlist_sullengard.json
@@ -3687,8 +3687,27 @@
         "message":"And where is this person now?",
         "replies":[
             {
-                "text":"I wish I knew. After he told me where to find your stuff, he took off and I was unable to see in what direction he fled.",
-                "nextPhraseID":"sullengard_zaccheria_100"
+                "text":"I wish I knew. After he told me where to find your stuff, he took off and I was unable to see in what direction he fled. Here is your inventory.",
+                "nextPhraseID":"sullengard_zaccheria_100",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"zaccheria_inventory",
+                        "value":1
+                    }
+                ]
+            },
+            {
+                "text":"I wish I knew. After he told me where to find your stuff, he took off and I was unable to see in what direction he fled. I just remembered that I didn't bring your inventory with me. I'll be right back.",
+                "nextPhraseID":"X",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"zaccheria_inventory",
+                        "value":1,
+                        "negate":false
+                    }
+                ]
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/droplists_sullengard.json b/AndorsTrail/res/raw/droplists_sullengard.json
index a3c2926e8..4dea2ef05 100644
--- a/AndorsTrail/res/raw/droplists_sullengard.json
+++ b/AndorsTrail/res/raw/droplists_sullengard.json
@@ -699,7 +699,7 @@
             },
             {
                 "itemID":"diamond_ring",
-                "chance":"2",
+                "chance":"1/500",
                 "quantity":{
                     "min":1,
                     "max":1
@@ -735,5 +735,26 @@
                 }
             }
         ]
+    },
+    {
+        "id":"gapfillerhole_drop",
+        "items":[
+            {
+                "itemID":"gold",
+                "chance":"100",
+                "quantity":{
+                    "min":10,
+                    "max":100
+                }
+            },
+            {
+                "itemID":"gem1",
+                "chance":"100",
+                "quantity":{
+                    "min":1,
+                    "max":2
+                }
+            }
+        ]
     }
 ]
\ No newline at end of file
diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index c245c4045..82f9c5ef8 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -161,7 +161,8 @@
         <item>@raw/questlist_shortcut_lodar</item>
         <item>@raw/questlist_pathway_fallhaven</item>
         <item>@raw/questlist_halvor_surprise</item>
-                                                                                                                -		
+                                                                                                                        -		
+        
         
         
         
@@ -1159,6 +1160,8 @@
         <item>@xml/way_to_sullengard_east_ravine_cabin</item>
         <item>@xml/way_to_sullengard_east_ravine_north</item>
         <item>@xml/way_to_sullengard_pond_road</item>
+        <!--Added by ATCS v0.6.18 for project next_release-->
+        <item>@xml/gapfillerhole</item>
     </array>
         
 </resources>
diff --git a/AndorsTrail/res/xml/cabin_norcity_road3.tmx b/AndorsTrail/res/xml/cabin_norcity_road3.tmx
index 36efcdd93..f0dd19710 100644
--- a/AndorsTrail/res/xml/cabin_norcity_road3.tmx
+++ b/AndorsTrail/res/xml/cabin_norcity_road3.tmx
@@ -182,12 +182,12 @@
  </tileset>
  <layer id="1" name="Ground" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJzbyMnAsHEUj2IK8GYiMbXNI9VcYu2kRdiMmkcd8wAga9o/
+   eJzbyMnAsHEUj2IK8GYiMbXNI9VcYu2lRdiMmkcd8wAdG9o9
   </data>
  </layer>
  <layer id="2" name="Objects" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJytU8uKAjEQ7KsHWSfCQA76D36UH+I37Re4C6MoowdPEx8LellF3T2J3uwiaSYTB98NRdHp6Uol0xlERIax1UQ7xowxL+Ef7xsJyf+41mX+YowiW0uY/13PnrHwGD1T993e04WPhiJqKlsbBnv2XM8i0PS99CMqhKyPA630hj/oyH5tVezF2VJXW+m8llzxlwS+OrVyn0P3P4znb6cvGfEd5B+qeJetOtFv/DzWce57wJwxPiuXuDc2nq7M3Ct6iCWfuR/bfzVRtt9wfnwQoU94xGxC6xTns2DYc1VZxprR+XrqctzZgXumni484i1BS2Z0zflG32bZqxfobd3eeH/3agkjQr2JtrMu8YhWVuIv8+b0Hf5QOwNLa9f2
+   eJytU8tqwzAQ3GsPIbUKAh2af+hH9UPyTfmCNuCEBCeHnKy8oL00IXZ7Ku0tO0iLZcXkvTAMq/WORvJqlBBZxs4QFYwFY9nA6+AbCcm/ufbG/M6YJK6WMv/4npKxChg9c/9dGejCx7Mi6ihXG0d7DnzPKtIMvQwTqoWsTyOt7IQ/6Mh+r6rei7NlvvZpqlp6xF8a+eo+Nvsc+/9hA3+FOWREP8rbqn6XL09EX/p6bHTle8ScM3oPhzg3toGuzNwteogPPvNQu381U67fcv53Iea67hMeMZvQ+tfVLFj23FKOsWZNtZ75HHf2G2nCI94StGRGN5xvzWmWvQaR3s7vjfd3rpYwItabGTfrEpdo5Q3+8mBO7+EPtT3ajNjn
   </data>
  </layer>
  <layer id="3" name="Above" width="20" height="15">
diff --git a/AndorsTrail/res/xml/gapfiller3.tmx b/AndorsTrail/res/xml/gapfiller3.tmx
index 1d0752f35..caa33773b 100644
--- a/AndorsTrail/res/xml/gapfiller3.tmx
+++ b/AndorsTrail/res/xml/gapfiller3.tmx
@@ -1,199 +1,229 @@
-<?xml version="1.0" ?><map height="10" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="14">
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="14" height="10" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="4">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <tileset firstgid="1" name="map_bed_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bed_1.png" width="512"/>
- </tileset><tileset firstgid="129" name="map_border_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_border_1.png" width="512"/>
- </tileset><tileset firstgid="257" name="map_bridge_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_1.png" width="512"/>
- </tileset><tileset firstgid="385" name="map_bridge_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_2.png" width="512"/>
- </tileset><tileset firstgid="513" name="map_broken_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_broken_1.png" width="512"/>
- </tileset><tileset firstgid="641" name="map_cavewall_1" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_1.png" width="576"/>
- </tileset><tileset firstgid="749" name="map_cavewall_2" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_2.png" width="576"/>
- </tileset><tileset firstgid="857" name="map_cavewall_3" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_3.png" width="576"/>
- </tileset><tileset firstgid="965" name="map_cavewall_4" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_4.png" width="576"/>
- </tileset><tileset firstgid="1073" name="map_chair_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_1.png" width="512"/>
- </tileset><tileset firstgid="1201" name="map_chair_table_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_2.png" width="512"/>
- </tileset><tileset firstgid="1329" name="map_crate_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_crate_1.png" width="512"/>
- </tileset><tileset firstgid="1457" name="map_cupboard_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_cupboard_1.png" width="512"/>
- </tileset><tileset firstgid="1585" name="map_curtain_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_curtain_1.png" width="512"/>
- </tileset><tileset firstgid="1713" name="map_entrance_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_1.png" width="512"/>
- </tileset><tileset firstgid="1841" name="map_entrance_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_2.png" width="512"/>
- </tileset><tileset firstgid="1969" name="map_fence_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_1.png" width="512"/>
- </tileset><tileset firstgid="2097" name="map_fence_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_2.png" width="512"/>
- </tileset><tileset firstgid="2225" name="map_fence_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_3.png" width="512"/>
- </tileset><tileset firstgid="2353" name="map_fence_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_4.png" width="512"/>
- </tileset><tileset firstgid="2481" name="map_ground_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_1.png" width="512"/>
- </tileset><tileset firstgid="2609" name="map_ground_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_2.png" width="512"/>
- </tileset><tileset firstgid="2737" name="map_ground_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_3.png" width="512"/>
- </tileset><tileset firstgid="2865" name="map_ground_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_4.png" width="512"/>
- </tileset><tileset firstgid="2993" name="map_ground_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_5.png" width="512"/>
- </tileset><tileset firstgid="3121" name="map_ground_6" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_6.png" width="512"/>
- </tileset><tileset firstgid="3249" name="map_ground_7" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_7.png" width="512"/>
- </tileset><tileset firstgid="3377" name="map_ground_8" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_8.png" width="512"/>
- </tileset><tileset firstgid="3505" name="map_house_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_1.png" width="512"/>
- </tileset><tileset firstgid="3633" name="map_house_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_2.png" width="512"/>
- </tileset><tileset firstgid="3761" name="map_indoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_1.png" width="512"/>
- </tileset><tileset firstgid="3889" name="map_indoor_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_2.png" width="512"/>
- </tileset><tileset firstgid="4017" name="map_kitchen_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_kitchen_1.png" width="512"/>
- </tileset><tileset firstgid="4145" name="map_outdoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_outdoor_1.png" width="512"/>
- </tileset><tileset firstgid="4273" name="map_pillar_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_1.png" width="512"/>
- </tileset><tileset firstgid="4401" name="map_pillar_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_2.png" width="512"/>
- </tileset><tileset firstgid="4529" name="map_plant_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_1.png" width="512"/>
- </tileset><tileset firstgid="4657" name="map_plant_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_2.png" width="512"/>
- </tileset><tileset firstgid="4785" name="map_rock_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_1.png" width="512"/>
- </tileset><tileset firstgid="4913" name="map_rock_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_2.png" width="512"/>
- </tileset><tileset firstgid="5041" name="map_roof_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_1.png" width="512"/>
- </tileset><tileset firstgid="5169" name="map_roof_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_2.png" width="512"/>
- </tileset><tileset firstgid="5297" name="map_roof_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_3.png" width="512"/>
- </tileset><tileset firstgid="5425" name="map_shop_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_shop_1.png" width="512"/>
- </tileset><tileset firstgid="5553" name="map_sign_ladder_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_sign_ladder_1.png" width="512"/>
- </tileset><tileset firstgid="5681" name="map_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_table_1.png" width="512"/>
- </tileset><tileset firstgid="5809" name="map_trail_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_trail_1.png" width="512"/>
- </tileset><tileset firstgid="5937" name="map_transition_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_1.png" width="512"/>
- </tileset><tileset firstgid="6065" name="map_transition_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_2.png" width="512"/>
- </tileset><tileset firstgid="6193" name="map_transition_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_3.png" width="512"/>
- </tileset><tileset firstgid="6321" name="map_transition_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_4.png" width="512"/>
- </tileset><tileset firstgid="6449" name="map_transition_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_5.png" width="512"/>
- </tileset><tileset firstgid="6577" name="map_tree_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_1.png" width="512"/>
- </tileset><tileset firstgid="6705" name="map_tree_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_2.png" width="512"/>
- </tileset><tileset firstgid="6833" name="map_wall_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_1.png" width="512"/>
- </tileset><tileset firstgid="6961" name="map_wall_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_2.png" width="480"/>
- </tileset><tileset firstgid="7081" name="map_wall_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_3.png" width="480"/>
- </tileset><tileset firstgid="7201" name="map_wall_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_4.png" width="480"/>
- </tileset><tileset firstgid="7321" name="map_window_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_1.png" width="512"/>
- </tileset><tileset firstgid="7449" name="map_window_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_2.png" width="512"/>
- </tileset><layer height="10" name="Ground" width="14">
-  <data compression="zlib" encoding="base64">eJzbyMnAcE+SgeGdJITeyImKYeLI9EZO7GoJ6YWJEdJHjn3I8uh6CbkRm72E9OHyHyG3keJGbHLEuI1Y9xMKf2zmAQB5RnCu</data>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Ground" width="14" height="10">
+  <data encoding="base64" compression="zlib">
+   eJzbyMnAcE+SgeGdJITeyImKYeLI9EZO7GoJ6YWJEdJHjn3I8uh6CbkRm72E9OHyHyG3keJGbHLEuI1Y9xMKf2zmAQB5RnCu
+  </data>
  </layer>
- <layer height="10" name="Objects" width="14">
-  <data compression="zlib" encoding="base64">eJx9UcENgCAM7ArwIOGh+2/gBhg+PvxJHAF2kBMIRYFLCA299nqFqEXQRJtKsdc0Bbjg4HYi1Zl4H7pfG9jbLmpss54TNEWpR3+TtXrzjDSB4g2Y+Ttl9QYtq9r8yN/LF3+tMgd8d3VlDaHFOd+98L3jlH3wnXLfnvF4v0u2fw3OzXosMb/Ktt8Dd9M3XQ==</data>
+ <layer id="2" name="Objects" width="14" height="10">
+  <data encoding="base64" compression="zlib">
+   eJx1UTEOgCAM7BdgIGHQ///AH2hYHNw0PkFXZz2BcGC9hLTQa68tIjVOLzK46B9eVEyucMGB3UzMGx87ez03572+KX5I75sRFawHoP6YtNreW92zuQ/Uw998wGLLbNAKro5ruZdLfPPVyn1gblXXFhdazGn3wnvHyfvgnfLcB/G43mrrvwZnpxrdE+9tXe8GQTY49A==
+  </data>
  </layer>
- <layer height="10" name="Above" width="14">
-  <data compression="zlib" encoding="base64">eJy7I8mAE+xDk7sL5N+RhNCUAJh+dPNB4A4WMUL2YdODLo/PDJi/CNlJjt+JdRsIYwsPZPvu4Ak3bPahuxeZj0sOWT+2+AYA7uMj+A==</data>
+ <layer id="3" name="Above" width="14" height="10">
+  <data encoding="base64" compression="zlib">
+   eJy7I8mAE+xDk7sL5N+RhNDkgLeSCHOwmQ8Cd7CIEbIPmx50eXxmwPxFyE5C5rwl0j/YzARhbOGBbN8dPOGGzT509yLzcckh68cW3wCmziYE
+  </data>
  </layer>
- <layer height="10" name="Walkable" width="14">
-  <data compression="zlib" encoding="base64">eJzbKMbAsBENwwC6OD6MDEhRiw0Q0ovNDHLsI8dv5NhHbLji00OsXlLjkdSwAAD4+0eF</data>
+ <layer id="4" name="Walkable" width="14" height="10" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsBENwwC6OD6MDEhRiw0Q0ovNDHLsI8dv5NhHbLji00OsXlLjkdSwAAD4+0eF
+  </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
-  <object height="32" name="north" type="mapchange" width="64" x="160" y="0">
+ <objectgroup id="5" name="Mapevents" visible="0">
+  <object id="1" name="north" type="mapchange" x="160" y="0" width="64" height="32">
    <properties>
     <property name="map" value="wild1"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object height="32" name="south" type="mapchange" width="64" x="64" y="288">
+  <object id="2" name="south" type="mapchange" x="64" y="288" width="64" height="32">
    <properties>
     <property name="map" value="wild3"/>
     <property name="place" value="north"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object height="192" name="forestant" type="spawn" width="288" x="32" y="64">
+ <objectgroup id="6" name="Spawn" visible="0">
+  <object id="3" name="forestant" type="spawn" x="32" y="64" width="288" height="192">
    <properties>
     <property name="quantity" value="2"/>
+    <property name="spawngroup" value="forestant"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" visible="0"/>
-</map>
\ No newline at end of file
+ <objectgroup id="7" name="Keys" visible="0"/>
+</map>
diff --git a/AndorsTrail/res/xml/gapfiller4.tmx b/AndorsTrail/res/xml/gapfiller4.tmx
index 13ff9542e..b1af9e91c 100644
--- a/AndorsTrail/res/xml/gapfiller4.tmx
+++ b/AndorsTrail/res/xml/gapfiller4.tmx
@@ -1,220 +1,259 @@
-<?xml version="1.0" ?><map height="24" orientation="orthogonal" tileheight="32" tilewidth="32" version="1.0" width="15">
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="15" height="24" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="8">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- <tileset firstgid="1" name="map_bed_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bed_1.png" width="512"/>
- </tileset><tileset firstgid="129" name="map_border_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_border_1.png" width="512"/>
- </tileset><tileset firstgid="257" name="map_bridge_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_1.png" width="512"/>
- </tileset><tileset firstgid="385" name="map_bridge_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_bridge_2.png" width="512"/>
- </tileset><tileset firstgid="513" name="map_broken_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_broken_1.png" width="512"/>
- </tileset><tileset firstgid="641" name="map_cavewall_1" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_1.png" width="576"/>
- </tileset><tileset firstgid="749" name="map_cavewall_2" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_2.png" width="576"/>
- </tileset><tileset firstgid="857" name="map_cavewall_3" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_3.png" width="576"/>
- </tileset><tileset firstgid="965" name="map_cavewall_4" tileheight="32" tilewidth="32">
-  <image height="192" source="../drawable/map_cavewall_4.png" width="576"/>
- </tileset><tileset firstgid="1073" name="map_chair_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_1.png" width="512"/>
- </tileset><tileset firstgid="1201" name="map_chair_table_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_chair_table_2.png" width="512"/>
- </tileset><tileset firstgid="1329" name="map_crate_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_crate_1.png" width="512"/>
- </tileset><tileset firstgid="1457" name="map_cupboard_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_cupboard_1.png" width="512"/>
- </tileset><tileset firstgid="1585" name="map_curtain_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_curtain_1.png" width="512"/>
- </tileset><tileset firstgid="1713" name="map_entrance_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_1.png" width="512"/>
- </tileset><tileset firstgid="1841" name="map_entrance_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_entrance_2.png" width="512"/>
- </tileset><tileset firstgid="1969" name="map_fence_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_1.png" width="512"/>
- </tileset><tileset firstgid="2097" name="map_fence_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_2.png" width="512"/>
- </tileset><tileset firstgid="2225" name="map_fence_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_3.png" width="512"/>
- </tileset><tileset firstgid="2353" name="map_fence_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_fence_4.png" width="512"/>
- </tileset><tileset firstgid="2481" name="map_ground_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_1.png" width="512"/>
- </tileset><tileset firstgid="2609" name="map_ground_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_2.png" width="512"/>
- </tileset><tileset firstgid="2737" name="map_ground_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_3.png" width="512"/>
- </tileset><tileset firstgid="2865" name="map_ground_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_4.png" width="512"/>
- </tileset><tileset firstgid="2993" name="map_ground_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_5.png" width="512"/>
- </tileset><tileset firstgid="3121" name="map_ground_6" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_6.png" width="512"/>
- </tileset><tileset firstgid="3249" name="map_ground_7" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_7.png" width="512"/>
- </tileset><tileset firstgid="3377" name="map_ground_8" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_ground_8.png" width="512"/>
- </tileset><tileset firstgid="3505" name="map_house_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_1.png" width="512"/>
- </tileset><tileset firstgid="3633" name="map_house_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_house_2.png" width="512"/>
- </tileset><tileset firstgid="3761" name="map_indoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_1.png" width="512"/>
- </tileset><tileset firstgid="3889" name="map_indoor_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_indoor_2.png" width="512"/>
- </tileset><tileset firstgid="4017" name="map_kitchen_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_kitchen_1.png" width="512"/>
- </tileset><tileset firstgid="4145" name="map_outdoor_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_outdoor_1.png" width="512"/>
- </tileset><tileset firstgid="4273" name="map_pillar_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_1.png" width="512"/>
- </tileset><tileset firstgid="4401" name="map_pillar_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_pillar_2.png" width="512"/>
- </tileset><tileset firstgid="4529" name="map_plant_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_1.png" width="512"/>
- </tileset><tileset firstgid="4657" name="map_plant_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_plant_2.png" width="512"/>
- </tileset><tileset firstgid="4785" name="map_rock_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_1.png" width="512"/>
- </tileset><tileset firstgid="4913" name="map_rock_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_rock_2.png" width="512"/>
- </tileset><tileset firstgid="5041" name="map_roof_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_1.png" width="512"/>
- </tileset><tileset firstgid="5169" name="map_roof_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_2.png" width="512"/>
- </tileset><tileset firstgid="5297" name="map_roof_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_roof_3.png" width="512"/>
- </tileset><tileset firstgid="5425" name="map_shop_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_shop_1.png" width="512"/>
- </tileset><tileset firstgid="5553" name="map_sign_ladder_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_sign_ladder_1.png" width="512"/>
- </tileset><tileset firstgid="5681" name="map_table_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_table_1.png" width="512"/>
- </tileset><tileset firstgid="5809" name="map_trail_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_trail_1.png" width="512"/>
- </tileset><tileset firstgid="5937" name="map_transition_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_1.png" width="512"/>
- </tileset><tileset firstgid="6065" name="map_transition_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_2.png" width="512"/>
- </tileset><tileset firstgid="6193" name="map_transition_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_3.png" width="512"/>
- </tileset><tileset firstgid="6321" name="map_transition_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_4.png" width="512"/>
- </tileset><tileset firstgid="6449" name="map_transition_5" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_transition_5.png" width="512"/>
- </tileset><tileset firstgid="6577" name="map_tree_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_1.png" width="512"/>
- </tileset><tileset firstgid="6705" name="map_tree_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_tree_2.png" width="512"/>
- </tileset><tileset firstgid="6833" name="map_wall_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_1.png" width="512"/>
- </tileset><tileset firstgid="6961" name="map_wall_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_2.png" width="480"/>
- </tileset><tileset firstgid="7081" name="map_wall_3" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_3.png" width="480"/>
- </tileset><tileset firstgid="7201" name="map_wall_4" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_wall_4.png" width="480"/>
- </tileset><tileset firstgid="7321" name="map_window_1" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_1.png" width="512"/>
- </tileset><tileset firstgid="7449" name="map_window_2" tileheight="32" tilewidth="32">
-  <image height="256" source="../drawable/map_window_2.png" width="512"/>
- </tileset><layer height="24" name="Ground" width="15">
-  <data compression="zlib" encoding="base64">eJzbyMnA8E6SgeGeJITeyImKsYlhU3OPCHXYMC57Q1jJtzeFCL3kuncw4s1UNIuYcMdlJzHhTk23jmLyMDFpH1uexJVXibEPXxlDyB3I+ol1K7p+csOJUv9i8weh8EFWBwA+zw8a</data>
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Ground" width="15" height="24">
+  <data encoding="base64" compression="zlib">
+   eJzbyMnA8E6SgeGeJITeyImKsYlhU3OPCHXYMC57Q1jJtzeFCL3kuncw4s1UNIuYcMdlJzHhTk23jmLyMDFpH1uexJVXibEPXxlDyB3I+ol1K7p+csOJUv9i8weh8EFWBwA+zw8a
+  </data>
  </layer>
- <layer height="24" name="Objects" width="15">
-  <data compression="zlib" encoding="base64">eJytVEsKwkAMzUbodmZRcKWX0Bt4Btfq0cQreITRnTuL4roo1q3oQjDBhGZiOwr6IEw/701eMmmrLsTwAD2MPkbF7/T9pVuvpas5hAtfF+61Co8Q+FnpoBUP826QAQwbQva2eTU2vNe8A7DAmKBumsWcJl1QHrY5wFKFranpvkTeKa/rlLzjjD3591ykOWKcMda5MuNfPRmrmiWXXK+Yv8f1rrQj7hVpdc9pPzqfkvNZHYE0gfNKbu31zPy10YlW+DPT7zav4ov6c3Bxz3fMu+J6Y53MnT0/mQnKa2dJ10AonHnu43rfeD5+rntKeXWfm7yJn43xVSS+h1+R+ta0P9uryngPX3oMifo1Hi3nYGF9fOKk6rD/IULbHP3zTOR/qSEzIHOXwhM2snae</data>
+ <layer id="2" name="Objects" width="15" height="24">
+  <data encoding="base64" compression="zlib">
+   eJytVEEOgjAQ7MWEa3sg8aSf0B/4Bs7q04xf8AmVGzeJxjPRAFejBxK7YTdsF6gmOskGKLPd2elCNVUennEbLxcVvpsZpeamfa6n3bXQHQdQ432u2yvxABbXCq1G0Yh3i0ip5UDQ3rIuR4Z77SZK7V2sXd4m8jlDeZZpODkPDixkT0PPhePd465PqptEqMn0a0HOzUXpIo2ZGNN6krCeqRbdH5F/wTMjrNAryOWew35wPgXWk3kAyLFYl2pzrSXyU5FHucTfCr/HtJIu8Oeqfc/PyHuwuaS5k+dHMwF15SzxHgC5FuvG77fHM/469xTqcp+HtJGeTOjKA9/Drwh9a1yf9KoS2u2XGm2gf45m5BwkpI5PnFAf8j8EGJujf54J/S85aAZo7kJ4A0GLeVQ=
+  </data>
  </layer>
- <layer height="24" name="Above" width="15">
-  <data compression="zlib" encoding="base64">eJxjYEAFdyUZMAA2MWqAO0jm0soOQvbC+PSyH9kuetpLb5DEQVgNNv+jxw0t7MXlFnT+YI4bQu7DJU9K+CLrJzevEmMfNcKa2nGF7l+YG/GFK0yeEMAVrtjUAQBpbigm</data>
+ <layer id="3" name="Above" width="15" height="24">
+  <data encoding="base64" compression="zlib">
+   eJxjYEADQgwM8kCsIIQQuiuJrog64A6SubSyg5C9MD697Ee2i5720hskcRBWg83/6HFDC3txuQWdP5jjhpD7cMmTEr7I+snNq8TYR42wpnZcofsX5kZ84QqTJwRwhSs2dQCZQCel
+  </data>
  </layer>
- <layer height="24" name="Walkable" width="15">
-  <data compression="zlib" encoding="base64">eJzbKMbAsJGKGBmQq49UvbjsJcYcUgA2fYTMocROdD242MS6lVQ7KXEvJXaTq5Zce4nRS0xY43MbMebQCxCbdnCJE/IDrvCgRXoiFNbExCsx+kkBpJRXhNQBAC5BcLg=</data>
+ <layer id="9" name="Top" width="15" height="24">
+  <data encoding="base64" compression="zlib">
+   eJxjYEAFdyUZRsEoGAWjYBQMAgAAXjIA9w==
+  </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
-  <object height="32" name="east" type="mapchange" width="32" x="448" y="128">
+ <layer id="4" name="Walkable" width="15" height="24" visible="0">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsJGKGBmQq49UvbjsJcYcUgA2fYTMocROdD242MS6lVQ7KXEvJXaTq5Zce4nRS0xY43MbMebQCxCbdnCJE/IDrvCgRXoiFNbExCsx+kkBpJRXhNQBAC5BcLg=
+  </data>
+ </layer>
+ <objectgroup id="5" name="Mapevents" visible="0">
+  <object id="1" name="east" type="mapchange" x="448" y="128" width="32" height="32">
    <properties>
     <property name="map" value="fallhaven_nw"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object height="32" name="west" type="mapchange" width="32" x="0" y="352">
+  <object id="2" name="west" type="mapchange" x="0" y="352" width="32" height="32">
    <properties>
     <property name="map" value="wild3"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object height="32" name="south" type="mapchange" width="64" x="160" y="736">
+  <object id="3" name="south" type="mapchange" x="160" y="736" width="64" height="32">
    <properties>
     <property name="map" value="gapfiller2"/>
     <property name="place" value="north2"/>
    </properties>
   </object>
-  <object height="256" name="west2" type="mapchange" width="32" x="0" y="480">
+  <object id="4" name="west2" type="mapchange" x="0" y="480" width="32" height="256">
    <properties>
     <property name="map" value="wild3"/>
     <property name="place" value="east2"/>
    </properties>
   </object>
-  <object height="64" name="east2" type="mapchange" width="32" x="448" y="448">
+  <object id="5" name="east2" type="mapchange" x="448" y="448" width="32" height="64">
    <properties>
     <property name="map" value="fallhaven_nw"/>
     <property name="place" value="west2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
-  <object height="192" name="forestdog" type="spawn" width="320" x="64" y="512">
+ <objectgroup id="6" name="Spawn" visible="0">
+  <object id="6" name="forestdog" type="spawn" x="64" y="512" width="320" height="192">
    <properties>
     <property name="quantity" value="3"/>
+    <property name="spawngroup" value="forestdog"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" visible="0"/>
- <objectgroup name="NPCs" visible="0">
-  <object height="128" name="fallhaven_guard" type="spawn" width="128" x="256" y="128"/>
+ <objectgroup id="7" name="Keys" visible="0"/>
+ <objectgroup id="8" name="NPCs" visible="0">
+  <object id="7" name="fallhaven_guard" type="spawn" x="256" y="128" width="128" height="128">
+   <properties>
+    <property name="spawngroup" value="fallhaven_guard"/>
+   </properties>
+  </object>
  </objectgroup>
-</map>
\ No newline at end of file
+</map>
diff --git a/AndorsTrail/res/xml/gapfillerhole.tmx b/AndorsTrail/res/xml/gapfillerhole.tmx
new file mode 100644
index 000000000..a97f3b307
--- /dev/null
+++ b/AndorsTrail/res/xml/gapfillerhole.tmx
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="6" height="6" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="4">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+  <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_fence_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_house_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_plant_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_rock_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_roof_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_transition_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_tree_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+  <image source="../drawable/map_wall_4.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer id="1" name="Ground" width="6" height="6">
+  <data encoding="base64" compression="zlib">
+   eJzbyMnAsBELPgHFuMRPoKmhljgAAfgcIw==
+  </data>
+ </layer>
+ <layer id="2" name="Objects" width="6" height="6">
+  <data encoding="base64" compression="zlib">
+   eJx7IcbA8AKIXwLxW0kGhjeSEPoWkH8biF9B5WFqTgDxNyD+AcW3oWJgzInAxwmII5sLwq+h4gDtHCGv
+  </data>
+ </layer>
+ <layer id="3" name="Above" width="6" height="6">
+  <data encoding="base64" compression="zlib">
+   eJx7I8nA8BaI3wAxDNxBYiODNzjEQeAuDrm3WMRB5oPwXSQaZj4AYxAM1w==
+  </data>
+ </layer>
+ <layer id="4" name="Walkable" width="6" height="6">
+  <data encoding="base64" compression="zlib">
+   eJzbKMbAsBELxgZg4tjkceknRRxEAwCQHhBU
+  </data>
+ </layer>
+ <objectgroup id="5" name="Mapevents">
+  <object id="1" name="east" type="mapchange" x="160" y="64" width="32" height="96">
+   <properties>
+    <property name="map" value="woodsettlement0"/>
+    <property name="place" value="west"/>
+   </properties>
+  </object>
+  <object id="2" name="gapfillerhole_drop" type="container" x="0" y="64" width="32" height="32"/>
+ </objectgroup>
+ <objectgroup id="6" name="Spawn">
+  <object id="3" name="vermin" type="spawn" x="32" y="32" width="96" height="64">
+   <properties>
+    <property name="spawngroup" value="vermin"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup id="7" name="Keys"/>
+</map>
diff --git a/AndorsTrail/res/xml/sullengard_inn.tmx b/AndorsTrail/res/xml/sullengard_inn.tmx
index a1ef43d9e..6f2a764d4 100644
--- a/AndorsTrail/res/xml/sullengard_inn.tmx
+++ b/AndorsTrail/res/xml/sullengard_inn.tmx
@@ -1,232 +1,233 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="14" height="8" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="12">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="14" height="8" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7577" name="map_kitchen_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7705" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7705" name="map_trail_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7833" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7833" name="map_chair_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7961" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7961" name="map_chair_table_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <layer id="1" name="Ground" width="14" height="8">
+ <layer name="Ground" width="14" height="8">
   <data encoding="base64" compression="zlib">
    eJzbIM3AsIFMHEwihulLIhHD9MlwkYZh+nS4SMMgPUFk2BcC1JNIhn3JQD3vOLFjkDwuORAGAJk4M64=
   </data>
  </layer>
- <layer id="2" name="Objects" width="14" height="8">
+ <layer name="Objects" width="14" height="8">
   <data encoding="base64" compression="zlib">
    eJxjYBg4wIRH7pQsA8NJWQgNA0JoNDJYxgahbwHV35SF0DCghEYfZ0fVqyWPnW0EpU1x6LMCqvWVR7BhwAlKu0Lp62j62JDUcsgzUAQAtTkMEw==
   </data>
  </layer>
- <layer id="3" name="Above" width="14" height="8">
+ <layer name="Above" width="14" height="8">
   <data encoding="base64" compression="zlib">
    eJxjYCAfaMtBaAVZCP2Wj4HhHR+aIjmEPLo+bGAaGyp/I5JefPrwAWz6rIkwC5s+ZLHlSOzjSGwrLPqwiVEDAABbcwhj
   </data>
  </layer>
- <layer id="4" name="Top" width="14" height="8">
+ <layer name="Top" width="14" height="8">
   <data encoding="base64" compression="zlib">
    eJxjYBicYKvsQLtgaAAA9HMA0w==
   </data>
  </layer>
- <layer id="5" name="Walkable" width="14" height="8" visible="0">
+ <layer name="Walkable" width="14" height="8" visible="0">
   <data encoding="base64" compression="zlib">
    eJyTlGNgkBwiGB+AyROjjxizkPWi09jMoZZ92NyOTx4A/8EP5w==
   </data>
  </layer>
- <objectgroup id="6" name="Mapevents">
-  <object id="1" name="door" type="mapchange" x="192" y="224" width="32" height="32">
+ <objectgroup name="Mapevents">
+  <object name="door" type="mapchange" x="192" y="224" width="32" height="32">
    <properties>
     <property name="map" value="sullengard1"/>
     <property name="place" value="sullengard_inn_outside"/>
    </properties>
   </object>
-  <object id="2" name="bed1" type="rest" x="32" y="96" width="32" height="32"/>
-  <object id="3" name="bed2" type="rest" x="96" y="96" width="32" height="32"/>
-  <object id="4" name="bed1_key" type="key" x="32" y="96" width="32" height="32">
+  <object name="bed1" type="rest" x="32" y="96" width="32" height="32"/>
+  <object name="bed2" type="rest" x="96" y="96" width="32" height="32"/>
+  <object name="bed1_key" type="key" x="32" y="96" width="32" height="32">
    <properties>
     <property name="phrase" value="sullengard_inn_bed"/>
     <property name="requireId" value="sullengard_hidden"/>
@@ -234,7 +235,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object id="5" name="bed2_key" type="key" x="96" y="96" width="32" height="32">
+  <object name="bed2_key" type="key" x="96" y="96" width="32" height="32">
    <properties>
     <property name="phrase" value="sullengard_inn_bed"/>
     <property name="requireId" value="sullengard_hidden"/>
@@ -242,9 +243,9 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object id="6" name="bed3" type="rest" x="32" y="192" width="32" height="32"/>
-  <object id="7" name="bed4" type="rest" x="96" y="192" width="32" height="32"/>
-  <object id="8" name="bed3_key" type="key" x="32" y="192" width="32" height="32">
+  <object name="bed3" type="rest" x="32" y="192" width="32" height="32"/>
+  <object name="bed4" type="rest" x="96" y="192" width="32" height="32"/>
+  <object name="bed3_key" type="key" x="32" y="192" width="32" height="32">
    <properties>
     <property name="phrase" value="sullengard_inn_bed"/>
     <property name="requireId" value="sullengard_hidden"/>
@@ -252,7 +253,7 @@
     <property name="requireValue" value="1"/>
    </properties>
   </object>
-  <object id="9" name="bed4_key" type="key" x="96" y="192" width="32" height="32">
+  <object name="bed4_key" type="key" x="96" y="192" width="32" height="32">
    <properties>
     <property name="phrase" value="sullengard_inn_bed"/>
     <property name="requireId" value="sullengard_hidden"/>
@@ -261,18 +262,18 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="7" name="Spawn">
-  <object id="10" name="sullengard_innkeeper_spawn" type="spawn" x="288" y="96" width="128" height="128">
+ <objectgroup name="Spawn">
+  <object name="sullengard_innkeeper_spawn" type="spawn" x="288" y="96" width="96" height="128">
    <properties>
     <property name="spawngroup" value="sullengard_innkeeper"/>
    </properties>
   </object>
-  <object id="11" name="sullengard_inn_traveler_spawn" type="spawn" x="384" y="128" width="32" height="32">
+  <object name="sullengard_inn_traveler_spawn" type="spawn" x="384" y="128" width="32" height="32">
    <properties>
     <property name="spawngroup" value="sullengard_inn_traveler"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="8" name="Keys"/>
- <objectgroup id="9" name="Replace"/>
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace"/>
 </map>
diff --git a/AndorsTrail/res/xml/way_to_sullengard_east10.tmx b/AndorsTrail/res/xml/way_to_sullengard_east10.tmx
index 49f516c44..0ad37d8c2 100644
--- a/AndorsTrail/res/xml/way_to_sullengard_east10.tmx
+++ b/AndorsTrail/res/xml/way_to_sullengard_east10.tmx
@@ -190,12 +190,12 @@
  </layer>
  <layer id="2" name="Objects" width="33" height="20">
   <data encoding="base64" compression="zlib">
-   eJy1Vj1LA0EQXay0vCsOLrV/QdBeRUuvEbTKEa4X/G1aWFnFYCkIGrBIEZNLYpFCks4Zbib3srebuwR8MOxHcvvevp39MKbAb2RMnyKnGFGMI7PCIDRrmMbGzCi+KH6k5PbUaisS+X4SGPNI415RuyN9vXh9bNaxAC2ow4bN59NlQD9zP0alLm6rhkNrnurJywYNPh0uH3jObYoMNDC4PQfuIcyb6xOPhtW6hKUO5ePfbB1pWHrAYA3DoOBnBHvF2o+EM4f6J8VySx+wfxZX/98WH3gdElkH9mERuaMJP+aBj1eRgQ/oiwv2HrDbTYDjJ1BPxQfOj1SCvdiFY1dNAysnmd/pxz9q+g7W10LzYUxlHlfLprDz0Yb6jPmQyl6dBoWOmYO/iY48KPfFNlAf9GzoCd+Eoi8ltpv4sWk/6FonYXlO6N5kMD/Xj1pVHcifbdgn+v+6fanAcxLPhzPScN6qrkNQk5tj8M3nVwL7QaEaOqIh0ztD7g/7HK6Djz9xfM99w6B6RjH/Q7R9fETFnTKygu+b95pvX6NijpgTCs4LDoXmQdvjid4perb73h4uDIB/Lv6ftoq80Ny4ob5bimOKE7jjF1QuJQftu9319nDdJ5i/6IGeWRx3MO8Lql9CnuyTvgPxquu52/Ht4eO3deAbAnXdS/+1lKrtSb7pgvfoP749mOdNxrT5n+NiLOb8AxixJec=
+   eJy1Vj1LA0EQXay0vCsOLrV/QdBeRUuvEbTKEdIL/jYtrKxisBQEDVikiMklsUghSecMO5N72dtNLgEfDPuR3L63b2c/jLH4TYzpURQUQ4pRYpbox2YFk9SYKcUXxY+U3J44bUUm348jYx5p3Ctqt6Svm66OzTrmoAV1uHD5QroM6Gfux6TUxW3VcOjMUz15WaMhpMPnA8+5SdEGDQxuz4B7APPm+jigYbkucalD+fg3V0celx4wWMMgsvyMaM+u/VA4C6h/Uiy29AH7p2n1/03xgdchk3VgH+aJP+rwYx6EeBVt8AF98cHdA267DnD8DOq5+MD5kUuwF7tw7Kqp7+Qk83v9+EdN39HqWmg+jKgs0mpZF24+ulCfMR9y2auTyOqYevjr6Ciicl9sA/VBz4au8I0pelJiu44f6/aDrnUWl+eE7k0G83P9qFHVgfztNftE/79pXyrwnMTz4Yw0nDeq6xDFNodCGIFvIb8y2A8K1dASDW29M+T+cM/hTQjxZ57vuW8QVc8o5n9Ito+PxN4pQyf4vnnf8O1rYueIOaHgvOBQaB40A57onaJne+jt4UMf+Gfi/2nD5oXmxg313VIcU5zAHT+nciE56N7tvreH7z7B/EUP9MziuIN5X1D9EvJkn/QdiFedwN2Ob48Qv6sD3xCo6176r6VUbU/yTQe8R//x7cE8bzKmy/+c2rGY8w98zSbf
   </data>
  </layer>
  <layer id="3" name="Above" width="33" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYMAELyUZGF5JYpFAAnckMfl3JXHzcYGdONRcFyKsF5v96O4aaEBsOFDLHnLtwxUPpNqPiz+UAKVhMdTtR3bDTSB9SxKTJhZQmg52QvWT6w5qlAc78dhPSniQGw6wuEBPF6TEA8yd1CgfzKRI138TST8p7sblBlzguSBhNeTaT4o7aA2Q3QBiU8NNpKRlZPtMkNIDtrQBU7sZSuNLg7C2B3p9hq1+o9TPbwnof0OmO6iZPnDVqzB6IxBvksQsr0kxkxB4Q4TaQ1A1ADjma7Q=
+   eJxjYMAELyUZGF5JYpFAAnckMfl3JXHzcYGdONRcFyKsF5v96O4aaEBsOFDLHnLtwxUPpNqPiz+UAKVhMdTtR3bDTSB9SxKTJhZQmg52QvWT6w5qlAc78dhPSniQGw6wuEBPF6TEA8yd1CgfzKRI138TST8p7sblBkoAufZT2x3UcgOITQ03kZKWke0zQUoP2NIGTO1mKI0vDcLaHuj1Gbb6jVI/vyWg/w2Z7qBm+sBVr8LojUC8SRKzvCbFTELgDRFqD0HVAADUu2q8
   </data>
  </layer>
  <layer id="4" name="Top" width="33" height="20">
diff --git a/AndorsTrail/res/xml/way_to_sullengard_east11.tmx b/AndorsTrail/res/xml/way_to_sullengard_east11.tmx
index f9434bf57..df6038431 100644
--- a/AndorsTrail/res/xml/way_to_sullengard_east11.tmx
+++ b/AndorsTrail/res/xml/way_to_sullengard_east11.tmx
@@ -190,12 +190,12 @@
  </layer>
  <layer id="2" name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytVjtOA0EMnTJlkiLSFiBOwQ1AaRMJRAFF0tNxEbgBHAIkWjqqVKTgU6TId0OinIAxjJO3jj07AZ40mp1d28/2eGZ9UHdukTm3zDbzsuZc7ud5tpn5G69JRuqtvK2Jn6fZ9kzo+O8tP9r1n/Wk5pLAep2g161vvrXgOcbdBjkNvWzzzPEwULcNPiwCx8yP1zDjWvqgcQ2CvRzezYONluHzOn+CW3JOsm3dnuITcX9m2zZZBv3oALfkQr0B7ktkn7meNG7i6iq5l3lBvd+CbVhc7Ae/l3lAHFWcO9xhsA18d1wp2hzXivwamqDT9/KvkbxfVZ279uOmWrTPNtrGGdPWrDMDvqngHsP61nPeVXUbg5KaR5BsLEYG+ZUHuX6t6GuzouvEQDocTw78w/D8UuIT+WDxYm5zUVeazjjxDv22p/AOhT6eR8kr99Syo8ml5NmKV+azH/aTa+VN4ZP1HOO04iXEYpaYwv7HeJlzlXCO1jrwjuxrMrMSXspXWbyMXeqKcOZtPCs6FyX1zDmTe6jVE8uwb/KueGw4d28M52VHQe9E3L9kZ5f7msZpyBn92x4aRT/OS3oNC6n9EIN4Yz3PX2HdxRyvxo2QfRRhlHDfSHBdcbxav8W5+888TICXbct+S+O0fOA+6wP6rRiYl86CZdPqOxnYX2I/j5B7gvWs1bLVd+J+W/6kxBtDyv4yt1Z/CKyrS6O/wFm+j/mHsPxY15Vy7vc8x37iPSLtv5fkW+aZ/kNP4X/0BXXoL7M=
+   eJytVr1OAzEMztix1wHpBhBPwRuAWHsSiAGGdmfjReAN4CFAYmVjYqIDP0MH2l6vFPEExBC337l2LgU+KcrlzvZnO07O2x3n5rlzH/ly/sicq/w8y5czf+M1yUi9T29r4ucyX50JPf+960fR+VlPMpcE1usFvX5n+a0LzzHuAuQ0POTLZ46HgboF+DAPHFM/nsKMa+mDxjUM9ip4Nws2uobPi/wJbsk5yVd1HxSfiPs9X7XJMuhHD7glF+oNcV8i+8z1pHETV1/JvcwL6v0WbMPiYj/4vcwDYrfl3M4ag23gu71W3eY4q/Nr2AedgZd/iuT9rO3cuR8X7bp9tlEYZ0xbs84U+ErBPYb1pee8aus2hg01jyDZWIwM8qsKcoOs7ut+S9eJgXQ4ngr438LzY4NP5IPFi7mtRF1pOuPEO/TbnsL7JvTxPEpeuaeWHU0uJc9WvDKfg7CfXCvPCp+s5xinFS8hFrNECfsf42XOz4RztNCBd2Rfk5k28FK+muJlrFNXhCNv417ROQkxlpm+v5wzuYdaPbEM+ybvitsN566N4bzsKOgdiPuX7KxzX9M4DDmjf9vNRt2P44Zew0JqP8Qg3ljP81dYdzHHq3EjZB9FGCXcNxJcVxyv1m9x7v4zDxPgZduy39I4LR+4z3qFfisG5qWzYNm0+k4G9pfYzyPknmA9a7Vs9Z2435Y/KfHGkLK/zK3VHwLr6tToL3CW72P+ISw/FnWlnPtNz7GVeI9I+y8N+ZZ5pv/QXfgffQEB6TCu
   </data>
  </layer>
  <layer id="3" name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYKA+uCnJwHBLEpMmBhxAUncfyH5AhL77WOwixg0HsJh9Byh2VxJBE3L3BzR5ZPXIdqODA1jc9A7IvgfELyVRzSI27NDtJEUfCNzFop5UM2BuGKqAHP9SCsw4IHgUkAY86BRmdwYgTcDKn4EAI8W/Ax3GIyl+XwnS305iATXKXkraPLSwGxkQ044iNT0S8i+9wgGfnbjcgN7GowYgJ/4ptRs5npHtQo7vgUiP6IDYdjy1Abp/ae0Oapi/GS3ecAH0NIxMw9jkpC8A7ex+nA==
+   eJxjYKA+uCnJwHBLEpMmBhxAUncfyH5AhL77WOwixg0HsJh9Byh2VxJBE3L3BzR5ZPXIdqODA1jc9A7IvgfELyVRzSI27NDtJEUfCNzFop5UM2BuGKqAHP9SCsw4IHgUkAY86BRmdwYgTcDKn4EAI8W/Ax3GIyl+BzOgRtlLSZuHFnYjA2LaUaSmR0L+pVc44LMTlxvQ23jUAOTEP6V2I8czsl3I8T0Q6REdENuOpzZA9y+t3UEN8zejxRsugJ6GkWkYm5z0BQBh+n2h
   </data>
  </layer>
  <layer id="4" name="Top" width="30" height="30">
diff --git a/AndorsTrail/res/xml/way_to_sullengard_east4_bridge.tmx b/AndorsTrail/res/xml/way_to_sullengard_east4_bridge.tmx
index 6c24bed4a..206af7c43 100644
--- a/AndorsTrail/res/xml/way_to_sullengard_east4_bridge.tmx
+++ b/AndorsTrail/res/xml/way_to_sullengard_east4_bridge.tmx
@@ -198,7 +198,7 @@
  </layer>
  <layer id="3" name="Objects" width="20" height="29">
   <data encoding="base64" compression="zlib">
-   eJydlb1OwzAQxxNPLSChhqppKRFsILVIbEUIJiYEEzwBAx8VIxILzwRsIPEGjEBHxMBQUSgjUAEDPs5WLpdzEvGXTneJ7d/dOXLcC7w/DRqe96LtRrBegDbU8Rt5vzSNflaPzQUxA/wrxBV8fjI5uK5rnneZY7Ce1kf1XEk+X9XiXH025gU4n3JsP6IC5OUpqz+uIry7APdNEs8DPLsHQ9IXndeqZ9t3iHs17iNvwk/m+AqT8/P0E6KXeMBqF2CAyiqOoS/Ks98wi3Wk5Pg2Qt80dc0Yfx+514NOlRxbtTRnRVvbT4/RNWVhraQ8Hhev97+8XcPhPS6yZ8pbL9gT1RrbT8rbYTypt48ITVJDufsdU5jvmDEfzDkaRRg/sDPo4n06arCanJLfU15DJVk0N8R9IQe8r2r2eyTXx+uiTMqb17kXFJ4tOsfVL6+N8zqatSzsLeXZdZR1Rhgjtg/8W7jqg/2gczthei3kOTd2QfJY3qrvzrkRxmNVx3e12jT/q62M82Z5VlJOOhd4B9ofOqyrrVkvZl3DG7Cc/J61dzso756z9xufR5l7JbT9UnpsW7jfiuqklF7vqg9k7/5H423Nv9NNlm0=
+   eJydlb1Ow0AMx5NMKSChhqppKRFsILVIbEUIJiYEEzwBAx8VIxILzwRsIPEGHYGOFQNDRaGMQAUMnPGd4ji+JOIvWXZydz/bF12uFzh/GtYd50VZV7BegDZS8Rt5vzKLfl6NLQQxA/wrxGV8ftI5uG6rjnOdY7Ce1kf1XE4+31TjXAM25gQ4n3JMP6IC5OUpqz+uIrz7APdNEs8DPLMHI9IXndesZdt3iHs16SJvyk3m+AqT8/P0E6KXeMBqFWCASl4cQ1/A62qe+YZZrBNPju8i9A1d15z2D5F9Pejck2OjpuKsKWu56TG6piSslZTH4+L1/pe3rzm8x2X2THmbBXui2mD7SXl7jCf19hGhSap79n4nPMx3yph9fY7GEcZ9dgZtvE9LDUbTM/J7yqt7SRbNDfFAyAHvK4r9Hsn18book/IWVe4lD88qnWPrl9fGeW3FWhX2lvLMOsq6IIwx2wf+LWz1wX7Que0wvRbyXGq7InkMb92159wK47GK5bsabev/307GeTM8IyknnQu8I+WPLdZR1qgVs47mDVlOfs+aux2Ud8+Z+43Po8wDH+3QT4/tCvdbUZ356fW2+kDm7n/U3tT8C0Zkln8=
   </data>
  </layer>
  <layer id="4" name="Above" width="20" height="29">
diff --git a/AndorsTrail/res/xml/wild6.tmx b/AndorsTrail/res/xml/wild6.tmx
index aa45eb8d1..4edc699cc 100644
--- a/AndorsTrail/res/xml/wild6.tmx
+++ b/AndorsTrail/res/xml/wild6.tmx
@@ -1,301 +1,300 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "https://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
+<map version="1.8" tiledversion="1.8.4" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="19">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32">
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32">
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32">
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32">
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32">
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="30" height="30">
+ <layer id="1" name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
    eJztlTEOwjAMRaMwIOZO7dl7BYqYGWhmpsLeCVbOAFFVxWptWscmkRDDU5YoL/5ynMYa0yAc3hx3cTxLY/oyrNgezCn1Tt0aXur+XCivE9Yb4/W13pheKk+u95u15vL6bCRebrYjvdAb29tUvRq9XC+codHLn86k/JyM1+S6J+bBklea8XnlHNLOuLODuwU45NzpnR5WPoO9+wrAaoFOaa2Quw1QfcXJV/M/SjGPMa/an1cgEHthxrHzdsQVc7B93qOZ8amaQ/WIpvdSBTbbYU1RL4dcXmxmp/Lmer9/7+96X/AekpQ=
   </data>
  </layer>
- <layer name="Objects" width="30" height="30">
+ <layer id="2" name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
    eJylVstqAkEQHCTmFkmECIIfkWt+KMd8Qs6BfELwlGM8Jzl5CVniA8FDFFHwJmgUAvmBTOM0W7Q9vTumYNl11+2qru6eWefi6Dade204l104t/XXO38M4Pqs7lytnv8mbJuHcejZAt6jawujwJsKjTvlOYF4V0LfDt5bRrRzbujFw/n+/FazOclTzBdjpIK1U80+C3gJyLsRuV3Vcz2IkaHtvmr73KnkvDEvESleWPHYl2P6ytJSpqckL/qnvZ8ZeVCv0PwUedcNcXvA2w/vYH+n9llRvjI3zS95b+1/b/zxGHqjXTnsxTLcWch1UKKvGMyJIH5co3gOJLCXJThHTctTNa6nHWJaM8Z6cK2y5oT8/W6m+aJh0cx5Y2s49y73J9f2v5y7yJ6g9QniWakvoQP3tb5CP3sl14xp0MLeSG7inIJeWY+OolXzj3VZ3g4Nz/EZc1LdSE+m5HrMfrSS9RcztBDxUtfldQk92tzKWjOvNW/0rJ84O1vFY/TRyledLZ/LrY/z0fI18sfv6f72jV9Lxg1d/0zcW8F3xvgyr03RXnLneb8856SV35NrGObLcX8gLs/QxJ9flGMGfqzEjFyf2PrK7sEWYrqkNsJa+PUOz5cwQ7Q20axNxf9j+zvWAWdU04YYFvQU1yNl/ZffwBaYl/eZeTgzin4TtJ5nn1A3f9dwL3Pu85Cj1FB0tjRhPWi+eK/hfPEd0m9xpWpjYO7Eu4ZYsTPGYl/LavoD3oARhQ==
   </data>
  </layer>
- <layer name="Above" width="30" height="30">
+ <layer id="3" name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
    eJzFVksOgkAMRTawcqPReHhvYtxwA12NURM9iFFCJpbaz5SW+DY4dIb3eP1gVfHoNkLQgetOjlO8/Zmbcg7Duh/zajqjUOoz9uCo6JP095wnY36tfnK8XlC1oNUHxQv9m1JfJSh9Xyu3pYc4vzDS597F6cFcM0PjpGo5IqdSj3FzikOEvxxvCTTus/Dc7HF0j8DcUd7NVU/S7KPqCecO1paU14PgF4yVzGPP94jT6PU3P/e+sp3rmFqS+g3GHs1wfSHeZzNewzxBj6fW8aIdrsv1+H7d/mrM0Dz2zAXpP0sfi5g3Gdv6+1vrn39A4pX6UELJuX1dtjdq/kNQMzvzYD5tbQH2mnr3rEFbWzRROU4OTyVNCfUSx4n3RsLbS1Ztbwsyfls=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer id="4" name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJy9lMsNwzAMQzNF9l8hG/YUoAhs8pFVKsAHA7RIU5/rPI5LnDsU5htLcDRXGi5Hw7nygXInnijONqY8ph4QTppnx02wU/1EtLQ9pXISDRMz1HiT1pf0djqLZH4m/kNwKudOC/FP7Q7HmfI1/3UeK/0NbzvDSZ9Ocu7yOm07/au7q7nSl9R0wv8V9y+R1ov4rN46bsJH/53O8fMN9bjFtb3cBPVrii8NN0OJrnS/rmqvsBMeuZ2T7NvnW6Kf9F1ynKZkxt86/+T8AHX9Pf8=
+   eJy9lEsKwzAQQ3OK3v8KvmFXhRJs6UlMMuCFQR7Jms/6XNcS5xcK848lOJorDZej4dz5QLkTTxRnG1MeUw8IJ81z4ibYqX4iWtqeUjmJhmaGJvosrS/hTGeRzM/EfwhO5TxpIf6p3eE4U77mv85jpb/hbWc46dNJzlNep+2kf3d3NVf6kppO+b+7t5HWi/is3jpuwkf/nc7x/Q31uMW1vdwE9WuKLw03Q4mudL/uaq+wEx65nZPs2/tbop/0XXKcpmTGnzpvcn4Bvhk/jQ==
   </data>
  </layer>
- <objectgroup name="Mapevents">
-  <object name="north" type="mapchange" x="256" y="0" width="64" height="32">
+ <objectgroup id="5" name="Mapevents">
+  <object id="1" name="north" type="mapchange" x="256" y="0" width="64" height="32">
    <properties>
     <property name="map" value="wild5"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="928" y="736" width="32" height="96">
+  <object id="2" name="east" type="mapchange" x="928" y="736" width="32" height="96">
    <properties>
     <property name="map" value="wild9"/>
     <property name="place" value="west"/>
    </properties>
   </object>
-  <object name="south" type="mapchange" x="96" y="928" width="96" height="32">
+  <object id="3" name="south" type="mapchange" x="96" y="928" width="96" height="32">
    <properties>
     <property name="map" value="wild7"/>
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="house" type="mapchange" x="704" y="672" width="32" height="32">
+  <object id="4" name="house" type="mapchange" x="704" y="672" width="32" height="32">
    <properties>
     <property name="map" value="wild6_house"/>
     <property name="place" value="entrance"/>
    </properties>
   </object>
-  <object name="sign_wild6" type="sign" x="256" y="672" width="32" height="32"/>
-  <object name="east2" type="mapchange" x="928" y="544" width="32" height="64">
+  <object id="5" name="sign_wild6" type="sign" x="256" y="672" width="32" height="32"/>
+  <object id="6" name="east2" type="mapchange" x="928" y="544" width="32" height="64">
    <properties>
     <property name="map" value="wild9"/>
     <property name="place" value="west2"/>
    </properties>
   </object>
-  <object name="east3" type="mapchange" x="928" y="320" width="32" height="128">
+  <object id="7" name="east3" type="mapchange" x="928" y="320" width="32" height="128">
    <properties>
     <property name="map" value="wild9"/>
     <property name="place" value="west3"/>
    </properties>
   </object>
-  <object name="north2" type="mapchange" x="608" y="0" width="32" height="32">
+  <object id="8" name="north2" type="mapchange" x="608" y="0" width="32" height="32">
    <properties>
     <property name="map" value="wild5"/>
     <property name="place" value="south2"/>
    </properties>
   </object>
-  <object name="sign_wild6_stump" type="sign" x="576" y="640" width="32" height="32"/>
-  <object name="brv_patrol_check_stop_hero" type="script" x="128" y="480" width="448" height="320">
+  <object id="9" name="sign_wild6_stump" type="sign" x="576" y="640" width="32" height="32"/>
+  <object id="10" name="brv_patrol_check_stop_hero" type="script" x="128" y="480" width="448" height="320">
    <properties>
     <property name="when" value="enter"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object name="forestboar2" type="spawn" x="192" y="96" width="480" height="256">
+ <objectgroup id="6" name="Spawn">
+  <object id="11" name="forestboar2" type="spawn" x="192" y="96" width="480" height="256">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="forestboar2"/>
    </properties>
   </object>
-  <object name="forestbeetle" type="spawn" x="381" y="221" width="512" height="352">
+  <object id="12" name="forestbeetle" type="spawn" x="381" y="221" width="512" height="352">
    <properties>
     <property name="ignoreAreas" value="true"/>
     <property name="quantity" value="4"/>
     <property name="spawngroup" value="forestbeetle"/>
    </properties>
   </object>
-  <object name="forestwasp" type="spawn" x="160" y="352" width="320" height="288">
+  <object id="13" name="forestwasp" type="spawn" x="160" y="352" width="320" height="288">
    <properties>
     <property name="ignoreAreas" value="true"/>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="forestwasp"/>
    </properties>
   </object>
-  <object name="fox2" type="spawn" x="96" y="512" width="256" height="320">
+  <object id="14" name="fox2" type="spawn" x="96" y="512" width="256" height="320">
    <properties>
     <property name="ignoreAreas" value="true"/>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="fox2"/>
    </properties>
   </object>
-  <object name="forestwolf1" type="spawn" x="352" y="640" width="512" height="256">
+  <object id="15" name="forestwolf1" type="spawn" x="352" y="640" width="512" height="256">
    <properties>
     <property name="ignoreAreas" value="true"/>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="forestwolf1"/>
    </properties>
   </object>
-  <object name="unzel" type="spawn" x="896" y="64" width="32" height="32">
+  <object id="16" name="unzel" type="spawn" x="896" y="64" width="32" height="32">
    <properties>
     <property name="spawngroup" value="unzel"/>
    </properties>
   </object>
-  <object name="knights" type="spawn" x="96" y="448" width="512" height="384">
+  <object id="17" name="knights" type="spawn" x="96" y="448" width="512" height="384">
    <properties>
     <property name="active" value="false"/>
     <property name="ignoreAreas" value="true"/>
@@ -304,8 +303,8 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys">
-  <object name="stop_hero" type="key" x="96" y="448" width="512" height="384">
+ <objectgroup id="7" name="Keys">
+  <object id="18" name="stop_hero" type="key" x="96" y="448" width="512" height="384">
    <properties>
     <property name="phrase" value="brv_wait_patrol"/>
     <property name="requireId" value="brv_nondisplay"/>
diff --git a/AndorsTrail/res/xml/woodsettlement0.tmx b/AndorsTrail/res/xml/woodsettlement0.tmx
index 9509e4b3d..d16a185b6 100644
--- a/AndorsTrail/res/xml/woodsettlement0.tmx
+++ b/AndorsTrail/res/xml/woodsettlement0.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="30" height="14" tilewidth="32" tileheight="32" infinite="0" nextobjectid="18">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="30" height="14" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="20">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -183,37 +183,37 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="30" height="14">
+ <layer id="1" name="Ground" width="30" height="14">
   <data encoding="base64" compression="zlib">
-   eJzbyMnAsHGI4HuSCPYBYfyYFDPfSRJnJwhfEMaPQWpA5iHrQ2ajy6GL45LfL4UfY/PLOxxuIAWfl8KP0d2OzV/IfErjC1vcYfMbsfFGTbdhCwN88UWK24gJA2S78cUXKW4jhPHFPalpitg8SCiNEYoTcuOS2LBHz++EzEY3B5/duNSihxGxduAyB91MQuUTpRjmVgAkVFI1
+   eJzbyMnAsHGI4HuSCPYBYfyYFDPfSRJnJwhfEMaPQWpA5iHrQ2ajy6GL45LfL4UfY/PLOxxuIAWfl8KP0d2OzV/IfErjC1vcYfMbsfFGTbdhCwN88UWK24gJA2S78cUXKW4jhPHFPalpitg8SE4aoaU+dLXo+Z0Y9ej5H5fduNSihxGxduAyB91MQuUTpRjmVgDj9lFe
   </data>
  </layer>
- <layer name="Objects" width="30" height="14">
+ <layer id="2" name="Objects" width="30" height="14">
   <data encoding="base64" compression="zlib">
-   eJyNVE9LQkEQH15YBlG+BZUXdesSBPlZutTVPEYEeYiI6Nzn6SMEmSlYBCVShwTNwnfqHDTj7jDjvvfMHywzuzv/Z3abIcA4AohxtZEHAxM0kL+J5I4pnb8hfY+s7FeYlJnYgeQ506a7J/SQrxixeY/7W6RdJ/Ps5OmeQPr1AkwhCpI8yzM+Q9EnkC8tw3ufss6asX6Xg2m7/n6sbMbR7DtdFx90vufyrCI9Rj/bm3L/swjwUJQzP5exil3b3MI6tDCXsxxM+uf3hnCI/l5R7hxlLgObYxnXBq6FJcmbztJi5zOmOysAA/T1YUSG+7TuaK1gZ4ug5YahnRHCXWjnLQ3xjHx96J6R36fS9ExGQVJnYCQnXa9WmKwB5UvzNli1e+oVgXt1Eohffis6Js33jcxuW9WikVEHRtnrFeEqsHP84nRLbqaOHOU4h8r2CPl+0caqkTW3FSOxEqiuXWXvOicxXbi4OE7CPtbloCC62h/Nazflb/Gx62LoeX7Z3i/SR3X3rfh2Sl3ZB9nrhFbf/18YI/XPsF41D3CKq46rlhfZ1j89JOh5z/LJIJ+dGbHNC/8NZf1P+s8gZP3381DGH1r9qyU=
+   eJyVVE9LQkEQH15YBlFvF1Re1K1LEORn6VJX8xgR5CEionOfp48QZKZgEZRIHRI0Cz11Dppxd9hx31urHywzuzv/Z3YbCmCUAIxxtZAHDRPUkb9K3B1TOn9B+poY2Q+VlpnYgfQ504a9J3SRL2tn8xb310g7VubRytM9gfRrMUwhidI8yzPeldMnkC8pw3ufss6KNn4Xo2m7/n4kbI6T2XeyLj7ofMfmWUF6iH4219391zzAXcGd+bmMROzS5gbWoYm5nORg0j+/N4R99PeMcqcocx6ZHEu41nDNLbi86Swrdj5jurUE0Edfb9rJcJ9WLa3GZrYIUm6gzIwQbpSZtyyMZ+TrQ/aM/D4Up2cyidI6fe1ykvVqqnQNKF+at/6y2VOvCNyro8j55bciY5J8T7vZbYla1AN1YJS8XhEuIjPHT1a3aGfqwFKOcyBsD5HvFUysEqG5LWsXK4Hq2hH2LnMupjMbF8dJ2MW67MVOV/qjee0E/haJbRtD1/PL9r6R3ou7T8G3MurKeZK9tjL6IQzFP8N6lTzAMa4armreyTZ/6SEhNO9ZIJ9tlf77/gv/DYX+J7/2of/+L5TxAw5yqkE=
   </data>
  </layer>
- <layer name="Objects_1" width="30" height="14" visible="0">
+ <layer id="3" name="Objects_1" width="30" height="14" visible="0">
   <data encoding="base64" compression="zlib">
    eJxjYBgFIw2ICjEwqAgOtCtGwSgYBaMAFQAArbgAXQ==
   </data>
  </layer>
- <layer name="Above" width="30" height="14">
+ <layer id="4" name="Above" width="30" height="14">
   <data encoding="base64" compression="zlib">
-   eJzFU0EOQDAQLBeOPUn6Iv7tBZzrwEtEZIM12+0iMZfKZtbMGHXuH0zh+e5c6Zyl2jViOLQiO60oap1TMg5pvcmbg765z97mzcHIdCeQl55TvW19DSCDBJRJypvqjfrSvFn85HRNfeV4s0DT5n0hbN5a71znr/PzXbJqa7uSt/N3Tf3H/K5zPtJGfHpPak/zgOaSJy0TymWBpvEFIvMpnZyPvK6fhkf8
+   eJzFVDEOgCAQQxcdnUx4kf7bF+gMg77EGHNRz3LH4WAXDOmlLRWc+wfRl8+ujc7ZmlMj+EsrsNWKqtU5NeOQ1pe8OZj6997XvDlYmG4Eeelb6u3oawYZUkCZUnml3qgvzZvFT07X1FeONws0bd4XwuFt6Jwbu+f+/S5ZtbXZlLf7uWr/MdfQOkF8ejOkOYmLPEqepEzRP9+wkntcOmdBAD7RyvnI6w6U7Erb
   </data>
  </layer>
- <layer name="Walkable" width="30" height="14">
+ <layer id="5" name="Walkable" width="30" height="14" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsHEUD1oMAoPJXnLdAwPEqCEWUCsMCZlHrp3UtJfYMEAWx2U2LeylVB+6ewnpIdZuctMYrdI4qWlzpGEAXhoGBw==
+   eJzbKMbAsHEUD1oMAoPJXnLdAwPEqCEWUCsMCZlHrp3UtJfYMEAWx2U2LeylVB+6e3HpIeRvQvYRCwiFKza1+PxIadokx+yhiAFLtvyk
   </data>
  </layer>
- <layer name="Walkable_1" width="30" height="14" visible="0">
+ <layer id="6" name="Walkable_1" width="30" height="14" visible="0">
   <data encoding="base64" compression="zlib">
    eJxjYBgFIxFsFBtoF4yCUTAKRgEqAACYzwDI
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup id="7" name="Mapevents">
   <object id="1" name="east" type="mapchange" x="928" y="224" width="32" height="64">
    <properties>
     <property name="map" value="roadbeforecrossroads2"/>
@@ -242,49 +242,55 @@
   <object id="6" name="sign_wdsetl0" type="sign" x="800" y="256" width="32" height="32"/>
   <object id="7" name="sign_wdsetl0_grave1" type="sign" x="128" y="160" width="32" height="32"/>
   <object id="8" name="sign_wdsetl0_grave2" type="sign" x="128" y="224" width="32" height="32"/>
-  <object id="16" name="sign_wdsetl0_grave3" type="sign" x="160" y="128" width="32" height="32"/>
-  <object id="17" name="algore_killed" type="script" x="896" y="224" width="32" height="64"/>
+  <object id="9" name="sign_wdsetl0_grave3" type="sign" x="160" y="128" width="32" height="32"/>
+  <object id="10" name="algore_killed" type="script" x="896" y="224" width="32" height="64"/>
+  <object id="11" name="west" type="mapchange" x="0" y="320" width="32" height="96">
+   <properties>
+    <property name="map" value="gapfillerhole"/>
+    <property name="place" value="east"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn">
-  <object id="9" name="pig" type="spawn" x="672" y="160" width="128" height="224">
+ <objectgroup id="8" name="Spawn">
+  <object id="12" name="pig" type="spawn" x="672" y="160" width="128" height="224">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="pig"/>
    </properties>
   </object>
-  <object id="10" name="smuggler6" type="spawn" x="512" y="320" width="32" height="32">
+  <object id="13" name="smuggler6" type="spawn" x="512" y="320" width="32" height="32">
    <properties>
     <property name="spawngroup" value="smuggler6"/>
    </properties>
   </object>
-  <object id="11" name="vermin" type="spawn" x="256" y="288" width="160" height="96">
+  <object id="14" name="vermin" type="spawn" x="256" y="288" width="160" height="96">
    <properties>
     <property name="spawngroup" value="vermin"/>
    </properties>
   </object>
-  <object id="12" name="vermin_1" type="spawn" x="128" y="160" width="64" height="160">
+  <object id="15" name="vermin_1" type="spawn" x="128" y="160" width="64" height="160">
    <properties>
     <property name="spawngroup" value="vermin"/>
    </properties>
   </object>
-  <object id="13" name="vermin_2" type="spawn" x="416" y="160" width="64" height="160">
+  <object id="16" name="vermin_2" type="spawn" x="416" y="160" width="64" height="160">
    <properties>
     <property name="spawngroup" value="vermin"/>
    </properties>
   </object>
-  <object id="14" name="vermin_3" type="spawn" x="480" y="160" width="128" height="32">
+  <object id="17" name="vermin_3" type="spawn" x="480" y="160" width="128" height="32">
    <properties>
     <property name="spawngroup" value="vermin"/>
    </properties>
   </object>
-  <object id="15" name="algore" type="spawn" x="448" y="96" width="32" height="32">
+  <object id="18" name="algore" type="spawn" x="448" y="96" width="32" height="32">
    <properties>
     <property name="spawngroup" value="algore"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Replace" visible="0">
-  <object id="17" name="fungi_panic_nondisplayed:20" type="replace" x="160" y="128" width="64" height="32">
+ <objectgroup id="9" name="Replace" visible="0">
+  <object id="19" name="fungi_panic_nondisplayed:20" type="replace" x="160" y="128" width="64" height="32">
    <properties>
     <property name="Objects" value="Objects_1"/>
     <property name="Walkable" value="Walkable_1"/>
@@ -294,5 +300,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup id="10" name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/worldmap.xml b/AndorsTrail/res/xml/worldmap.xml
index bb5347766..c64b82723 100644
--- a/AndorsTrail/res/xml/worldmap.xml
+++ b/AndorsTrail/res/xml/worldmap.xml
@@ -489,6 +489,7 @@
     <map id="way_to_sullengard_east5_filler" x="502" y="555"/>
     <map id="way_to_sullengard_east2a" x="502" y="520"/>
     <map id="sullengard_ravine2" x="502" y="535"/>
+    <map id="gapfillerhole" x="194" y="375"/>
     <namedarea id="crossglen" name="Crossglen" type="settlement"/>
     <namedarea id="crossroads" name="Crossroads Guardhouse" type="other"/>
     <namedarea id="charwoodh" name="Charwood" type="settlement"/>