diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index 856d535ec..484b09843 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -491,5 +491,8 @@
 		<item>@xml/lonelyhouse0</item>
 		<item>@xml/lonelyhouse1</item>
 		<item>@xml/wild16_cave</item>
+		
+	    <!-- maps for v0.7.0 -->
+		<item>@xml/gapfiller2</item>
     </array>
 </resources>
diff --git a/AndorsTrail/res/xml/blackwater_mountain1.tmx b/AndorsTrail/res/xml/blackwater_mountain1.tmx
index e8c829062..f728143a5 100644
--- a/AndorsTrail/res/xml/blackwater_mountain1.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain1.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -131,17 +130,17 @@
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJyNVEtOw0AMnUXphhkpEUE9AJyGKBeo1C2LSlyDQ0LUJbu0EpVglQQ/xYYXM6E8yfJ8/HljO+mKEI4iLzGEg8jn9VyqFMKH6FpsNnFa36odAJ9SbDqNcxIZRB5T+Abub2gPIF6vtoiF/GaDnLgbVRC3cv7Ais52xaT3oh9EnpRDK3Ff48TvRPwMvdt3wuUo8ubEw/OzOgDPqpE7riZB3ViaYp57iR+A2gBcwys5W8cfneM3EL879R0ytpyjVY0eb5XHQeuXqxejJZ7w5V4AO1f3Uffgd5/md5bDeNW632T4V+l3/dDzys2gcbN4dsb54ANf44fzFC9L/Q87xLTvxDTAPbGZ5lq9U28wW2Zvbx4zc2M+JdWgdXm8DccaiZ+Bv+k99TWXo3excjzLNPdh+NmxmEMx1zmeeFuZ8nENjf7zzPccl+vJ7/vrPY2uz/ov8DXwb+1dDP4mbO55Vpb42bpzufjuUk+sjn1mnbMzTl9gOs/H
+   eJyNVEtqw0AM9SLtpjNgU5ccoL1AP6eoyQUK2WYR6DV6yNRk2Z0TSKBd2a4elvCzOiYVPDSe0eeNpHGTZ9lBcApZthf83ExRxiz7Fl2JzTIM6zu1g8+znL8IGo1zFHSCjeyZFLK+pW8I4rVqi1i7MNogJ856BeKWzh+yoL11Puit6FfBu3KoJe5nGPgdiZ9J674b4XIQfDl48fxQu0L5fKhG7rAYgLoxVvk09xw/CGoD4Rpeyd51GHWKX0f87tW3S9hyjlo1evymPPZaP+uL52dSE0/4ci8ga1f3XucO/B7i9MxyGK9Kv5cJ/mX8Wz/0vHQzaNwsnu1xPvjA1/hhP4bLqP5hh5hnva+9Fwj3xGaaa3Wi3mC2zB5cj8rTz435FFSD2uXxNhyrJ34m/Ka31NdUjtbFSvEs4tSHxc+OxezyqU7xxN2KmI5rgve3C6Pvmf4RczxTNWK7la7P+i/wNfB3bV2Mluxs7nlW5vjZunG5+OxST6A3cfou5+xxv0exfRL8ArlDzpM=
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYCAevBVgYHgnQIIGLOAsNwPDOW7y9aO74S7QrHsUmEeJ3SMN4PI7JeHylgx9Iz0eaAFwxcNQCWtc7oSJo9Pk2kEJgNlLyA3I6sh1E8yvtAYAyGIjMg==
+   eJxjYCAevBVgYHgnQIIGLOAsNwPDOW7y9aO74S7QrHsUmEeJ3SMN4PI7JeHylgx9QzkeyPHvQJo1VMIalzth4ug0uXZQAmD2EnIDsjpy3QTzKznuQ2fjMhtEAwB/YCoh
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20">
+ <layer name="Walkable" width="20" height="20" visible="0">
   <data encoding="base64" compression="zlib">
-   eJy1U8kNACAIcwSXYv+V9GNiDKUUtQkfgVIOrbdm0xas++b5dqCc3X/C42caFER9ne+Z/qN+s3W9eTI+pZ+orgK2XyUXxWR3wrjRjFEsymdcrE41TwG7rRtU/rDCdavzNV9FJ4t7yZXV9/M+mQ0TmkYQ
+   eJy1k8EJADEIBFPCNZX+WzrucRBE3TExgg9Bx1V0PmNM4J+RPFvzm40tb80hPGJrTcSKYtWbzkr2qXiVebK+FfNmoizSK9NHd5Cxsr1E9YrV/R/dN73D8/ZQ+eEK61RnN29Hp8rrZFF9N+9T+QstvEe5
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="20">
diff --git a/AndorsTrail/res/xml/blackwater_mountain10.tmx b/AndorsTrail/res/xml/blackwater_mountain10.tmx
index b4671bfac..5974fb24f 100644
--- a/AndorsTrail/res/xml/blackwater_mountain10.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain10.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -131,12 +130,12 @@
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJyFU0tOw0AMDVEkQHVEskbcgJNQumDFokXqhi4iIbVbBBuEuAQ364cDZAjdVwrFbsYajzNDLT15Mo5fnj/ZFkmyR2wRvwi2HXR+aO824GJrPDc2Z/+P/7G5Zd75We74tLURjtbqYr8GP4/4SCvHWXdMX41xg7hKk+QT+jpC+pYQ11crjo3QQmfmGwV6oWtrI70J6ctyn1fOh2JLpes6dXc7ERuKnuqcCmM3Fk8BbayBrbTzfbzw70cq9zLtPPWuUvyV+pbun7QWurob8OdAdXzk/fflPGY2zr3nuYTyyGhfcuiD+EL3EmyGd1P1+TTr/Ar8/YPM6Tr0As+34rkBx0l2YsF8hxzkM4Mk+R743yTeMWISqJc5Swvmy9T/+yX26Rz5pxibWj45D/2PcA7Zg+g97SFxcJ1zwReyleAlLc/4/gviFXFm6yUOrlPzGXCzIH9v/1nejTE+LxB3Au/i/Fa4XT5mtD/ERxomkTzWYlS/TGCHWB/zkdWR/JDpHeSceXH8HfmtP0EviF0=
+   eJyFU8FOwzAMLVMlQEtFe0b8AV/C2IEThw1pF3aohLRdEVwQ4if4s27jAxrK7pMK2IutOF6iWXpyGtcvL7azLbPsD7AF/ALYdsb5Ee1tjI+tYf1RuBzOjfkfyq0K5+eF59PWJzh60sV+bcI85EOtHGfdXUJXC3ELuBpk2ac51BHT15i0vlZxbIQWXDPfOFILfbc+UZuYvrwIeWV/MNYoXdcDv7cTsZGoqc6pIXZDeIpoYw1sFfX38SLcH6vcy4HzWLta8dfqLF0/ab1x9+5M2IeG5lOb7Mec4lx77kssDw3npTCHQL7YvgSb5dlUdT7NnV+ZcP5M7nXtawHrW/HdGc+JdkJgvn0O8Nlhln0PwzORdwKYRu7LnBWB+XL1fr/EPJ0D/wxiM+KT/dBvhHPQHkTtcQ6Rg++5EHwxWwle1PIM/78AXgFndF/k4HtqPmt8L9Df05vl2ZjA9xJwJ/Au1m+ln+VjhvODfKhhmshjLVbVy0ZmiPUxH1qbyI+ZnkHOWZTH/5Fn/QPBtYfz
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYBgY8FaAgeGdwABZjgao5ZZ0KvsnbZCEz2ACgyndUApg6SUVzT+3uRkY7nCTbl44lcNlpJkny0Rd82gNYO6VHkB3AwAWHAuP
+   eJxjYCAPvBUgUyOS/ncUmkEtQC23pFPZP2mDJHwGExhM6YZSAEsvqWj+uc3NwHCHm3TzwqkcLiPNPFkm6ppHawBzr/QAuhsADE4MjA==
   </data>
  </layer>
  <layer name="Walkable" width="20" height="20" visible="0">
diff --git a/AndorsTrail/res/xml/blackwater_mountain11.tmx b/AndorsTrail/res/xml/blackwater_mountain11.tmx
index 781ff28bf..9cf0f4f2c 100644
--- a/AndorsTrail/res/xml/blackwater_mountain11.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain11.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -131,12 +130,12 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzVVc1KA0EMXnXVyi50ERQFH0DQu7/vUVCv+gbWN/AgijdfyaP3Wg+eBEvbkwjVVhN2P5rGye5MxYMfDNvOZPIl32QyUWRje9Y9v2XMl+35b+AcQ3Ip0+Q3eJv/G79VWFn43f5RFkUPmXutkbn1Yr1fU/ceX307xn7GWWb7Hxjzlv3LXP7tks9+NrZtlfBrsD7tdFKnc9L9ksaFof878Z6S/TDLNe4ZGkufdzPVsZTZYI2/rG+34GZo3RpGPD4xVGFYka/mGBTaLpKWtYB6ToVtt+AcCV5om8bCLiG7xJ/DhQ3By7l+0fgs9G0LnV1alun7uOzPi3q2dAaa9bG+jNv6zxg6HrzYg3oeedSzBPOGQueLXF0cDVHnbZWvhE99g5dtcb69oifJWpKxWHlPC5wv66zv7mqcDws7FP9BwDh01DO01n2vCrIHhUDm60IST+fXstf1bNVW1fny/GY8+UYkxX/cO8zLc5T9yvUWWf0ZYE7rLSwDzvfD0a+Qj/xq1Ih3qaT2LMj3F3FrDn4vm0afWCPO9UBefX/1GmII7dM+4DNFbeE+gi+Ex+e910Bt4Qv+XRp7Yuw7eoF17lVxdtKx1n2l+ROtHdPve/J/UszJmn9Ow3uW7FtdwYkegrq+ot/XNG5UXliHRhy/1MzSspW6OWW+sDnK8twlH+6d1kr6sHzL+W/4Os+p
+   eJzVVs1KAzEQXnXVyi40CIqCDyDo3d/3KFiv+gbWN/AgijdfyaN3XQ+eBMu2JxGqbZ1hd9jpmNkkLR78IGSbTPLNfJlMGkU6duft4zvKeN2a/waMMSSWOk1mwcfi3+zrwtrSbOtHJooejX2uZex6od7vqX2Nr75dZT3i3Oj7D5Rxzf5toehz2LNvKtunGn4J1CdLJ3W6AN2voF0q+n8C7xnYD02hcU/RmO95P+f2pc6G5rBHffOSGyF1ayn++PjgwtARr+QYlNoug5aNgHxOmW1eco4YL2mbxswuAbvEn8OGLcaLsY6hfZf6Zkxnm5Z1+j6v+vNSPms6EzrNSl/EXfO3D10PXlpD+TzyyGcO5A2FjJditXG0WJ5nIl4On/wmXrSl8+2VNYnnEvdFi3ta0PmizvLursdF07AH/h8FtGNLPpPWsu65wGtQCHi8NiTxdPtq9jKftdxynS+Ob8eTb0RS/qZ7R+P8HHm9sr1FWn0mIKf2FtaBzvfLUq8oHt5LNIB3pSb3NPD3l/yWHPhedpQ6sQGcm4G88v7KOfIhtE77AM+UcovuI/GF8Pi89xKUW9i/phX/PrQD1g4ttUA7d5ef3bTSui80f4G5Nnw/wP6n5RjPee7jNHUrZ5xUQyivr+H7BtqtiCtjOYh+ov+kGc8VrmWP3VXJOWb/o8nmxBSxcz66d1Irrpltbzn+A7ZCz1s=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFVs1Kw0AQXolNwRQTFkwvnvVQT76H4K0nf07to4jPpHcFUR+gtHortMSbPwcFZ9kMWTcz2WwS7AfLku2XfPO3MxWiwPWWILFM9L4aCDFO3HwK2aDe2Yo4U5jkumvr92VS5rYFZVcTLhWf91757IM4Q4wJ/6r4dnze4P1hKMReWOamIW/PhNDl+JxNQ4KPPM4ehRup11XOVTGg+PjOPqwpcLKk0LX5qfWsvv0CGq+yiPGD1AthxsDko01K18wP5+8zcPpGXubwjYWkY0wB+WgTpevytwtQugjM1Wms98dIiKfo7/ufwPnyWN89ty4CYzkHzUVU/p2rWwoqZ1Mmzjb6VF8L9OLuHYXjXZ0zrq7q4CfQ6wD4J5CHWX6HXL4rf33q2YV1Xqsu36v8bVvPM8nvSssVZ6zns5jXoPKCvlP7pIYuwuwNd5DT+6B4PgT+yGMdOeoq3eZ9bAuuX/0HuqrnLnS5evaZp010EVjPl3k9V81T317pU8/ncTFH7Rlct1einb51Zc5RcwZfWDYpmLPeNffxPu40qGvTpltJ26hA3SNbf2TpU72giY2crg98e5bZtzaBuv/NXMg2ZH9T/AJXMY9r
+   eJzFVs1Kw0AQXolNwRQTFkwvnvVQT76H4K0nf07to4jPpHcFUR+gtHortKQ3fw4KzrIZsm5mstkk6AdLyOZLvvnbmQhR4HpLkFgm+roaCDFO3HwK2aDe3orYU5jkumvr+TIpc9uCsqsJl4rPW6+8907sIcaEf1V8Oz4beH8YCrEXlrlpyNszIXQ5PmfTkOAjj7NH4UbqdZVzVQwoPr6zD2sKnCwpdG1+at2rb7+AxqssYvwg9UKYMTD5aJPSNfPD+fsMnL6Rlzl8YyHpGFNAPtpE6br87QKULgJzdRrr62MkxFP0+/0P4Hx6rK+eWxeBsZyD5iIqP+fqloLK2ZSJs40+1dcCvbhzR+F4V+eMq6s6+A70OgD+CeRhlp8hl+/KX596dmGd16rL9yp/29bzTPJXpeWKM9bzWcxrUHlB36nrpIYuwuwNd5DT+6C4PwT+yGMdOeoq3eZ9bAuuX/0FuqrnLnS5evaZp010EVjPl3k9V81T317pU8/ncTFH7Rlct1einb51Zc5RcwZfWDYpmLPeNffxPO40qGvTpltJ26hAnSNbf2TpU72giY2U7sbzv9u3Z5l96z9Q99+MA/6LZh3Y7xvrNvgBTH6SZA==
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">
diff --git a/AndorsTrail/res/xml/blackwater_mountain14.tmx b/AndorsTrail/res/xml/blackwater_mountain14.tmx
index 85df16285..b92cd4970 100644
--- a/AndorsTrail/res/xml/blackwater_mountain14.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain14.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="30" height="20">
   <data encoding="base64" compression="zlib">
@@ -131,15 +130,15 @@
  </layer>
  <layer name="Objects" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJy1VUFqwzAQNGmOCuge8oL2JTWlx0DA1xwK+YYfGScfaEnzASeuB2vQdrsrU2gHhGVptbsz2rWHWFXXcQzj+BzHLc2xdlfvtLmId9pJPC6q6mkxzes4vQNcA66G39tMDCsXD7WzNxh+j2HybcUAzuGnLnNx38P0vITMV/oH+rT3sLL5Yv0kcqO2Eh/BzwXAudbwA3QOL+bVhcx/n3wgJw8yF2h6Fn44PwkbqTHQCt+9sj/P8JRn30afh+R3F/PZ3uHraYNz4CHrV9azhc24t1zlOjim2OvFdxvJ6Whw1LXQxGznAftNLGtFXaHRsxivTu0TWh8Lu+jbyXuAPpxTJ82XNl2h5nrlY2/YcQ+2vINNukddC4gzpzGBmoGPLthnauceNF+Jkn5AmzShj2WBr0Zj3C9584xXN9uYfXg2dSF3/f0k7zrVNO/F6qtOxJO9CKAfG4cvbPnt8PiWgFrQPcJxEHp1hh47pTWBuP1MfW2TxvKbRfQh/xPWSiv2vuQr163e+AvQr/x/3hOHk9Mbv4XsW2Ibs/YvgivnWp//APMpxfoC4w7fqg==
+   eJy1VUFqwzAQNG6OCuge8oL2JTWlx0DA1xwK+UYeGScfaEnzASeuB2vQdrsrU2gHhGVptbsz2rWHWFXXcQzj+BzHLc2xdlfvtLmId9pJPNZV9VRP8yZO7wDXgKvy+7DMsbwYVi4eGmdvMPwew+TbigGcw09d5uK+h+l5CZmv9A/0aQ/cLb5YP4ncqK3ER/BzAXDuYPgBOocX8+pC5r9LPpCTB5kLND0LP5yfhI3UGDgI372yP8/wlGffRp/75Hcb89ne4etpg3PgIetX1rOF9bi3WOY6OKbYq/q7jeR0NDjqWmhjtvOA/TaWtaKu0OhZjFen9gmtj4Vt9O3kPUAfzqmT5kubrlBzvfKxM+y4B1vewTrdo64FxJnTmEDNwEcX7DONcw+ar0RJP+CQNKGPRYGvRmvcL3nzjFc3m5h9eDZNIXf9/STvJtU078Xqq07Ek70IoB9bhy9s+e3w+JaAWtA9wrEXenWGHlulNYG4/Ux9bZLG8ptF9CH/E1ZKK/a+5CvXrd74C9Cv/H/eE4eT0xu/hexbYhOz9i+CK+dan/8A8ynF+gKpyd68
   </data>
  </layer>
  <layer name="Above" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJzVVMsKwzAMCz3v0HvZd/UDBsunFxKyTyibIYbUi20tbIMKemgetqQoCeF7KJcQ0uu7Tcdx+X8mPOZz1I0/4ulhHexbmn2tFzSOeHP/k17m4/Gi7FtIdX4DeBerT4dHrrUj4OMnOUEzqmWAtZJ2KyeW3h7Yy17NLM5BrpHzFqdDLpt9mhZaw5o1bnF+zz6aeeSurUo99J62/rDPV+D9lvfROiMCopf9GgH39bLFPL3ceMiG3l2MaW8FcUG87qGn1/N4qb2snkXxh+dGctVCnm8C7yfqk1aPeS9gHS+Hmr4nXbZIOA==
+   eJzFVMsKAyEMlJ572PvS79oPKNRPLyj2E5Y2YMBNkzgV2w7sYX0kM+NoCPNQziGk13c9Hcflv4bHMpHIRHyL1+y68U/+bYN9S7Ov9YLGEW9uP9LLfHq8KPseUp2/A7yL10fhkWvtCPj4SU7QjFoZYK2k3cuJp1cDe6nVzOIc5Bo573E65LLZZ2mhNazZ4haX9+yjmUfu2mbUQ+9p6w/7fAHeb3kfvTMiIHrZrxFw3162mGcvNz1kR+8uxqy3grggXmvQ9PY8Xmsvr2cx/OG5kVy1kOebwPuJ+mTVY94rWKeXQ0vfEyR9STY=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="20">
+ <layer name="Walkable" width="30" height="20" visible="0">
   <data encoding="base64" compression="zlib">
    eJy9klEKwDAIQ3uEXar3v9LYx6CIqUnVCjLorC+xzmeM2ZhfdPb/GUx0aTzhMrqsNlu73l+/Xl/bB7F3HjwtiMsE8hHV796MZXps7/7JrihcVSf6X8HN7GhUl/HL9lS0MfVsjaLfnjE8RZ/qt2rW0awqdkv1G91RZ42i0m/ERbP2+ivMTGb9ZrjMm9z2vuYLXfB72g==
   </data>
diff --git a/AndorsTrail/res/xml/blackwater_mountain2.tmx b/AndorsTrail/res/xml/blackwater_mountain2.tmx
index 79a0f750a..04f10ca97 100644
--- a/AndorsTrail/res/xml/blackwater_mountain2.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain2.tmx
@@ -1,137 +1,136 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="10" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="10" visible="0">
+ <layer name="Ground" width="20" height="10">
   <data encoding="base64" compression="zlib">
    eJw7ysbAcHQUj+JRjBUDABe3npk=
   </data>
  </layer>
  <layer name="Objects" width="20" height="10">
   <data encoding="base64" compression="zlib">
-   eJx1kbEOgkAQRAlBG+6IBX+hoZHeWFsZ/4GPBqHTX7B1x7sJw4GbTHZzt7wd9po8yxrT1fSIOpkml/2i9iHfDiHzHPmeB10io/nD6owxuJlV+MBLZxzzNTNlMZ5uWdMf6l64KTNl9dEXPE3CJE/9MZSprDF+PwiHZ+ChhjhH+8kka3BLP1vvwbrz8x36CtlnHXfP/8R+dHfp+3L2KD30it6zqU32gajs3ovAY125dT8CLO+2VYnPXt53dOtZKv7vzrQ3fcqlcPcuA+9Vhpq9zJwJ1hfOBzvd
+   eJx1kbEOwjAMRKOqsDSpGPoXoC6wI2YmxD/0o1vKBhszKz6SU68pWDrFSi7PjtMWzrWmk+matDPdvXMvUxPcN86buGK/C3G9FFHHxGj/sOAfhFWGyAMDwf1tsWTmLMbNz3P2h7wXbs7MWX3qqwxTP/pe7Y+hTGWN6f4gHO6BhxxiHfWTSdbg5/3kswKPeRemM/hKmWeTZs93Yj46u/x/WXsUD3uFd286ZPNA1HYeROAxr/3SjwAr+N+qpc9e/nf0y1oqvndlWpve1Vw4f1aR96hiTi9X1oT3A+fxPIM=
   </data>
  </layer>
  <layer name="Above" width="20" height="10">
@@ -141,7 +140,7 @@
  </layer>
  <layer name="Walkable" width="20" height="10">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcMWCYQCZjc7Hpg8XxmYWupnEmkMsINYsQuZiCwNK3EXIrcS6BT1ccbkTm158YuS4EVd84/MTuXFNSrojlB4JYQBKQyE1
+   eJxzFWBgcCWAkQEhtfjMQDcL2UxizSYFEGsWIXOJCQNKAbFmYXM3rvAlxp+kuB2fG3HFNz4/kRvX5KZBfO7DhQE7nyKJ
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="10">
diff --git a/AndorsTrail/res/xml/blackwater_mountain3.tmx b/AndorsTrail/res/xml/blackwater_mountain3.tmx
index 385f170b7..87cab83fa 100644
--- a/AndorsTrail/res/xml/blackwater_mountain3.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain3.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="15" height="10" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="15" height="10">
   <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
  </layer>
  <layer name="Objects" width="15" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYMAO6gUgdJ0ADgVQ8BxJ/jUPfrXkgLdQM6/jcMdbGthJKwBz6y8i3PyHB1UPOugChkc+NEzygHQvnnhCt+82kB8NVR8DpEV4UeX/YrFThwliDkgtyO4eqJ0gPgsQazOhqgcAvmsTjg==
+   eJxjYMAO6gUgdJ0ADgVQ8BxJ/jUPfrXkgLdQM6/jcMdbGthJKwBz6y8i3PyHB1UPOugChkc+NEzygHQvnnhCt+82kB8NVR8DpEV4UeX/YrFThwmiDoRBdvdA7QTxWYBYmwlVPQCXDhKp
   </data>
  </layer>
  <layer name="Above" width="15" height="10">
@@ -141,10 +140,10 @@
  </layer>
  <layer name="Walkable" width="15" height="10">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcMWCkQE2eXx4VO/g1YsNkKKXWHsBrDIm2g==
+   eJxzFWBgcMWCkQE2eXx4VO/g1YsN0MJeALq+Jy8=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="15" height="10" visible="0">
+ <objectgroup name="Mapevents" width="15" height="10">
   <object name="south" type="mapchange" x="192" y="288" width="96" height="32">
    <properties>
     <property name="map" value="blackwater_mountain2"/>
diff --git a/AndorsTrail/res/xml/crossglen.tmx b/AndorsTrail/res/xml/crossglen.tmx
index 2359a5363..c5c0cba76 100644
--- a/AndorsTrail/res/xml/crossglen.tmx
+++ b/AndorsTrail/res/xml/crossglen.tmx
@@ -1,147 +1,146 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztl0EOgjAQRQmJsmLh3iuI0QtA3brTJQfzRB7B+1gj6Gc60060Y2LC4gVoS187aafQlEXReJznFKEd2nFshzabRJvr8g1XJoH9doCDsXUMKm/NMNS1xDOC/UmxcgnvrQ6h/Wpik4J6j6uQHJ6Ut/eey+J5HbHy0tj/Au1anr023l0Vx8q7930fqukV76281EWfc3lpDF0VJ5eXjSGXq0neFMsT9eilMeRyNc3Xk3IG6T1HvDhfLlcH+VpwsGOB985luI7GOszRmLOl+XJjlOb7mveHawYdPYPVuYaxkOotz7W/QrNPDdDsUwtU+9QAzT6d+Y7H9+RawNqr/ZfKyR3YL2bZ
+   eJztl0EOgjAQRRsTZcWma68gRi8A5Qh6HfQC4NoTeQTvYxshDONMO5FWNi5ewFL62gn9jcVKqcJiLCcPZd+PYt/32QX6PDYjVBsHHLcCGDC3ikDkzQn6ZyXyDMDxuFqZgPeZf4LHldQmBPY2WqkL4KrjeELe1nrua6U6/eaW0Itr/wuk3/Lfm8Z7yPyk8h7t2HU2vcL7VF7swr9jeXENTeYnlpesIZXVKDfZ9sBz6MU1pLIa5/WknYB7r0BeuF6c1WReMw5yLsjr1lwT3laPOT1kNs5r6MBzdPjW67zffjMNqENH0DB1mnsuDOcXd261zLnmnOcFsnIJJ7nHQvsxIpJ9mgLRPk2AZJ/+mYfLjS1Daq/0v1RMXrA5bH8=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytVs1u1DAQdjbLbqGJmt0idS/cQfQxeqHtiWMlKEcENyR+3oBH4AH6BsCREyBxaQ8ckNDSpaXigDalQJCQWFUrZrBHHk8cx6iMZI2dxPPNNzMeR6n/I7fPtX+zVyg1Kdxnqx2tJ5nW48x9f7UTtvkoApcwPzJs9GU/83/P9/gEfd4qtG9PknZ8jot29xpsP+1r/sQZcebMx7s9pTZg7wE9GyjVgVEVWuM+3JPkdVwe+8cQsxPw+/1Qr1/2XT922LrMLO7FXNv4mVlM0ijk60TwxThTnOagvxjcX6n97hlgPoexAN/+XlRqtmhxUfv4cuwmwTx18+ZcvwLM1zBO4P15GBeyOi7y5tjJQK8TgU21jDnE/fd7do31/bBnn/2NDXuWd/V8w1cbBmseUa83Qa9Hjjc9O982+z8HMEgq8y3nIrnReix4E0dcI39679DNXayYXJMtn5SenFKNfTV7KtQDm1tZZyQ7fWldqRXwd2R8nmbWJgrHLVmNeTkUrg+yvqSMDO4Kw8Y65nx5DVIeKL48L2u5Xct8TD3+jvL6M+K7+Q81KIeUMqIeCVeenQnb21QbbTJo4BnCjTPs1jOPMa+fF6ZXYs8+gPnh8Iy4yq1nFKwZmePdoZ1/g/l3GO9SPy75tZu4Pjpi+K6y+/zYYPIYY4/DXrhlMK4t6zwS7o0lHQvu12li5yj7xpfrqZ8vF9mzfGdG8r0C/l3uuj6jlMaXe6ly8jsTsb3D6n1T6HXPO+zNofod8x7WwBc5PTBD8iTuuJ4Zzh9azksl3sfcxSgUS7rvQ3LY8o/G+3PbOSVcuu9rtnw4rAfLe0jy5ef0E8yPYNxasrj8fMme1mQ7pOkfEM8p/Vv9gHkFY5ZG9Iam/5nAHYj6LfEBjNPUrWWqWSm1+8Ng+Hr7VNzDpC+xvsHPAvV4zjf2zjiroE+EK894SEJnZc38a7YJ4h4VAXsN+Wur4z/MUem3
+   eJytVr1uE0EQ3vMZO5A75c5EihsKqED4MWjsuKKJiMJPCREVFW/AI/AAeQOgpAIkmrigQEIhtkNEgew4wCEhYUUWM9wMO7u392PBJ41m72fnm9mdmV2l/g/unyv/ZxQpNQRZD/W7Ti3VwyDVB4E553qt2ObjCrzIyfyMAYwPA/f/co4L6PN2lPr21Cvnl7xod5Bj+1kzjZ9jRp6F8LHfUGoT5o75XaxUDSSJUo3zcI4XZmMYRPr5CazZKfj9oZU+v2qafuyJ5ylw7RAv7hva+BFoTtYI9nUsfB7SOvM6LUB/Id6fvv7vOXC+AFmBf3+tKjVf1bwYtyteyY0YOdYV96ke5u/1a+B8A3IK38+DXBDxPiTeP/kquL04ffZic505l3EPcX4X5vdIToJUzwL9bkWMUXaJNwPiWlgxyDpiH+6A7lWUtw09vkvzPxfUBCOhf2V8IyuWPNmmGG+Jd5sN034cmlyuvbaB/cPuHQyZwzvExTk2ozkJ6ljvrZ1njL2mbV2pDfC3TT5PAm0TIXmnIsecMUSmD15BvIg28W4IbsxjGe+DCntii70fE4e/7TD7juPtL5GDttiYVshH5rVrZyjm5uVGGeKcOIt4qxnW+bwVmWss8+cl9Urs2WMYH7X+kVeZ+YzAnLH3eL+lx19h/A3kve/mZb/2PdNHA3G2fk+IU64x9riwnvZtRPdiuo/Me3stXQvp15mnx4hD8uWm745Xomvlvd23XT35Gvh3tW76jJiSL498d7yMXZHvfUv3HN+wNxfl74HsYSLejrg7lcVp1//HknpJrO/cKzsl9zVeSz7vi3BUckeT/bmsTpmXz/uMLReP6MH2OWSfR7JOP8H4GOTemuaV9WX3tDzbRZrvWFinfLf6DuMEZO5X6A1595mCMxD1O44HOM58M5c5Z21kzg/icPX2iXUOs94SdmUtcI+X8VY9M8qwXpJTl2qad74EZ9Fd5gbdNcuAvMd0J/9rj9ZrRmu4TE5dBjtXQH4D6n7oYg==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFll8KwjAMxvfi3pQh6AG81E6g3sBbDsSTbII+a8CwmH1t0rrOH8hm2/Vrmj9tVY2cmqoo7Wf+rpm2hehmWBPSoLbHCo9/gvbY3vTvvqEZn7FvSHdX43n2gXYE2pchssbYPls+0PQJ2rG554o3pF06lhFkq/bLpR5/Vlsq7IdU/+UgY5wh3ZBt8j96R2NjWpLS9oZqzhL7XELX4yPkB0v3vv5tXSGQrqzV2813H9drXc91HUf9smYjXVmrD0qX67Wu57qOW/2p/uXxufYyqTWSxh/B+ZVq71xY+9ZGaogExX8oJwhr3/5x9jDaXitHPefQ1bBHanLM6Rwl0L3Kg8zR0NnAMadzlPDGn77HWeeQhSevrblztDlPl2ApnRLo+zrq93BTsYk0vE8vZ6HJ5Myjv30Bfxtu2g==
+   eJy9VkEKAjEM7Ap6UxZBb158jh/wBeqTfNWC+BBRQc8a2GCM06QtW+ey2uxmmmY6bQgf7NtQFds+f9f+jsXQDTAnxEFjjzF+/wnGrbW5vmO39vO0viHexQTnWUbGEdC63Iw5Wuvs9UDj6nCn9ncovaG6a2sZgWpFfTk2IWz63m5Ej+VveicX3Ifc/pVAapwheakWr4ZLY/+3uCRq1xvznH+sc03eXI15vPdp+VxyeaVXz2ffMfZr7efax1FcejbilV69Vrzs19rPtY978dXol9cCz7O0XolDhrbIU3fg/MqtlzCEpr0cW+Ah6JuYD8X2i3e26Dhx/us80v48xB49OXOXnKw5vUcJ6F6VArlHY2cDa07vUULqvUrf47xziGDtnxSNW7mtuHev2lXSm+atxaOR65Ep0Pd1FE/BGWgT6TXlmYqDyM8oyaO/fQGdS25c
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzFlMsNwCAMQxmhS3X/lXqtEHHsOEAkLgj8yMe8zxjv5YWCucsy2LtdXDYHdH6uxU4u6kGmh3qGNCIecxexKxFxGbZTf7YezJtPRCWvzDsKq/rmTM/1icKNzp7It+tfQNxqqLOA/ohMYxdXnX+Vi3zE9FPhrhi78v3zo73uWWZyi/hIx/GQG1H9lB5WmJluRx4rZjd31s+03TpWZ9r1WAerEqonb3nJ+VcYXZfbMTfz+gDz855i
+   eJzNlNERwCAIQx2hS7n/Sv33SggharnzS+FBAOczxrx8kDG+LIP1dXHZGtD7VYudXNSDLB7qGYoR8RhfVjfWIm7G7urP6sHkfMKUuljNGJaacxavuycVbvT2RL2ufwFxVavOAvojshi7uK75V+Iw/axq5OBWZuvr3jHPUVy2XqTdjl1SLes5o2WH6YzZZXa0V+e9yu7OdDabbuaqTdUy3z/sEMqjm5Naf2V/1fMC7TGjCA==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -188,8 +187,8 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="30">
-  <object name="crossglen_wasp" type="spawn" x="736" y="160" width="224" height="160">
+ <objectgroup name="Spawn" width="30" height="30" visible="0">
+  <object name="crossglen_wasp" type="spawn" x="736" y="160" width="192" height="160">
    <properties>
     <property name="quantity" value="3"/>
    </properties>
@@ -211,5 +210,5 @@
   <object name="Odair" type="spawn" x="896" y="32" width="32" height="32"/>
   <object name="Oromir" type="spawn" x="896" y="864" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Keys" width="30" height="30"/>
+ <objectgroup name="Keys" width="30" height="30" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/fallhaven_nw.tmx b/AndorsTrail/res/xml/fallhaven_nw.tmx
index cbdc6c254..6c67b3d9f 100644
--- a/AndorsTrail/res/xml/fallhaven_nw.tmx
+++ b/AndorsTrail/res/xml/fallhaven_nw.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJylVsFK5EAQHZkYWJxxMvGiV/9BxF9wFO8eXPagyOSsfsJ+wn6K8wfuZS9ehFERVFAMLHgRmYOYMv3IS6U6yeCDJunqTr/q6nqVTsJOjmGnEQs8Z6j6lt03J0MSUsfH3XKteTAOq+sCX7Yannj5e76chfXjDz3bvr5sGFvyb0dF24s61f0Sfi/mz+u4/PT5VYdZr9jvKCp8Fs4Xz3ppxvdnIX8KPmjeR0sfOK/Am3jivu/Gh/38uRRU57xGVZuFseM4HhS8J84mcZD3qYuJjJ+QTxjHO+fXxMXiaLHZh52ofN661Y3vqVj9jZv5ELcRxehRnZPvrAH5Vs4WvHL+AL9PDH9GLc8GiElHOjd8flpxkG+nc2gC+r3rlXn5zPdr9oJc4P1Cm6LZg0HRt7AVFN+mym/kInITPgknNMe8qeKR/g9DNwLRky/nfHbtG/wXSE1BnFYz25qHV/uscd+QN9a3bNtq4L30rI/Ypi7Wkg/SoPcDT5wE0JpA1+eZyyvsC3X8yo3feXLVqk+nYVGjdJx0fcZ+NZ5a1A4NaBPrWXpkzTFv0K/Ot/4XVi2HNptqJ9rPOWsO13LW7K9BeR/WPxbxn3nOT9daxv9eES+tWeZtC103miA5t+l0ElDutuXV9TU27kDP3bx9oeY+NHX6wB5u6Bx23TlsrJR9B6y7l3C+d6t2C3W10wetb+hZOA9V/M7VHMFSUObl/yhD2+FfpcZn8bjq5k3wL1v7gubwOtbdhiGx1XVHz+V8wTeC22ztN+fDeI67zXcaYPlcd5eDNnl+qv6x+p/7SH2tN+4njjehdTSs+uerI7zGJwzVrK0=
+   eJylVsFq20AQdbAiKLFjWb201/5DKPmFuCH3EFx6aAjx2e0n9BPyKe0fNJdccgm4CYEkkFJBoZdSfDDVWPvQ02h2JeEHi6TZ1b7ZtzOzexL3Cox7jdjiMWP1bdl9Y3KcON77QYC75VxdcB7X5wXWtgBPuruZL5/jcP/jwLa/2TWMLfkPkrIdJb36eglftovnj7T69PkVwnJQrneSlD4L5y/PfFnOd7FVPAUrGrdq6cOMNAbvzKP7sesfD4vnTlQf8yep2yxMHMfZqOSdO5voIO8Lp4n0z8kn9OOd4+ub0+J02+bltb1LqvutW6j/SGl1mYbXK+Og24Q0elL75NtrQP6VvQWv7D/A79DB2t+2SCmPdGz4/LR0kH8XHXIC+Su1jnl5z48Da0Es8HqRm5Kz01H5bWE/Kv/NlN+IRcQmfBJO5BzzZopHvl8YeSOQfPLFnM+ufYP/Aqkp0OlVbnvt4dU+azw0xI31L9v2G3ivPfND28xpLfGA80/0nnp0EiDXBLo+L11cYV2o4zeu/94Tq1Z9+hSXNUrrpOsz1qvx3FA7LCA3MZ+Vj5xzzBsN6+Ot88Kq5cjNptqJ9r5jzeFazjn7YVRdh3XGQv+lZ/90rWX8HpR66Zxl3rbQdaMJEnNvXZ5EFLtteXV9TY070M9+0dYI3IcWLj+whlvah0O3D3svq74D1t1LOP/163YLodrpg85v5LNwflT6fVVjBDtRlZfPUYa2w79ajc/1uOkXTXCVz/2dxvA81t2GIdrquqPHcrzgH8FdPvdf58N5h7vNJg2wfA7d5ZCbPD5TZ6w+c5/oW+cbf88c74zm0bDqn6+O8Bz/AZ0prq4=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
@@ -141,7 +140,7 @@
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzlk1EOwCAIQz3CLuX9r7Tsg8QsKBSK27Im+1HHK1L70Vr/6XfpCabovlbN0xiVbKtfWWPztZ49qr7rityx5fX6Jm42k4inDHes4XknyH4mJ5E8e30whN59pDfUDzJb5luOclFvctbDHc9mM8vWV7izjDO5477XZ5Yb8cl4S9EcspgrrsZg9jurh3Jl3ZqvVSsy99U/O7UzL+h8K+qe8lTBlA==
+   eJzlk1EOwCAIQz3CLuX9r7Tsg8QsKBSK27Im+1HHK1L70Vr/6XfpCabovlbN0xiVbKtfWWPztZ49qr7rqtwxhXh9CzebScRThjvW8LwTZD+Tkcg9e30whN59pDfUDzJb5juOclFvctbDHc9mM8vWV7izjDO5477XZ5Yb8cl4S9EcspgrrsZg9jurh3Jl3ZqvVSsy99U/O7UzL+h8K+qewOLCkw==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -218,6 +217,12 @@
     <property name="place" value="north"/>
    </properties>
   </object>
+  <object name="west2" type="mapchange" x="0" y="448" width="32" height="64">
+   <properties>
+    <property name="map" value="gapfiller4"/>
+    <property name="place" value="east2"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys" width="30" height="30"/>
  <objectgroup name="Citizens" width="30" height="30" visible="0">
diff --git a/AndorsTrail/res/xml/fallhaven_sw.tmx b/AndorsTrail/res/xml/fallhaven_sw.tmx
index 2faca0599..c5f95659a 100644
--- a/AndorsTrail/res/xml/fallhaven_sw.tmx
+++ b/AndorsTrail/res/xml/fallhaven_sw.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="30" height="20">
   <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
  </layer>
  <layer name="Objects" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJytVLFOwzAQNSINQx2URoitC/wNRXwAA0xMnYFP6O8xU1VliFjCgFTB0CHCV/va8/lsTMSTKtfx5d57vsspZfFY2vW59P/P6sOenrc6jO+0v39l+5bsO6080P3c8c5JHo5eeLYVniGkHCvDMTLPSy3zrsk7XC9Hc5o+RxxNfP4THfLm4KW260UGL+UEbCN+Y6De3xzvsrHrYmRX7IdV/bsezou5aL73sZyva/y9LsL8e7+T0Dvl5bkA344X++KB8EOtbiP+OA8Aew7uD3nBz9fY5podK1VUSp2T+70x51fC717iZZwb1qN4zxSXlV25D4jrjK4P8/vUhzoPAfDeRXxcsxV8TQu5jh6wlkJNKS/OmqcynDV0nsF57+aRBNp3beTbl3Tge31kntG8Sxez6xPiKzrHIt7PKjl8yFxBnr0u5ftHzYFGoi2XF3RLczwFaY4jKK8Xl+gZ74zFpTzynsDvLKovpWEAUBv/vv96n1zXRqi1BM7LdXGO/0KMNxdeDTJ0YfyOd4CPH9q9ZCQ=
+   eJytVbFOwzAQNSINQx2URoitC/wNRXwAA0xMnYFP6O8xU1VliFjCgBTB0CHCV+ea8/lsTMSTosvFl3vv7MtFKYvH3Nrn3L1flINP12vtxzfa9V+ZXxO/0coB9Zc975Lk4eiEZzvhGYLnaI2/MRwTY3Mt827JO1wvR3UaX0cczYZ74D/RPm8KXkprLxJ4KSdgF6g3BFr7W8+7rqxdTazFftiUv+vhvJiL5nufyvmayvV15uc/1Dvza6e8PBfgu+fFvngg/HBWt4H6OA8Aew72D3mhnq+pzbU4ViorlDon+3tj1q+E617iZZwt61HcZ4rLwlpeB8Q1RteHuT71cM5jALx3gTqumYW65pl8jg7wLIUzpbw4a55yf9bQeQbrXT+PJNC+qwPfvqQD3+sC84zmXfcx+z4hdQXnWKD2s0IOHzNXkOegS7n1o2ZPI9GWygu6pTkeg/QvQFBeJy7SM84ai4vVyHsCv7OgvpiGEUBt/Pv+635yXa1w1hI4L9fFOf4LId5UOGeQoAvj97wj6vgBOtBlIw==
   </data>
  </layer>
  <layer name="Above" width="30" height="20">
@@ -169,6 +168,24 @@
     <property name="place" value="entrance"/>
    </properties>
   </object>
+  <object name="south2" type="mapchange" x="96" y="608" width="64" height="32">
+   <properties>
+    <property name="map" value="wild9"/>
+    <property name="place" value="north3"/>
+   </properties>
+  </object>
+  <object name="west1" type="mapchange" x="0" y="256" width="32" height="64">
+   <properties>
+    <property name="map" value="gapfiller2"/>
+    <property name="place" value="east1"/>
+   </properties>
+  </object>
+  <object name="west2" type="mapchange" x="0" y="352" width="32" height="224">
+   <properties>
+    <property name="map" value="gapfiller2"/>
+    <property name="place" value="east2"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Keys" width="30" height="20"/>
  <objectgroup name="Citizens" width="30" height="20" visible="0">
diff --git a/AndorsTrail/res/xml/gapfiller2.tmx b/AndorsTrail/res/xml/gapfiller2.tmx
new file mode 100644
index 000000000..b0d498d60
--- /dev/null
+++ b/AndorsTrail/res/xml/gapfiller2.tmx
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="23" height="26" tilewidth="32" tileheight="32">
+ <properties>
+  <property name="outside" value="1"/>
+ </properties>
+ <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">
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
+ </tileset>
+ <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_broken_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
+ </tileset>
+ <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
+ </tileset>
+ <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
+ </tileset>
+ <layer name="Ground" width="23" height="26">
+  <data encoding="base64" compression="zlib">
+   eJytVUEOgCAMWzzoVR/rE3mAX/EFnkh0sVs7OCwkMEpXOmirWQNx72bL8R19jl9/jwj3b1+UO5qf5Sq8Pf4M3uyZFR6KZmhvBZe9/xl3EZ3PeLiKr3q+or2Cn9XY19WeRTmZtpnuiAPLDa0puIpHo/wRjynvZdVDfe7cvuH7RfG/542wUX1R3Z735SLThemDDDvirejC3qf6/4z4qRqjfwnT06zWEa76Zqi42bvzAGIopSE=
+  </data>
+ </layer>
+ <layer name="Objects" width="23" height="26">
+  <data encoding="base64" compression="zlib">
+   eJyVVUEKwjAQTNHeUjAP1aNP8OTZf3mVevbQCoIHQRBkbdduJrtJO1A0yWYzO5kkzg1ovYvwhjajCs6FZmwEPaYIZV4FfZ0f4n79hXX+fDL5sT6GVafsT+aK/MibsW9m8ggKj6DkNfo0HnvUQ8RcN9N6zIXX7g0tGN04jjVQXuQv4xMYvJN9tIBaKG3CI+NhOac16tc8E4x95bykQ0lHxCXjL4TkJPdS42LNmwNz70q5MmfWOitLkduDpWCuSb2GRyPvzKgVtfq3Q3weGeiF1qdceuNu6sV5xrw0j2JvTfzJWt/ADdH5OF6C9uQFX+JrUV/2rKPe6+H/oR5+j5Vz95US50YNlH7Ls6zTqZ76Piub2tNPeS+oveHJXcFbxE3TKoHiN7yTNV1pzLrz0CdcB8VtM++q9IeM0/xeutdpHH0ugV6cpZW6UJqX3ogz3KOoSQ78xqBWX1nFV4A=
+  </data>
+ </layer>
+ <layer name="Above" width="23" height="26">
+  <data encoding="base64" compression="zlib">
+   eJzVVTkOgEAItNHOxEa/5g/8rX9RE63NFiQEgWGPxilZhmPYZbtOxzEZBz/E6fQS6TP5eDFy/TQkHvH3Rtp7vaFaOVf6Re8G53n56EyLW6pnLbdVTjlL3qtWH9LW09CyW9pG4lszqd0P8n4hXRCIg+ri8aN59gb9RuJSPdeIuTnvl3D3X9vDbNZ9RDql83n42pfB3iPefpHQ9uFaOI9I3s2Yi+Qj1PwFHNZ/gPZHbn75Blv9e55mGi+SO/omUf1anpIZS84Lxh9oRA==
+  </data>
+ </layer>
+ <layer name="Walkable" width="23" height="26">
+  <data encoding="base64" compression="zlib">
+   eJy1k8ENwDAIAzNCl+r+K/VfFXzGFCmPJHAxFjmnjvv6Xur+nedyCb8LJ/fPfKfH5KzT4XpX1Squ0urWkp7UnqxJbPOmfNe7qR/T/0/0b9UmXDrfKTPV6MxYwlXvbOlO5pTod/jdu1Wt4lL/lB9TPtGt+qC6VTjeqjPCJfoneXR2HqrfbOk=
+  </data>
+ </layer>
+ <objectgroup name="Mapevents" width="0" height="0">
+  <object name="sign_whitecabin" type="sign" x="416" y="608" width="32" height="32"/>
+  <object name="south2" type="mapchange" x="576" y="800" width="32" height="32">
+   <properties>
+    <property name="map" value="wild9"/>
+    <property name="place" value="north2"/>
+   </properties>
+  </object>
+  <object name="south1" type="mapchange" x="96" y="800" width="96" height="32">
+   <properties>
+    <property name="map" value="wild9"/>
+    <property name="place" value="north1"/>
+   </properties>
+  </object>
+  <object name="east2" type="mapchange" x="704" y="544" width="32" height="224">
+   <properties>
+    <property name="map" value="fallhaven_sw"/>
+    <property name="place" value="west2"/>
+   </properties>
+  </object>
+  <object name="east1" type="mapchange" x="704" y="448" width="32" height="64">
+   <properties>
+    <property name="map" value="fallhaven_sw"/>
+    <property name="place" value="west1"/>
+   </properties>
+  </object>
+  <object name="north1" type="mapchange" x="0" y="0" width="224" height="32">
+   <properties>
+    <property name="map" value="wild3"/>
+    <property name="place" value="south2"/>
+   </properties>
+  </object>
+  <object name="west1" type="mapchange" x="0" y="32" width="32" height="224">
+   <properties>
+    <property name="map" value="wild5"/>
+    <property name="place" value="east1"/>
+   </properties>
+  </object>
+  <object name="west2" type="mapchange" x="0" y="416" width="32" height="192">
+   <properties>
+    <property name="map" value="wild5"/>
+    <property name="place" value="east2"/>
+   </properties>
+  </object>
+  <object name="north2" type="mapchange" x="416" y="0" width="64" height="32">
+   <properties>
+    <property name="map" value="gapfiller4"/>
+    <property name="place" value="south"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Spawn" width="0" height="0">
+  <object name="forestant" type="spawn" x="672" y="448" width="32" height="64">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestbeetle" type="spawn" x="672" y="544" width="32" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="0" height="0"/>
+</map>
diff --git a/AndorsTrail/res/xml/gapfiller3.tmx b/AndorsTrail/res/xml/gapfiller3.tmx
index 7f2e069a6..f79a0ba7f 100644
--- a/AndorsTrail/res/xml/gapfiller3.tmx
+++ b/AndorsTrail/res/xml/gapfiller3.tmx
@@ -1,150 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="11" height="10" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="14" height="10" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="11" height="10">
+ <layer name="Ground" width="14" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjEmRg+CTAwMAEpY+yoWImAvL41BNSS4o6QmqQ7SdWLbJ7ibUXpB6bHdjEQPqxmYHLPnxuR9cDAGUvUK4=
+   eJxjEmRg+CTAwMAEpY+yoWImJHlkcWxq8emFqUc3BxtG1kOMenT3kKIXWQ2+cCDGf7jsIxSuuPRiE0M3C5vZxMYNofDHFi4A4Rpjbg==
   </data>
  </layer>
- <layer name="Objects" width="11" height="10">
+ <layer name="Objects" width="14" height="10">
   <data encoding="base64" compression="zlib">
-   eJxtUMERwCAIwz8PmcsNeufi7asdwBnaWDgR5YNgSAhEcyQhKlkLoSXwjz5y4x97fvnJe/zF412Vt3EAKR8CPIdy7nTvPPeLr4O+7YRZcNYwG/Gm6Tltr+5j468G34s3Gvr+FslzyVz7+/s+3rbjC11jEvM=
+   eJyFUcENgCAMrP+awCi6hhuYMIIL648BDCPoKZXagN6nFK7t9SB6o/NEk8uJp0+ACw7iznfdesbo6rWdutu4nEOetzO14Us9+s95Vk2PxtK/82c3qmsUyA7oiVnBGUKjNnHRpWeJ9mvvH1+D8c/6on2XHBq1p9pr4UbjM7zRfw1OUj2G8300/h2Ujham
   </data>
  </layer>
- <layer name="Above" width="11" height="10">
+ <layer name="Above" width="14" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYMANLgngkSQCfBTAbc4HJDF89nzAofcjHj0gOWz68OlFF8OlH5d6dDF89uNzCzZz0c0C8QFPABaw
+   eJxjYMANLgmg8j8C+R8EIDQlAKYf3XwQ+IBFDKQem1p8emDgIRFuhvmLECDG7+jyhMxFNhOb2chiH/CEGzb70N0L43/AYx+yfmzxDQC2mCOK
   </data>
  </layer>
- <layer name="Walkable" width="11" height="10">
+ <layer name="Walkable" width="14" height="10" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcEXDMIAujksdLrWEADb12PQRay6xbiXWXHzhgU8dPvXEhDMx/gEA2OsUlw==
+   eJxzFWBgcEXDMIAujg8jA1LUYgOE9GIzgxz7yPEbOfYRG6749BCrl9R4JDUsAEzvHo0=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="11" height="10">
+ <objectgroup name="Mapevents" width="0" height="0" visible="0">
   <object name="north" type="mapchange" x="160" y="0" width="64" height="32">
    <properties>
     <property name="map" value="wild1"/>
@@ -158,12 +157,12 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="11" height="10">
+ <objectgroup name="Spawn" width="0" height="0" visible="0">
   <object name="forestant" type="spawn" x="32" y="64" width="288" height="192">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="11" height="10"/>
+ <objectgroup name="Keys" width="0" height="0" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/gapfiller4.tmx b/AndorsTrail/res/xml/gapfiller4.tmx
index 9a7fca583..22e14c8c3 100644
--- a/AndorsTrail/res/xml/gapfiller4.tmx
+++ b/AndorsTrail/res/xml/gapfiller4.tmx
@@ -1,150 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="15" height="15" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="15" height="24" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="15" height="15">
+ <layer name="Ground" width="15" height="24">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAwCTIwPBJAEIfZUPF2MSwqQHpJ6QOG8Zl7wtm8u39QYRect07GPFxKppFTLjjspOYcKemW4cLBgCwFa/V
+   eJw7ysbAwCTIwPBJAEIfZUPF2MSwqQHpJ6QOG8Zl7wtm8u39QYRect07GPFxKppFTLjjspOYcKemW0cxeZiYtI8tT+LKq8TYR24Zga9swudWUvRT293o+pD5+MIVmzoAYCgTYg==
   </data>
  </layer>
- <layer name="Objects" width="15" height="15">
+ <layer name="Objects" width="15" height="24">
   <data encoding="base64" compression="zlib">
-   eJx1UkEKwkAM3ILsaYUu9C/iE/QHYl9g0ZsKReld9INee+zFc09maNYmsQ2EdONMJolx0f0b5bI4xGRd0HnEPmhMFgVW1iF7c64PbtbiUr833rnthKfaVldayzqrhXNr8jPxLl5jpnhv0d8hJz3hdqapd024ez7OmXTxRk+FmDFpgXMjb8jLfPwdWOykEjP/tPh7z/gTxZfg7nhXldc7Rz38PzXrWR4MHPRW+VFb9towvjS8xE34q9n3XK+pL+znY3Z+ZNyD4pN5vbxFVWQI0LW3JGeAdUHnoSvntbjC1FN3HM2eJ3pL/bTm/lH/C1mZNrI=
+   eJytVMEKwjAM7UB26mCF/YmC+An6B6Jf4NCbCkPxLvqDvXrcxbMnE0xtmq1V0EDsmuX1vaSZyqjAqgJ+IJaZ14o2hNhIxHF9aJ+DltFzqylgfMxS7KFV1EwR7qe5UrMed2dLXm434hkPlJqAbwG3y8OcPpxl+lYl8DGXNfXtG8g7lr5Ox1vnL00Vq9FxIeYAfgJflv495mJPalbzm4ueF5S/gfXKsHPqFWJ5z/E8vJ+G+CQODTGorc49N9d6ovylwDmsy9+Lfse0Ol3Yn7sOe76mvDOsF8K5uevcH+2RV84SrwGt1WG8KsJ6ZV4lzgvm2Ig+92hzem5i/tvE9/Crpb41rq/TK6HdfqnRJurnvJwvWX/kjFjOpzoCjSo+R/+8k9R/k9XduZL2BOKTPqE=
   </data>
  </layer>
- <layer name="Above" width="15" height="15">
+ <layer name="Above" width="15" height="24">
   <data encoding="base64" compression="zlib">
-   eJxjYEAFHwUYMAA2MWqAD0jm0soOQvbC+PSyH9kuetpLb1DGRlgNLfxPjL3EAHrGDQBytBAB
+   eJxjYEAFHwUYMAA2MWqAD0jm0soOQvbC+PSyH9kuetpLb1DGRlgNNv+jxw0t7MXlFnT+YI4bQu7DJU9K+CLrJzevEmMfsWGNTw214wpXesAXrjB5QgBXuGJTBwA1sioN
   </data>
  </layer>
- <layer name="Walkable" width="15" height="15" visible="0">
+ <layer name="Walkable" width="15" height="24" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcKUiRgbk6iNVLy57iTGHFIBNHyFzKLETXQ8uNrFuJdVOStxLid3kqiXXXmL0EhPW+NyGyxwQHwDoryE1
+   eJxzFWBgcKUiRgbk6iNVLy57iTGHFIBNHyFzKLETXQ8uNrFuJdVOStxLid3kqiXXXmL0EhPW+NxGjDn0AsSmHVzihPyAKzxokZ4IhTUx8UqMflIAKeUVIXUARWYwJg==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="15" height="15">
+ <objectgroup name="Mapevents" width="0" height="0" visible="0">
   <object name="east" type="mapchange" x="448" y="128" width="32" height="32">
    <properties>
     <property name="map" value="fallhaven_nw"/>
@@ -157,10 +156,34 @@
     <property name="place" value="east"/>
    </properties>
   </object>
+  <object 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 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 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" width="15" height="15"/>
- <objectgroup name="Keys" width="15" height="15"/>
- <objectgroup name="NPCs" width="15" height="15">
+ <objectgroup name="Spawn" width="0" height="0" visible="0">
+  <object name="forestdog" type="spawn" x="64" y="512" width="320" height="192">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup name="Keys" width="0" height="0" visible="0"/>
+ <objectgroup name="NPCs" width="0" height="0" visible="0">
   <object name="fallhaven_guard" type="spawn" x="256" y="128" width="128" height="128"/>
  </objectgroup>
 </map>
diff --git a/AndorsTrail/res/xml/mountainlake12.tmx b/AndorsTrail/res/xml/mountainlake12.tmx
index c919026fc..9fb12a4d0 100644
--- a/AndorsTrail/res/xml/mountainlake12.tmx
+++ b/AndorsTrail/res/xml/mountainlake12.tmx
@@ -1,150 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="29" height="19" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="29" height="21" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="29" height="19">
+ <layer name="Ground" width="29" height="21">
   <data encoding="base64" compression="zlib">
-   eJzdk8ENgCAMRQkHx2EGWUFWcFW3cBghhqRpCi20cvDwTpD/UvoJ3rmwkH2hpxAzx4f52FNImdPYBfOxp3BtLxa+SORjD8RittTJt3TC2aSuWefsbFJnq4Mzs/WcVMdxByW5N6LlpP4S10GJr+WMnv5Lo1A+7IWd0OxoxGnRCam3nmveUbNTbaaFk7vPZfV2ymX9iQcQ+Te3
+   eJztk8EJwCAMRcVDx3GGukJdoat2iw5TpRRCiCaaVCj08E7Kf8R8g3cuTGSd6CnEzPZiPvYUUmY3dsF87Ckcy42FLxL52AOxmC018i2dcDapa9Q5OpvUWevgyGwtJ9Vx3EFJ7omoOam/xHVQ4qs5o6f/Ui+UD3thJzQ76nFadELqfc4176jZqTbTwsnd57JaO+Wyfr7HBSvDaus=
   </data>
  </layer>
- <layer name="Objects" width="29" height="19">
+ <layer name="Objects" width="29" height="21">
   <data encoding="base64" compression="zlib">
-   eJytVL1Ow0AMTsqaSvcKMPeNwgoj3RGEOVF5A96HR2AsEkOG6Jod9RpsxVYc15eSgCXrovPd9/nnuzRZsthqN3x/uPP4u7EXu+9FHnv6bmbkxlhWHn8xmdecfMr08hnuT70g55bwK1g93L9bJck94UzlPDWnfaQ+jGM9XTrwtOAdrUssNifE5/jVOkmuwW/WY75O3ZU6s3oZm9uGuD6NOwH2Tq5fmVfixPL3Exrh2hgnZD33MRvv4RyCUeccw9q4F0eV0yPsPyl/dn0u4RecB6XtknSBOvxS7xj7hHwv4A/gO/It+K3q6dQ7OJHOD27oo3e2LiTfq8DM4bugWkNkTm/pgI/GuMhr8bWkk9zgQ6tErdpwRqhxNM4nRPCDWr+zcT3acoNzszo/1wheic956XNcj8UrOUvVRzR+M6xH/Z/SupRzivVRcsqZegNP4taGLiW+1K3FWRCWzl3rnHELFWedSCwrzlYJPH12d+G8juuYdV/bnLP/ZT/SWLG1
+   eJztVL1OwzAQdsqaSn4FmPtGYYWR7gjCnKi8Ae/DIzAWiSFD5GZHdYNPuVMu13OKw8pJJ0c++/vu53Pa3Cy2xo7fH/Y8/q7sxe47lscev9uE3AhLy+MvxvNKyafKLp+h/jQLcu4Qvw6rC/fvVsbcI85cznNz2kfqgzjU02cjTxe8x3WJxeYE+BS/WhtzHfxmPeXrxV2uM62XsbltkOtTuePD3skOK/FynFj+bkYjVBvh+HzgPubTPZiDV+pMMaiNenEUOT2G/Sfhz3bIxf+C8yC0XaEuQIdf4h1Dn4DvJfhD8B36Nvit6OncOzihzg927KOzui443yvDLMJ3ibX6yJzeshEfjHCBV+PrUCeFwgdWs1qlwYxA42CUj4/ge7F+59N6pBUK52Z1fq5lvByf8pLnqB6Nl3NWoo9g9GZIj/I/JXXJ5xTrI+fkM3UKHsdtFF1yfK5bjbNELJm71DnhliJOOuFYWpysZnjy7O7CeRmXMe2+tJSz/5ZmP+fPsbU=
   </data>
  </layer>
- <layer name="Above" width="29" height="19">
+ <layer name="Above" width="29" height="21">
   <data encoding="base64" compression="zlib">
-   eJxjYBj+IF2A/vaE08BObP6A2fMOSL+lop0wu7D5g5r2INuXBsQXoDQt7cPltws0SifpSH5C9xsuQK5b8MXbcSr4D18aBPkNlg7fUWgXobyEKxzJtTcdLd2lUTk/EbKPHgA5HKmRFogB1PAjvdw6CgYXAABDpRt3
+   eJxjYBj+IF2A/vaE08BObP6A2fMOSL+lop0wu7D5g5r2INuXBsQXoDQt7cPltws0SifpSH5C9xsuQK5b8MXbcSr4D18aBPkNlg7fUWgXobyEKxzJtTcdLd2lUTk/EbKPHgA5HKmRFogB1PAjvdw6CkbBQAAAKPQbdw==
   </data>
  </layer>
- <layer name="Walkable" width="29" height="19">
+ <layer name="Walkable" width="29" height="21">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB3Fo3gQYRCgt13ogJb2odtDS7tJAdS2Excfm9to4WdC4UGuGfjSES3dRKr7sKkhJe7xAVLjHiaGj08MINadxLgfm5mE5MkNG3zyxOinR74ZbBgAcSOQGw==
+   eJxzFWBgcB3Fo3gQYRCgt13ogJb2odtDS7tJAdS2Excfm9to4WdC4UGuGfjSES3dRKr7sKkhJe7xAVLjHiaGj08MINadxLgfm5mE5MkNG3zyxOinR74ZxQODAe6Mo10=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="29" height="19">
+ <objectgroup name="Mapevents" width="29" height="21">
   <object name="east" type="mapchange" x="896" y="288" width="32" height="224">
    <properties>
     <property name="map" value="mountainlake11"/>
@@ -158,7 +157,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="29" height="19">
+ <objectgroup name="Spawn" width="29" height="21">
   <object name="mwolf_2" type="spawn" x="288" y="480" width="32" height="32">
    <properties>
     <property name="quantity" value="1"/>
@@ -170,12 +169,12 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn2" width="29" height="19">
+ <objectgroup name="Spawn2" width="29" height="21">
   <object name="mwolf_1" type="spawn" x="64" y="160" width="800" height="416">
    <properties>
     <property name="quantity" value="5"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="29" height="19"/>
+ <objectgroup name="Keys" width="29" height="21"/>
 </map>
diff --git a/AndorsTrail/res/xml/remgard2.tmx b/AndorsTrail/res/xml/remgard2.tmx
index 04786cdec..44b575009 100644
--- a/AndorsTrail/res/xml/remgard2.tmx
+++ b/AndorsTrail/res/xml/remgard2.tmx
@@ -1,150 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="29" height="20" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="30" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="29" height="20">
+ <layer name="Ground" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJzdlUEKgCAQRQWpnYtO1hE6VifyCNGmA3QEaVUiwjCMOtkY1OKhi/R98Ke2V8o2ZkNw1+06IOHlrnE6kP3OJKh0clgMDelM5UNZS4wDDeVM5cNZS0zX/nMXzt3PI5QzlQ9nvXP2flx1IHYPOmEmiM8Ms9biCOdb/MLJ6Ly0k9N5aSen89JO3HP4j3KcT+/GI97NkYwTvzkUtV2V4C1Pyd3a9TVOZ0rPAA==
+   eJzdlcENgCAMRYlEbxwcxFkcwbGciBGMFwdwBOJJCWlCGipFhEQPL3CgvH9oQXdC6MJsAbi1u3S85ebWGem4PacIMrwcFhWG9FI5UeYYYx+G8lI5ceYY0+WYW9cHdg9QXionzpzSC3ZdpQP6EXv9bD42u5/5KYbw1uJXXsYslPByZqGElzMLJby4//0Z5npzcx3wlgORe0P/Ve57zrkzhZqumL+G74sMjRAn6XHf9Q==
   </data>
  </layer>
- <layer name="Objects" width="29" height="20">
+ <layer name="Objects" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJy1VcFKA0EMHdlaQXd1u/oH/oH6E21Bbx5U7MmDCnqXVo9CqT/kDyj9AcGbigiVtnoS1G1NmAnNpLPTVemDRya72bwkzdBerFQX2BO2DxwaH1EuKlUB7hS1vx4ptRHpcxVinkKlVsC/gfMb8B3YBJ4Cz4ENkwcxZPmzLMdx0a6JNAl3eC4pNVPSPunusZhJemgHLB41U/GuKupCrC2OzrtCE79JY7/9TZ8uSM0eO/PaXHiIJ/d5OavtZ+LvMy9IM0+f88uwT4FSt4HW5HtEfd4ntqWat5dG/mOOPgtmlw9EHXyPqM9OYluJ11Bb3ufA0+dXaPt8vpjjeUFzDuJWo/Gav9n31CfpbYKt4b6Fdm2ILjtzzUNz1yWr5u6XxfMjYMBqmbSzLk1CGrpjER3PO5+m744ScE4Vxq2MfDyu9oc+Kxnf4++yL2qQcUFk56W7eZ3Y1tUnn90ZPK8zNmL/3CVe4D62jVbbo8m1LoAnwFY8+k+QNRD4XoYFvecfwXgdlJc06w6tK/OuafyWowaunWbMiefkeVuOZ1loerRdc8qTMy9c2q45TQNy9tPU+i9+ABrpuIw=
+   eJy1VcFKAzEQjW6toFndrt48+gfqT7QFvXmwYk8eVNC7tHoUSv0hf0DpDwjeVESotOpJULd1QjJ0Ms1mt0IfPCaTZOfNZCe7/UiIHrDP7DtwaHyFclGICnCvqP3NUIitUI+rsOdZCrEK/i2MP4CfwBbwDHgBbJo4iCHRSLMUJ0U7L9RF3KtxSYiZkvZRe5/FydJUdkCeUboJW6uymAobS6NxzaGrnksiv52kXhdcun3i0xxdeIyy672a0/Y7zq43L1A3T70LK9BjgRB3gdblvYX1PsS2xdx3l0f+U456C6bHD1kuvLew3m5sW443qS2td+Cp90faPj9rFedlUXMe9q6H47n/Sns/7bdtsHXVg9LOT6FHxlz3yHwPOKvm+1Bm88fAgOST1ctpuohEjs8hup41n27WHUaoM6sQ7uTYV/9nvZWUGOo9HbA8+L4gtGPj3b2JbZtWLz3Hc1hrEDYj/zvgeIX72jF6nQxdqncJPAW2o9G/hOeBoP0qC7r/v4Lx2BiX6jYcetdmvWX8tiMPqp+knBeNSeMqtFPmXWh59F3nlSfmJHDpu85rWuDvIa/e2ux08/LhD22LuKk=
   </data>
  </layer>
- <layer name="Above" width="29" height="20">
+ <layer name="Above" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYCAOHGdmYDjBjOC/FWBgeCdApGYyALLZqQK45WgF0O2Ega+suPV8wyNHCFzCYh/Mn6JsuPWJocnhcx8yoMSt4Whuxec+ZIDuVhggJj7TyIxzdLfSA5DrVhjAlfZGAX5AKO1TkuZxAUJpH1eapyUYimmeHDCaT0YBtQEAwpoTWg==
+   eJxjYCAOHGdmYDjBjOC/FWBgeCdApGYyAbL5qQK45WgJ0O2Fga+suPV8wyNHDLiExU6Yf0XZcOsTwyKHz53IgBI3h2NxLz53IgNsbgYBYuI3jYI0gM3N9ACUuBkEcKXHUUA8IJQnKM2/uAChPIErL9AaDNW8QC4YzUOjgF4AAJHJE1o=
   </data>
  </layer>
- <layer name="Walkable" width="29" height="20">
+ <layer name="Walkable" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJzVlMsJACAMQzuCS7n/Sp4EEY3pFwz0ZvsMpvYm0h015ZlhZVazM3jIR6ZHNLOaufuMZDM+EZu9y3qOec+bGOarn+VZMobOWeTpRfOYXP/GZHczknniW5maDHuZbJY1iviPtDucUZWs32oACkt/gQ==
+   eJzVk1EKACAIQz1Cl+r+V+oriCidzooE/2zP0axFpBLdi9FguC/4p5ian9NeNd0X3NlvNh/xq/E9+4yzyP/uCuVaGigzmjttNlLse0sTyfuPXPR2s7mrHRiuJ9sZXDTjnkJvx3Njt1gW/wbv125sxIYl
   </data>
  </layer>
- <objectgroup name="Mapevents" width="29" height="20">
+ <objectgroup name="Mapevents" width="30" height="20">
   <object name="north" type="mapchange" x="512" y="0" width="64" height="32">
    <properties>
     <property name="map" value="remgard1"/>
@@ -176,9 +175,9 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="29" height="20">
+ <objectgroup name="Spawn" width="30" height="20">
   <object name="remgard_villager5" type="spawn" x="64" y="320" width="288" height="128"/>
   <object name="remgard_villager6" type="spawn" x="384" y="64" width="224" height="512"/>
  </objectgroup>
- <objectgroup name="Keys" width="29" height="20"/>
+ <objectgroup name="Keys" width="30" height="20"/>
 </map>
diff --git a/AndorsTrail/res/xml/remgard3.tmx b/AndorsTrail/res/xml/remgard3.tmx
index 45960d499..fca517a1c 100644
--- a/AndorsTrail/res/xml/remgard3.tmx
+++ b/AndorsTrail/res/xml/remgard3.tmx
@@ -1,150 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="20" height="25" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="20" height="27" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="25">
+ <layer name="Ground" width="20" height="27">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcHQUjyzMzMBwjHkQuGMkY148GE3taSLi6iovboys7hbQrNtAfAeI7+Ix118QNybHH/GCCFzGCsEwPjn++ArFL4B+2MEOwTAxsvwBxT+QzMMmj+wPEJ6Owx+jmHb4DhRTwwxcmFx9A40BoRmJSA==
+   eJw7ysbAcHQUjyzMzMBwjHkQuGMkY148GE3taSLi6iovboys7hbQrNtAfAeI7+Ix118QNybHH/GCCFzGCsEwPjn++ArFL4B+2MEOwTAxsvwBxT+QzMMmj+wPEJ6Owx+jmHb4DhRTwwxcmFx9oxg/BgDCeKyY
   </data>
  </layer>
- <layer name="Objects" width="20" height="25">
+ <layer name="Objects" width="20" height="27">
   <data encoding="base64" compression="zlib">
-   eJytVDtOw0AQteQQkOxFVqCnoKLlDDQQCW5AKlroUQIlUpTciCNwAwoqsEQwqfhIJIZZ7Y48Hs+OXfCkp9GuZ958dr1lFkVDoMUS7C/wHVh0sOhP7a5xemtgGbDoy9eSLUl9r2nUwJGptB/Tqo9QrhPgKKvieX6LBcmD+09p3V8D75lrLZkG3X9jPRSw3hP6Ds2LWsyNNR/0HCWNtrPCe9E1P8XK12/Pj2tKNYfuhDZv9JNi8kAOa2PjfBZsxvT+aXcXZ/yRdKsP/x8NL4mjBqyP3zEJn4mjhAvWH63vfuB9NhxxbWvbN3Wdw+2mdsHqexjUv+M6VBvHuqXPPHbcFP4XxB308e3zUj97/gWL+4odj/vwbgCHfVlza8fZ5459aOgZ/Tt/A0/9m6bxTJhbKG7EfPlMLM5b4lYk5hr2x56TlvND/LCcVOMWeAm8At4w7Txrxo+zJlFj5jkHTsmaa1POApwrvU2VuP/GH51/7ak=
+   eJzlVDtOw0AQteQQkOxFVqCnoKLlDDQQCW5AKlroUQIlUpTciCNwAwoqsEQwqfhIJIZZ7Y48Hs+O3fOkp9GuZ958dr1lFkVDoMUS7C/wHVh0sOhP7a5xemtgGbDoy9eSLUl9r2nUwJGptB/Tqo9QrhPgKKvieX6LBcmD+09p3V8D75lrLZkG3X9jPRSw3hP6Ds2LWsyNNR/0HCWNtrPCe9E1P8XK12/Pj2tKNYfuhDZv9JNi8kAOa2PjfBZsxvT+aXcXZ/yRdKsP/x8NL4mjBqyP3zEJn4mjhAvWH63vfuB9NhxxbWvbN3Wdw+2mdsHqexjUv+M6VBvHuqXPPHbcFP4XxB308e3zUj97/gWL+4odj/vwbgCHfVlza8fZ5459aOgZ/Tt/A0/9m6bxTJhbKG7EfPlMLM5b4lYk5hr2x56TlvND/LCcVOMWeAm8At4w7Txrxo+zJlFj5jkHTsmaa1POApwrvU2VuP+GPy/a7ak=
   </data>
  </layer>
- <layer name="Above" width="20" height="25">
+ <layer name="Above" width="20" height="27">
   <data encoding="base64" compression="zlib">
-   eJxjYICAtwIMVAHvqGQOLgByJ8gOGI1NnhKAbCayWeh2wdyA7i5cAJu70M3ApxbZDnL9iBxulJpBjDpqA3LMJMev1MoLuMBXVvzy35DkTzFD6ONA+gSUje4+UTb85okRkCcVhEPtJ8Uf+EAa1LyB8gchkEqkujQap5tRMAoIAQD3vCmW
+   eJxjYICAtwIMVAHvqGQOLgByJ8gOGI1NnhKAbCayWeh2wdyA7i5cAJu70M3ApxbZDnL9iBxulJpBjDpqA3LMJMev1MoLuMBXVvzy35DkTzFD6ONA+gSUje4+UTb85okRkCcVhEPtJ8Uf+EAa1LyB8gchkEqkujQap5tRMAqGOgAA9wIplg==
   </data>
  </layer>
- <layer name="Walkable" width="20" height="25">
+ <layer name="Walkable" width="20" height="27">
   <data encoding="base64" compression="zlib">
-   eJxzFWAAA1cB6mFamIcPoKsjxSxS5YlxGy41pPiVUnfROi7IjTNapANapK/B4D5k/dRyHzXTB6XhREm6orZ5yGpJCWNc9g4XMBj9hCusSXErvfMyvTAAhMNmRQ==
+   eJxzFWAAA1cB6mFamIcPoKsjxSxS5YlxGy41pPiVUnfROi7IjTNapANapK/B4D5k/dRyHzXTB6XhREm6orZ5yGpJCWNc9g4XMBj9hCusSXErvfPyKIZgALJvc40=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="25">
+ <objectgroup name="Mapevents" width="20" height="27">
   <object name="east" type="mapchange" x="608" y="544" width="32" height="192">
    <properties>
     <property name="map" value="remgard2"/>
@@ -188,10 +187,10 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="25">
+ <objectgroup name="Spawn" width="20" height="27">
   <object name="reinkarr" type="spawn" x="192" y="160" width="32" height="32"/>
   <object name="duaina" type="spawn" x="320" y="224" width="256" height="128"/>
   <object name="remgard_villager7" type="spawn" x="64" y="544" width="512" height="192"/>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="25"/>
+ <objectgroup name="Keys" width="20" height="27"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild0.tmx b/AndorsTrail/res/xml/wild0.tmx
index 52f8ce57d..448b68ffd 100644
--- a/AndorsTrail/res/xml/wild0.tmx
+++ b/AndorsTrail/res/xml/wild0.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="21" height="21" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="21" height="21">
   <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
  </layer>
  <layer name="Objects" width="21" height="21">
   <data encoding="base64" compression="zlib">
-   eJyVVDsOwjAMDRITKiI9AGJl5QhITFSCnY/YOQKCCyA4G3sBoYoLlJENGxJIXTsJT4rUOo79HD9HqXhkWqkigY9U9jlp3t5I+XMY85L48z6EmFIejHnV1XxS/tA+2icQawUrD/CsxQOcyX2hHW1ZZE0Nwunq4eDGpPXYfxqv8k/8C8tTuBesA31G7ere3di/92Xyol/uqX0D9i2sXcTd0F5IPOdg70DehbDPYQ2+Y9NzDnuwH2AdmX3u3meOn9VDSI8S8Bxq+61xSQue+KwuFOlLiBfVpK7r3AJjUn1QPq5OLEr9mftS1/1jeNo35Z07UM8t+b0ZhdAfOjchoP+S9l2Znjmxuk2lekz9EuwMIaxOp2Tun61P/QOBV0wed57uJl8fuA4ZnlyfuLyxb94/kObexQtUbzkq
+   eJyNVDsOwjAMDRITKiIcALGycgQkJirBzkfsHAHBBRCcjb2AUNULwMiG3SaQunaSJ0VqHcd+jp+jVDxSrVSewEdf9rlq3t7q8+cw5j3x530LMaU8GPOh6/mk/KF9tM8h1hZWFuDZiAe4kftCO9rSyJpahNPDw8GNSeux/zRe7Z/455ancC9YB/pMu/W9wth/92Xyol/mqX0P9gOsY8Td0F5IPFdg70HetbDPYQe+M9NzDiewn2FdmH3u3peOn9VDSI8S8Bxqu9S4pAVPfFYXivQlxItqUjd1boExqT4oH1cnFi9dzf1LN/1jeNo3pcwdqOeZ/N+MXOgPnZsQ0H9D+65Mz5xYg7ZSQ6Z+CXaGEFanCzL3n05V/1jgFZPHnafC5BsB1wnDk+sTlzf2zYtF4XmfXHwBebs6GQ==
   </data>
  </layer>
  <layer name="Above" width="21" height="21">
@@ -141,7 +140,7 @@
  </layer>
  <layer name="Walkable" width="21" height="21">
   <data encoding="base64" compression="zlib">
-   eJzNkrENACAIBB3Bpdx/JSsbongPGiWhAs5/pNVSGsgRpJemjZPcH3Su+rM8O6fybI835/FGbeeT6lTr1LeyF8Kl796888geovqyfndzqm7KU7gRXyf3kOHNuC910n9T9xm9mw5tbWZF
+   eJzNksENACAIAx3Bpdx/JV9+iOIVNErCSzjbaqulNNCjyCxtWye5P+hczWd5dk/l2Rlvz+ONs51PqlM9p76VXAiX3nvzn0dyiOrL+t3tqbopT+FGfJ3MIcObcV/qpO+m5hnV0wF6pWaa
   </data>
  </layer>
  <objectgroup name="Mapevents" width="21" height="21">
diff --git a/AndorsTrail/res/xml/wild1.tmx b/AndorsTrail/res/xml/wild1.tmx
index 2c056a3a9..ee93373e6 100644
--- a/AndorsTrail/res/xml/wild1.tmx
+++ b/AndorsTrail/res/xml/wild1.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="21" height="21" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="21" height="21">
   <data encoding="base64" compression="zlib">
@@ -131,17 +130,17 @@
  </layer>
  <layer name="Objects" width="21" height="21">
   <data encoding="base64" compression="zlib">
-   eJyVVTsOwjAMTRFjKpI7MbU3QGJkQeKoXKAdEGVEQu3KgKiFTV3HpuFJ/cR9fnEcO3UuRRHHW9TtdXCuDzpf+nH7y6MxCr77aMJ4FZkf4jh+q8R8FmCODrn78dl6fR2AgWkWBocDOOsytVlcQusVgvBrtDhFHhtNR9HVYprZ8H0wcmrN8127or8tU7u67l/I2IMlPq3T3KecOTJrgcBrzOobqTuL09gza380XfB/inxDH1zDnGdB9iMHz+XNC03N34hHahHOYepZHueF+VMtcX+pxesN9O5sTP1Vhek6Zea3w7Mp54wAHDbO7Rbynt3PCODWMt7cflHOY0Kiifxf9SD7umdj+j8AeJ08/j0LGKAPSLPDWoH/z2A8NbwBOoM2gw==
+   eJyVVDsOgkAQXY0lxCXxAnoWK72BiaWNiUf1AloYoTQx1hZGJszK8HgL60tEGN485rvO9TEp6kvB7Vvv3CLnfPSz9k+mxgL4rtGU52lh/BTH+t3GkyAJ5Bulcvf1/zXjeQiqrL2fRDgWwpmxvCPcgGtGCOB3YXFCHS9Mh+iymDo2vccedmIh+OVO9Nd5307zHgLRjcUY44c8o31K6HMKp9dfO7cxf9wLp3FGenZLrZ/6v4Eve3D3XV4MuI8WtpayM3eyi7j/LB7UCjj7dmdtnDb/MEvWH7XsvInewzyH/dr49ndKPFNKPZtYbdh8HubO7UbqPrbPFbwT7hbjTZll4OF89jSVPzQPuNcvOEeDpp2T579ngYHUOGiWOitSn2VtX+XNnCwG9kjwBY9zMGU=
   </data>
  </layer>
  <layer name="Above" width="21" height="21">
   <data encoding="base64" compression="zlib">
-   eJzFVEEOwCAI8wn+/1m+hP1g8UBCiLC22bJeTLCUougY/2FNPud6yLF55sSYEXVP3Bxj9CpPXUyF6qs6w4hq/xSPPvZ+p+/xzFHOBekf9YPqdfkV9jtYRR33p+h+DXW+IpQ/oNNCZreC5+a1478JS7PP9ML2HPnsHSDziejGPtG6yt3eL1dBTQ==
+   eJy1VNsNACEIc4Tbfywn8Ta4+EFCCOVRvf6YYKkVxDH6WA+R5GASOm+Ss715HB1DHKSXxdh6ZD5PEfmKzqnUB+17ce1j70f6Erccpi6VvlT9VPWifIQ9BxO8T/HH6P6NG/8A8wdEWp3ZtpBcu0b8m1jm7Xfu0r2z5nd74M2zB6Tr1bniE/Un0/kALxBPVQ==
   </data>
  </layer>
  <layer name="Walkable" width="21" height="21">
   <data encoding="base64" compression="zlib">
-   eJy1k9ENACEIQx3hlnL/lcx9XGIIOfoqNuFHSq0I8xljgnhB+HtdVludx3yFyKn0FN2MQ/3f1HN1Hbj/4+SVeSBzQ/jknV1zr2pm9ZVPuqcZiE8V3fP5aShnqre/HlMNZQ86vJ3c36FL++3skBoL7mRCaQ==
+   eJy1k9ENACEIQx3hlnL/lcx9XHIxRPoKNuFHSq0I8xljgnhB+P+6qDY73/MZdk6mp+hGHOr/pp6r68D9HyevzAOZG8In7+yae1Uzqs980j2NQHyq6J7PT0M5U72dekw1qnuieqveX9Wl/XZ2SI0FXfNCvg==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="21" height="21">
diff --git a/AndorsTrail/res/xml/wild10.tmx b/AndorsTrail/res/xml/wild10.tmx
index d21662a96..0044c5275 100644
--- a/AndorsTrail/res/xml/wild10.tmx
+++ b/AndorsTrail/res/xml/wild10.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJyVVMsOgjAQLIlHjPBPntQvMPHohcQf5gLx6gETriB20y6My7aVSUoLnd3OPooxDllpH6Wb+3xZE86Few+BeczJItzZn4EzgC9t8b0tlnWdK/4Q3ncDvFbwXrlZYbfX/dWCq9lqIJ6qbwvK3zys8hexY8R4qG+AuJ4bdPeiHvdDnE95Rv9SX2X3Tn5cYJ0a6ItqRjW//hFHKFapi/tjtOODNqlaCGD/3BL6ZK/JOxMCxyR7V+Id2U/lbq57SA/kZfB3oVHOW+Uz5hOAues0H4AG/2t+xt55eFvKt6aHv8n/CIPi02LTgDWhHGraj7bXpsLtTRvuIvJJE9eoA1+hmW3GyD6e8QW4H1Mg
+   eJyVVMsOgjAQLInHGuk/eVK/wMSjFxN/mAvEqwdIuILYTVsYl20rk5QWOrudfRSlHApjH8bNvV7WhHPp3mMgXqcXTpHgzv4UnAF8bovvTbmsKy34Q3jfNfAaxntrtcJuL/urGFeylUA8Ud8WmN88rPKXsAtI8VDfAHG9NujuWT3uhzSf8oz+ub6H3Tv5cYF1bqAvqhnV/PpHHLFYua7QH6MdH7TJ1YIB++eW0cd7jd+ZGEJMvHc5usR+Lndz3WN6IC+Dvwu1cN4qnymfAMxdK/kA1Phf8zP2ztPbUr4lPeEb/48EUHxSbBKwJpRDSfvR9tpUur1pw11EPmkKNWrBV2wONmNiH8/4ApiNVBw=
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
@@ -139,9 +138,9 @@
    eJxjYKAduCAwsPqxgY90MPODAHZ7cIkjy+MykxhwiQZ+w2U+LcIRBIiNc1L9+hao/h2SHkJxAVNDKYDZQ4xZhPyEzQxy4wE9rZGa9tDDkxxADTOQzcJlPi3KEVxuB4mR6i9c6tH9hGw2uh5kcWT1uMzCBQjpQbcDAH1rOsY=
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer name="Walkable" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJytVMkJACAMcwSXcv+VfPUjMUe1IIhtk1iJa46xyKpgNVWH+lgozqpB+wS705/w/MZDM0A8atZsrq4Wl7OL/6KPYaa6bnXsHPmjw5FEMjMnr/zn6GFYytOnFqXPuY/KO3hKD+tLg+F23uXmAfVGzn9/5jfZmCos
+   eJytVMERACAIaoSWav+VevXxhIDirk+KmKZrjrHIOWA+jMegcGsOKtAbfuN3TFSDTudW66Qnla9qpvFf8mMx3byQH7vv5iPRcODUTLGns1s1nH2g/is3N3ceFF/EZzwXLG7SFzQDzt5W7RvU/iqB
   </data>
  </layer>
  <objectgroup name="Mapevents" width="20" height="20">
@@ -164,6 +163,18 @@
     <property name="place" value="west"/>
    </properties>
   </object>
+  <object name="west2" type="mapchange" x="0" y="352" width="32" height="64">
+   <properties>
+    <property name="map" value="wild9"/>
+    <property name="place" value="east2"/>
+   </properties>
+  </object>
+  <object name="west3" type="mapchange" x="0" y="96" width="32" height="32">
+   <properties>
+    <property name="map" value="wild9"/>
+    <property name="place" value="east3"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup name="Spawn" width="20" height="20" visible="0">
   <object name="fallhaven_bandit" type="spawn" x="576" y="544" width="32" height="32">
diff --git a/AndorsTrail/res/xml/wild2.tmx b/AndorsTrail/res/xml/wild2.tmx
index 25f6ff2bb..ff892d186 100644
--- a/AndorsTrail/res/xml/wild2.tmx
+++ b/AndorsTrail/res/xml/wild2.tmx
@@ -1,151 +1,150 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJytlMENwyAMRRGHntt7VygZoc0IaVboqlkoEwRLtvJFHOxQDk9crMcHG1IMITFDZrntxEcI6/24Yg3W0poqvjOn5hPQlxSf5r7i0zJ6of1Kn5XRQvMRT6CHrzWz1H+YM1/tXrHvVDtmvsyrISP2nfadMz/mHY+ZhdFx7vIcEzsxszA3+MSJmQVPP/6ZX7w/7K9Vb81i2d9yfhHP3OBf4Z3nmg//nx4+nL9e+a6+XytfTx/2dwOm0Mw1
+   eJytlMENwyAMRRGHntt7VygZoc0IaVboqlkoEwRLtvJFHOxQDk9crMcHG1IMITFDZrntxEcI6/24Yg3W0poqvjOn5hPQlxSf5r7i0zJ6of1Kn5XRQvMRT6CHrzWz1H+YM1/tXrHvVDtmvsyrISPOEu07Z37MOx4zC6Pj3OU5JnZiZmFu8IkTMwuefvwzv3h/2F+r3prFsr/l/CKeucH+eue55sP/p4cP/51e+a6+XytfTx/2dwMrR8t9
   </data>
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJylVMGKwjAQTUVvLdizeNi9un/hrcWzIOh5Wdi737A/4MWv2mMvgkerBa+C4AzNmOeYmIIPSprJZOZl8jLGPKIcGrOnz+QmiCRv13msUud7HjqfQ9qOK7L9iv1FzDzTBptHYW5jzWisU/ADX98+zc+HH1ovLN9p5uGAc7DX6TPHStkwfgF5BDuo4zvgvJhn5+GBOEbWu+AQiME6avCOFPA+vgf+GFjbOfjf6xu49zXF2yavWLf492nC8hVNfvWMWQS0c1I59hGNCUrrN+k52x/FutK3SVzeLuD6LyleP3MxeW9fvSmZ87mY50K988bWlOsc0sVIcRrDvIyc/dJVa7b+ZaAPaW6iP6111A7/x/h1AZ9BtKf5MWfhoHsCA3nrN9MofqEeFgKe/YPu9zN75BfrfQwfZwHrxVe/GwIdPBg=
+   eJylVbFOw0AMdUrZEimZEQOs8BdsPTFXqkRnhMTON/ADLHxVR5ZKHdsSlRWpUm3V13MfvjTAk6LkfM577xzfhegYoSZa8EUNZVE0+3m5z8uUuylTzlKfp8z1XGuwg7OpMKA6gLFy3fN9VZo8k+u9h/48PDHnSP3eVY4HOzbxFfCKxw9HK/KPjE6EreN/ILpWZ35izesT832wzHBIH7X2G3Xg8dyP29qOTb0O9c3wvjDfe9GtKZjVThB66nZANPHyGJ+gscjkRd6IoHk3gxR7Za4tX29F0u0Dqf8D8w2rxCnvDmFPxbHsNfE5gX3eak2lzrm+uABPl2YcYO3Ye999e03rHzLnEHqL/Yd6tnfkGf39BbKG2Hvo73Ae0s8zQbB2zseIFvwJV/uLvWnXfsXf97o69vdV+54scvMb/ScEOE/OWGMHwSI/2w==
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYEAF4QIMVAXEmPeRBDtlmYhX+0EAYfYHPHakU9nPpLhxsJgPMvMSUlghxwk6n1iALVxxxQMx6YRYf4PMSiPSvcTEPS63YRMnxl5c5uHTiytu8JlHCkA2k9T0hSufkZNmQIDa+TEcLS1T0zxqAFq47xIV3YjLfaD4BQBl8x/j
+   eJxjYEAF4QIMZIOPWPQSYx42fbiALBPxaj8IIMxGZqODdAr8jA2Q4sbBYj7IzEs4wgpf2OED2ML1A5IYspnEpBNi/Q0yK41I9+KLe5hbcbkNmzgx9uIyD59eXHGDzzxSALKZpKYv9HyGzUxSALXzYzhaWqamedQAtHDfJSq6MRxP/AIAvdUk5w==
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20">
+ <layer name="Walkable" width="20" height="20" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzNklEKACAIQzuCl/L+V4r+JNC5VdDAr3SNp25jeKglt36h/qhOD+p94Zlpf2cYsWKYM/63PZWcGUelunmYfzJPNTvix/BEQvnRXHXj2ZzCT931yTx7M4rfj/lu86v8JmIcWac=
+   eJxzFWBgcEXCIOAqQD2MDIhRQ0gtLczEBdDlSQkjUgEl4Uotc2nlTkrCkZAbibGXGmaS4n9CYUdKeBITH8TYg0sfvrjB5wdy4oSStEOpOdR0H7X9OtjDD595ALwRWqY=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="20">
-  <object name="east" type="mapchange" x="608" y="160" width="32" height="64">
+ <objectgroup name="Mapevents" width="0" height="0">
+  <object name="east" type="mapchange" x="608" y="160" width="32" height="96">
    <properties>
     <property name="map" value="wild3"/>
     <property name="place" value="west"/>
@@ -169,16 +168,22 @@
     <property name="place" value="north"/>
    </properties>
   </object>
+  <object name="east2" type="mapchange" x="608" y="352" width="32" height="64">
+   <properties>
+    <property name="map" value="wild3"/>
+    <property name="place" value="west2"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="20">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="forestant" type="spawn" x="32" y="320" width="320" height="128">
    <properties>
     <property name="quantity" value="3"/>
    </properties>
   </object>
-  <object name="forestant" type="spawn" x="576" y="288" width="64" height="160"/>
+  <object name="forestant" type="spawn" x="512" y="320" width="128" height="96"/>
   <object name="forestsnake" type="spawn" x="416" y="32" width="192" height="96"/>
   <object name="forestsnake" type="spawn" x="384" y="224" width="160" height="160"/>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys" width="0" height="0" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild3.tmx b/AndorsTrail/res/xml/wild3.tmx
index 5aa2b2574..30743fa1d 100644
--- a/AndorsTrail/res/xml/wild3.tmx
+++ b/AndorsTrail/res/xml/wild3.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
@@ -131,20 +130,20 @@
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJydVDEOwjAMTCvUqRXpE0CCj3QDMTMxsoAYyw8Y4EW8g5EFqWJDDPQFJA1pHNcubS1FSRr7fI6vKaUQYSpEScyBmpdqriw13z/SrbVlidkHvz2HZf0tXorivDUwy8PmxPw2shlDWZVPOB6wpjpHT9tHjvc99ut4qf12TBFB/ghvIc04dKyLw6/5IdtJl4MaXN48MpyH3FNbTsyd7Qejj+ooMfy0NWJb4qBx/bCx1Dnm0Pzo643qxwjGdeA6VKsUH6hVWx/8Vwtp+BVtWvzDGfYzRzjHARqn6r8E3flgH+g7D936oe5jpvZPpu/UnVgN6PvU52vgc1ZvwTs2uNcemNBu6vwkfU76PV6BOA4D6lf7aCw7TxTvKXiPKa1DfWdg/QXMpUM0
+   eJydVL0OgjAQLsQwQSyPoIm+iJvG2cnRReOIb+CgT+RzMLqQEDfjIE9gj1p6LVcofElz/bn7+h13tOKMhSljFWEDYTfC1kjlfhHrOdgA2VPk5qr9meZLExTPrPkfwKd0qDttfXvOvAD3KX160+QaCuBTup+xmcdbrA9TSojlb/GtuRxnz7xc/I0+C0eu76CG694sojX7oOvOwLceRH80R4nUB2jFdsRhuOqhYvtyr/u5tWn2G1WPCY7z0Dq2Vyk9uFdVfvhfLbnUV3b1Yo9mXM/M4rmM6HEq/3vgr8f2wb7LUM/hnVuI9ctRd+qbqB6A7wnnO+RzE2/BJ5a8jwGcGLk4v3JT01estyjOxaHqC+cwcmRnQvccvce414vYzA2wQvMfFT9GIQ==
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYCAffBSgrXpaAVLc8UGAtu6mtfnUNLuMDZUPczs2PxDrL2r6H919pAJS3UKsenL9h27+ByzmIKu5hEZT4h5apclwAQiGAWLCEJcakDlpaObhAoTC5BKSOWlE+p2Qma0CxNlLij2PCKQHegMADbEtkg==
+   eJxjYCANfBTAziZV70ACUtzxQYC27qa1+dQEZWyoboW5HZsfiPUXNf0Pch8lgFS3EKueXP+hm/8BiznIai6h0ZS4h1ZpMlwAgmGAmDDEpQZkThqaebgAoTC5hGROGpF+J2RmqwBx9hKSR1bziEB6oDcAAGDrL3U=
   </data>
  </layer>
  <layer name="Walkable" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJytVMERACAIaoSWav+VevXxEhDlrkdlqGievdYB60G5y+yiPXqX2aicDCgnhwtpgd6w2FxETafQ0cnxEf2oulbrocTj4hdL199kPkxnpY+cukz9OTRzFI6MT4kRnbMernCy3Nhe4evMwQt85Sx/
+   eJytVEkOACEM8gl+yv9/aU6TGFKBLiQ9uIRSWj17rUPiB7vjBuLej+5UOBlUTVkwn1wNeNYFejqFqkcOL+Zgs6D0ZfuhtHVqjrR0803Wo3x25qjSl6k3F/FlPXT+uxeHq6/DqWpTa4cvw4/4AAjbLn0=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="20">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="sign_wild3" type="sign" x="224" y="128" width="32" height="32"/>
   <object name="north" type="mapchange" x="256" y="0" width="64" height="32">
    <properties>
@@ -152,7 +151,7 @@
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="west" type="mapchange" x="0" y="160" width="32" height="64">
+  <object name="west" type="mapchange" x="0" y="160" width="32" height="96">
    <properties>
     <property name="map" value="wild2"/>
     <property name="place" value="east"/>
@@ -171,15 +170,39 @@
    </properties>
   </object>
   <object name="sign_wild3_grave" type="sign" x="288" y="576" width="32" height="32"/>
+  <object name="west2" type="mapchange" x="0" y="352" width="32" height="64">
+   <properties>
+    <property name="map" value="wild2"/>
+    <property name="place" value="east2"/>
+   </properties>
+  </object>
+  <object name="south1" type="mapchange" x="288" y="608" width="96" height="32">
+   <properties>
+    <property name="map" value="wild5"/>
+    <property name="place" value="northeast"/>
+   </properties>
+  </object>
+  <object name="south2" type="mapchange" x="416" y="608" width="224" height="32">
+   <properties>
+    <property name="map" value="gapfiller2"/>
+    <property name="place" value="north1"/>
+   </properties>
+  </object>
+  <object name="east2" type="mapchange" x="608" y="352" width="32" height="256">
+   <properties>
+    <property name="map" value="gapfiller4"/>
+    <property name="place" value="west2"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="20" visible="0">
+ <objectgroup name="Spawn" width="0" height="0">
   <object name="Jan" type="spawn" x="192" y="416" width="32" height="32"/>
-  <object name="forestwasp" type="spawn" x="352" y="512" width="288" height="128">
+  <object name="forestwasp" type="spawn" x="352" y="512" width="256" height="96">
    <properties>
     <property name="quantity" value="5"/>
    </properties>
   </object>
-  <object name="forestdog" type="spawn" x="288" y="288" width="352" height="224">
+  <object name="forestdog" type="spawn" x="288" y="288" width="320" height="224">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
@@ -191,5 +214,5 @@
   </object>
   <object name="forestant" type="spawn" x="32" y="224" width="224" height="128"/>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys" width="0" height="0" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild4.tmx b/AndorsTrail/res/xml/wild4.tmx
index 3d95fa6ff..74d8b3829 100644
--- a/AndorsTrail/res/xml/wild4.tmx
+++ b/AndorsTrail/res/xml/wild4.tmx
@@ -1,150 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="20" height="15" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="30" height="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="15">
+ <layer name="Ground" width="30" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjEmRg+CTAwMCERh9lg2B0PjrGppeQHlLMItUMbJiaZpGNeXFgLG4lxryrvNgxtjAlxjx/QeyYXP/GC2LH9AhrasY1tdMNtvglNs6xuQ2WV6jlNmLzO7Xch5zfCZkFUgMAtpbfzg==
+   eJy1VdsJgDAMLP3wr2AncwSndQQXcQIREUK4PG0/jtCP5u6SNK29lGstpbJ4LC/4mQPdlSLPaeWOcEp6nzO9F+VCkHRzLqpxBK9HU7q2TUBSi9fz2TC03NpceD1vHcOauagmjr1jePqKNM2aJ21+v/7O4EdznOnvX788ovpn33VkN47cH1ZtuV+N29JFPUX+Bmt3eXeqp7Y0xw1s8T9G
   </data>
  </layer>
- <layer name="Objects" width="20" height="15">
+ <layer name="Objects" width="30" height="15">
   <data encoding="base64" compression="zlib">
-   eJyVUzEOwjAMdARsrdT0M3ygE/9g5B0IPlDxLSQY2EBMRSCVkQmnjYsxdltOapM69t05SQF0OI8vL76hjTmvVdgcX/l/1EuOIsVp+pujxTod0cMia59VZuQjrsmA1xjv8iKmmo8RqBKjB4X3En1v3Ce2ZfOb8BSgngPTJqxnADvkOueok5M4wJL2KnJYfsnnHGtK5CmRb4+1NXI9I9+d6RVGz9Qj9UK8YWzWkP81Yb4UWHfsgDVHVkf987NsNNh+hVHbV82zhYdVz3xWAxp9d0Ryav2fEnsNRIznjNbt0Q6Q/4vU1Djkvr0B1RomFQ==
+   eJylVUFOwzAQ3Ij2lkhxxQfgCyDxgZ74B8e+oyofqPgWEhy4IKqeWjVSOXJi02bd6XYcBzFSInuz3pld2xsRjiLoK5zPr6ujrR3f6Pi2IgsDsSVienuB3/w8A6bX5k3JuaaqP5AcmC3qcRx36ntfnez7WmRG1j/Wx2dWJ+Iq1uWljfke/NCnp06oZcTyGoBNyWvSoA5SHw/kX3V1WBQn2zOMt7BnES72hvlI4jyRNfOxyItyfk1Uz8REijzZHnUxPhM8Afa99UvVyfJ+0NhL5Vsq76ty7JXzu+PdAUd7Lg/1Ifp9XXZEm9XWfI1/ZHFVx88V5DkQU8jXkLqjbxr7HeJb3deg13JsY2zLy9gpRP8erDK5NZn1WYDW1DmMrgPuXe7ueG5W9w/fF9wahti/htD+sX/8p3+bDf85/jv2Xrzzvv/21dbuzy9/OTPt
   </data>
  </layer>
- <layer name="Above" width="20" height="15">
+ <layer name="Above" width="30" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYCAffBCgQDOFZoHUfxQgLEYtcAmHuYTsA+n7yopb/hsWOZCZ+PwiyobbPDEkOWrETzgRZuAKGxh4x8jAMJ0Rwk7DohafX48CxY8REcYwM4j1MyE34wKUpDGY27Dpx2UmLvvQ/UmqfmLlcdmJrAdXXiTGfcSoQTYLAJHrL7g=
+   eJytU7kNgDAMTAqoaWA1NmAlJoIBMggKBdQQoUiR8ZfHVeSz7xznYkx5+OGfO5Fcy8A0pQgzSX0Bh7NjOW1fq3CVXNL8gf/qaPxGMM1eojZXO/Z075RgkAPja7XzGfA44J0cf0tvd1hjVvudF+U+Y8SZpB1vb35XeCDlaPmva/0btan31XqR69V6B9OhtKm5PLPjXG1Oh8Jhreb+qS9gPfQkxEvvqwluJzkcof4BVExPqg==
   </data>
  </layer>
- <layer name="Walkable" width="20" height="15" visible="0">
+ <layer name="Walkable" width="30" height="15" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcCUSgwAyG5lPjF5s+pEBsWYQA0g1A5s8Lj20dA8hc9HjgRjzSPE/uXGHzSxc5hKjnxh3EmM/KXLY7KCGm/GpIyctoeslxUxi0wm54Ycr7gm5n1A6g4kBAGDRKNg=
+   eJxzFWBgcB1EGAbQ+ciA2nYRA2hlFzZ5XHqQxbGxKfEnuXrJtZeQ2/HZRYpbKHE3MeaRE1bEmE2K3djEifE3MW4lJ0zwuQ2fW0iJD0KAFvmbVP9RYhe5dhOTTimxm1j/ExOvgwkDAD4UVlU=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="15">
+ <objectgroup name="Mapevents" width="30" height="15" visible="0">
   <object name="west" type="mapchange" x="0" y="96" width="32" height="32">
    <properties>
     <property name="map" value="wild1"/>
@@ -158,7 +157,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="15">
+ <objectgroup name="Spawn" width="30" height="15" visible="0">
   <object name="fox1" type="spawn" x="64" y="96" width="192" height="160">
    <properties>
     <property name="quantity" value="2"/>
@@ -175,6 +174,11 @@
     <property name="quantity" value="4"/>
    </properties>
   </object>
+  <object name="forestwasp" type="spawn" x="704" y="64" width="224" height="288">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="15"/>
+ <objectgroup name="Keys" width="30" height="15" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild5.tmx b/AndorsTrail/res/xml/wild5.tmx
index 80948d82d..b6772799f 100644
--- a/AndorsTrail/res/xml/wild5.tmx
+++ b/AndorsTrail/res/xml/wild5.tmx
@@ -1,150 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="26" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="20">
+ <layer name="Ground" width="26" height="20">
   <data encoding="base64" compression="zlib">
-   eJzTY2Jg0EPD+kB8lA0VMwkyMHwSwBRHV4NuFgg7YjEPZBZIPT7zQBib24LJdB8u8wjpGUjzsIUduebhCjtKzKPELFqbR2nYIZtHjbBDN49SsygxD1f+I9c8XPmPEv9S032DPT5wxQ855qGHG8wsEE0N98HMAtEAb8UGPQ==
+   eJzTY2Jg0EPD+kB8lA0VMwkyMHwSwBQnFqPbAcKOWOwB2QGyi1hz0dVi80swFfyDrpaYMCMVY/M7te2B2UHIP9jihhQMswOff3DFDbl24bOHUjuIiR9q2YMcdjCamnGDzy5qxw22dIfsH2qFGTH+oTSu8aU7cu0htRyiJNxIKVdpFT9D3R5C6YIce9DNw1VGU9s/uMpoZAwAhcxdVQ==
   </data>
  </layer>
- <layer name="Objects" width="20" height="20">
+ <layer name="Objects" width="26" height="20">
   <data encoding="base64" compression="zlib">
-   eJyVVDEOgzAMNBVjkJp/dO8j+oNKfLojA0iMUFWdmVpDDE7imOQkRAKO7TsfACRgAar/9bhua0Jl/fedOfYa6ma7r/lycZJzMkp/DL2Jn3HcLgCzi2mpP3vk+pj4mYaXy/Es4DorPY4uD2mHe43TlDkT0o44LYU8EagdnsOabQbf4aTGN8hB/iJ9JsZ7DGLDPa9DsxgE3cibucD4Ih+Dm1fAF7UjeNqd6C/yzESX8o1Q0/Ox9D2wswSKuddxCe5jnOOS6OUtaIWxEu/B+LOYE/5Y+wk4pr65VvFKKUr+AYhIWwach+a7RdBNw+jy0TnUpmdrRNX4+33t7j/IQTUn
+   eJyVVcEOgjAMLepxJPIfXvTiR/gHJvy0Rw+S7AiGeN5JKq2U0o3xkgXdxttb+1oAIqgAimHcjuNvBs593LTuh/XGjU+cP5cAl2HshxFcjHzCoRyfv3NyQWdLXTlonX0fjZfQ3bv0XonTDqCj/TXfp5re+3NVaS7e94rE70Hc9w0x6wyutft44ufc4P+YJkQr7qeR4wXODesKOfFaySUDc4N8qLHOiFujzm4M/b0x91HcT9rD8W/FO17t9cqbSZAu9oClj2srxZED5NlUn0A+qUS/SABzw5jlZqVOdPy29gMLz5hW0tIbHtcaZ/Vp1b/g1BzXwzTnjR4iIesTfRWrsbeDRWyCW8avNzzKaNzcA13Exz/9Sq/Ve1KoE57OgYxDrF9t6Z0Iq9b1vI4/+iBVN8HIi4bOu6XD0zlB1JysP1wvSpjnRXxD5dMLz2L8v/GATjE=
   </data>
  </layer>
- <layer name="Above" width="20" height="20">
+ <layer name="Above" width="26" height="20">
   <data encoding="base64" compression="zlib">
-   eJy1VMkNwCAMY4RuxwYduJPQDSoeSJHlNA6HX0gBO3aAUjjq5RQmYfmaWb8TOp3rFs51HYX/pNeOR+Rvzj7MDj2pPgeXkh3rjWlkssMcWC414UXBymxxHl52Uf7e/DO9oQbTjO6JrQ389b36LtB3xMdyOtnfTr5oHplz2X+Acdiahx35fdOeMcw=
+   eJy9VdsNwCAIdAS3c4MO7CR2g7YfpoTyOCDp/UgicDy1NRmjKxcG1m1z9vdEQHkWkVF7RPfhOAB/WtwrkUsUkdw5zwR50TwkHqk2aJ8tHbQ3HJEZ2zwoeD1n//ZH4x/BuLKozhoSo9Ybz57Xz5u7SC6cu/LWaHbeLnr7VukN4h/lkfxkZrOazx882TmI+Iv+T9q8bXkK/viuUF3rzbF4rDvpz6byBUM7VoQ=
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20">
+ <layer name="Walkable" width="26" height="20">
   <data encoding="base64" compression="zlib">
-   eJy1lFEKACEIRDtCl+r+V1r2I4jI8Y3tDvhj8hrSHL21IeKVyk0pxlq31ytRXnYXYRJ/5G7i4dYf5Ttvl+UU01E0UxUe7cU+p67fL/oa+VN1inNiVrwob6dzxVI7o9Jb8s9v3ynbAa7+nBXCdHZU1F9yNuMBXy83yQ==
+   eJy1lFEOgCAMQzmCl+L+VzJ+mBgyu9eiS0wQyrrCyjzGmOK7Qq13e+8gmCdOxS5PV4Pi/EJPgk1qVjoSPe5ZUT3VejeX6HFC9b6jh3CoXNRjSU+4Hv4jP7lbld/hS2rv/sm9OL27jqu5tNccP1d1KezbPlpXhd/tP8qT5CE8hIu8KQ4P9Rr15QlTmE2z
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="20">
+ <objectgroup name="Mapevents" width="0" height="0">
   <object name="north" type="mapchange" x="256" y="0" width="32" height="32">
    <properties>
     <property name="map" value="wild2"/>
@@ -157,14 +156,38 @@
     <property name="place" value="north"/>
    </properties>
   </object>
+  <object name="northeast" type="mapchange" x="736" y="0" width="96" height="32">
+   <properties>
+    <property name="map" value="wild3"/>
+    <property name="place" value="south1"/>
+   </properties>
+  </object>
+  <object name="south2" type="mapchange" x="480" y="608" width="32" height="32">
+   <properties>
+    <property name="map" value="wild6"/>
+    <property name="place" value="north2"/>
+   </properties>
+  </object>
+  <object name="east1" type="mapchange" x="800" y="32" width="32" height="224">
+   <properties>
+    <property name="map" value="gapfiller2"/>
+    <property name="place" value="west1"/>
+   </properties>
+  </object>
+  <object name="east2" type="mapchange" x="800" y="416" width="32" height="192">
+   <properties>
+    <property name="map" value="gapfiller2"/>
+    <property name="place" value="west2"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="20">
+ <objectgroup name="Spawn" width="0" height="0" visible="0">
   <object name="forestsnake" type="spawn" x="192" y="96" width="224" height="160">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="fox2" type="spawn" x="352" y="64" width="256" height="288">
+  <object name="fox2" type="spawn" x="352" y="64" width="352" height="288">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
@@ -174,11 +197,16 @@
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="forestboar2" type="spawn" x="288" y="320" width="320" height="288">
+  <object name="forestboar2" type="spawn" x="288" y="320" width="480" height="256">
+   <properties>
+    <property name="quantity" value="3"/>
+   </properties>
+  </object>
+  <object name="forestwasp2" type="spawn" x="736" y="32" width="64" height="224">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys" width="0" height="0" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild6.tmx b/AndorsTrail/res/xml/wild6.tmx
index 74905c963..6945e682b 100644
--- a/AndorsTrail/res/xml/wild6.tmx
+++ b/AndorsTrail/res/xml/wild6.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="30" height="30" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
@@ -131,17 +130,17 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytVj1PAkEQXT5sDEYgdkr8AdL7B6wk1iYklDQm/g7/nBUlMaC0REDpLuF0R3e4xzA3tye+5KLs7u1782Zm95zLx6jpXM8/44b/0XKu0goT8H+qzEnQ3EKuMzALvKVRtHcEN/Emjd0x1LwWc7j3zzqI8TKsfT62OacNEW+kTxpYO+XspYCXgLypiO3mJNODmBm5uajvr0d0qxlvrpeIA7xAsC9/qitLS6Q+5J2JXEuMDV+oVmJ8GwWOAXBNwntY3//hLULGFuPXxr+T+uc81Eanul+L/K6FfuCextRVAHMiiH8Fe2z7QABrWYJj1LRc1/P1dMKeVo+xnp2zyqhD8vfrkLoPWDUz3lWOx1y7XKOc20M5KTbNZ7VOAFdKfgldHNd8Az8HkfrnQQt7I7mJc27o7SpaNf9Yl+Xta6Rm5qS8Ua32tff+cAYnIv9noodWgqfsubyJWK/2rYiDea1+o7lJiTOFedizbV5hzIpX6y3yb1Fx7q3t9fjn6eh3PKk5N2zq+t/FWALfGcPTLDdF90nqeT8852c7G7POMN63Dv5zDz34v7fK8wha8X6imryr2fpivuuKkKdLaiNshF/3ML+GHqKzifpQ9nze/Y55wP7VtCF4bV5NcT7K3IvyG9gC8/I9sxT3TdFvglbz7BPq5u8armWOfRlilBqK/lqaENRffNf0mvvvkH6Lq6w2BsbeK9hD42BfY9d/A4CixPE=
+   eJylVj1PAkEQXQQbA/EgdkqMttL7B6wk1iYkljYm/g7/nBUlMaC0REHpLgHdgR3vMTc3d6svudzX7r03b2Z2z7liDBPn+v4YNf1N27maPyZwfdZy7ryV3W/Qzn+H3i1g3ubawDTwRkPhjnrvtryp0FeDecsi7ewBeHEaxj4f2Jzk6U687V3OGLB2ytlLCS8BedcitqtWpgcxNXJz0siPR/T2Mt5CLxERXljfY1/+VFeWlor6kHcqci0xMuKgWqH+WTb1uYxh4LgDrnH4LtZ3dJ2VxCtjq+LXys9Z++M41EZ3L1+LPNfCIHBPqtRVAHMiiB/XqN8+EMBaluAYNS2XjWI93fBNq8dYz85aZeSF/P1O4nzRsEgy3qI1nGuXe5Fz+19Oik3zWa0TwIWSX0IPn2u+gZ93FfXPghb2RnIT5wz0ynz0FK2af6zL8vbV0IzvmJPyRnoG2rw/7EepyP+R6KGF4Ildl1cVxqt9K+JgXqvf6N04tnfAs9+8wjMrXq23yL+PmnNvHa/HH0/72+dp3bn7RN9T3gVHCv8Z94dZbsr24bXn/fScX53sWW4Na+frsgH+cw89+PO1cjyC1lT0yE3d1lflv64MRbqkNsJK+HUL75fQQ7Q2Ua/NxPii/R3zgD2qaUPw2KKa4nzErP/yH9gC8/I+Mw9nRtk9Qat59gl1838N1zLHPg8xSg1lZ0sT5oP6i/eafpKfQ/otrlhtDIy9X/INjYN9rTr+B9iBzFU=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9VUsKwjAQrUK7U0TQnRsvlRvokbyWeI+KCrrWUoLTcX7JJL5NTZvkvbx5GZuGR1gJHx24KftSvMOae6Ke1PmYV9NZClafsQcXZZ2kf+A8VPaT4/WCyoKWD4oX+peTLwus5y3NHZSzUdnoP++uBh1arv4NLsslairdMa5PcbD6qyHXY437aOgXNXIaa0d5VytPUu+j8oRrB7Ml1fVs1G/px57/I06j19+472ORti4wWZLuG/z2bMfnejmd82qnY1gn6HFujjfd+Nwj3m33qzFC89jTF6S9Q6F+E3GafX9z/VbTVBMSr/Ue5qzbzW1zS/V/CKpnRx7Mp41TgL2mzh41aOMUTVSNe4enkib4HvNK5yoJ711K1fYGEOFunw==
+   eJy9VksOgkAMRRPYaYyJ7tx4KW6gR/Jaxntg0ETXSsiEUvuZ0uLb4DDTea9vOsWi4FFvhEkHWmVfireLeRj1WNdjXk1nFHJ9xh7clDhJf8d5mtlPjtcLqha0+qB4oX9T6gvGWngpWLkt+XJ+YTTfd/cMHRH5RoKrZc+ZJkh3jOtTHHL91TDVY437nNEvInoAtW8Hyru56knqfVQ94bODtSWd61XggXM5/djzPeI0ev1N+z5XtriaqSXpvsG5V9k/t+vxmnc5HsNzgh5PreNd1T+PiHdf/WpsAa8ET1+g/rPAfCP6TcJlMfzm+i2l6V+QeKV7KCEn7rDMWxvV/yGonp14MJ82tgB7TeWeNGhjiybqjBuHp5Im+B7zSnlFwnuXrNo+i291gQ==
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9lEEOgDAIBH2Cn/L/X/JkYkzZnUWUpAdtyyxQOPZtO8S67P5N9lZ+FKfiJuZ8dJirWCk7iVsxuzaVY5oDwqR+KjY9P/GeiJbum1I+Ew1v6jvZa25mkH+0F0n/TMahzimflRbyZtTscMyU14nX5Vjp73D/eKeTzMqv01ftr75dzZ1GWtOJ/CvuG7+0XiTP6q5jEx6NO+1jpdFxOuforJkwmq8pXmquhxJd6Xytal+dncgRrT2Zt8+7RH91z7G7mpIe/2r9yTwB52OC0w==
+   eJy9lMsNwzAMQzNClsr+K/UUoAhs8pFVKsAHA7RIU5/rPI5LnDsU5htLcDRXGi5Hw7nygXInnijONqY8ph4QTppnx02wU/1EtLQ9pXISDRMz1HiT1pf0djqLZH4m/kNwKudOC/FP7Q7HmfI1/3UeK/0NbzvDSZ9Ocu7yOm07/au7q7nSl9R0wv8V9y+R1ov4rN46bsJH/53O8fMN9bjFtb3cBPVrii8NN0OJrnS/rmqvsBMeuZ2T7NvnW6Kf9F1ynKZkxt86/+T8APDTh84=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -170,6 +169,24 @@
    </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">
+   <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">
+   <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">
+   <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"/>
  </objectgroup>
  <objectgroup name="Spawn" width="30" height="30" visible="0">
diff --git a/AndorsTrail/res/xml/wild8.tmx b/AndorsTrail/res/xml/wild8.tmx
index 3470828af..9f7fb503c 100644
--- a/AndorsTrail/res/xml/wild8.tmx
+++ b/AndorsTrail/res/xml/wild8.tmx
@@ -1,128 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="20" height="15">
   <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
  </layer>
  <layer name="Objects" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJzNkkEOwiAQRcF0iUkP4jFceRQTz+PhXLRrmwjrVlqZhAk/40Bd+pNJIcyb+Uwx5j91t/s5LyUHudPBGHv8vd9qC0fqgB37sr6m9SUHs8yQZmfM5Mr+4b45ihvUDK6wKMlIjoS9kI8VZhQ86y16s2+f8rcUA5w/Yd2JGQ+iDirmWlxzU7zwLCh3TbG4tm+f82JfGKlJ8cS+kYngKSj/kMVzbr2vRczPi/vGyv2lZ5w13lWrifvzztvn3FDxKXtpPeYGq31J9D5a5/Ju+P0AgWFszg==
+   eJzNkkEKgzAQRWNxmYIH6TG66lEKPU8P50LXCo1rbbQZcMjnN4ld9sOQhMyb+RlizH/qWR3nvBI5yF1OxlTn3/utVeRENbB9E/f3sL/toawyotkaM9p4bu03J/GAmpONLIoZ5kTYC3mfYXriVW/qrb5dyN9CdHA/wL6mGXdUB+X3WlpzS3jRWUjuGmKxZd9uz/NNZFhjwpP6RsaDJ/GhXlridc6l/7XQ/By912fez55x1vjWVE08Xw/+vuZOGZ/cK9VjLrCpVST/o3TPb8P1Awszbco=
   </data>
  </layer>
  <layer name="Above" width="20" height="15">
@@ -141,10 +140,10 @@
  </layer>
  <layer name="Walkable" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB3GGB1Qog8bwKeHFECpflLMJNUuUv2ITx0pYY0uT0wckBMXyHooMYeQ+dj8Q0lcUGomuXkJmx3UzK/45AGBmDHP
+   eJxzFWBgcB3GGB1Qog8bwKeHFECpflLMJNUuUv2ITx0pYY0uT0wckBMXyHooNYsY92Gzl1yzKDGT3LyEzQ5q5ld88gAGZzIk
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="15" visible="0">
+ <objectgroup name="Mapevents" width="20" height="15">
   <object name="east" type="mapchange" x="608" y="64" width="32" height="96">
    <properties>
     <property name="map" value="wild7"/>
diff --git a/AndorsTrail/res/xml/wild9.tmx b/AndorsTrail/res/xml/wild9.tmx
index ac3a7c2d2..8936ab1eb 100644
--- a/AndorsTrail/res/xml/wild9.tmx
+++ b/AndorsTrail/res/xml/wild9.tmx
@@ -1,180 +1,232 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="30" height="15" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="30" height="24" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="30" height="15">
+ <layer name="Ground" width="30" height="24">
   <data encoding="base64" compression="zlib">
-   eJz7JMDAwCTIwPAJSh9lw8TI8iAamxpi1RFrFrp6aqjD5b/hgPHFHy0xobQzikfxKB7Fgx0DAOoIXWo=
+   eJw7ysbAcBQHZhJkYPgkQJjGpR/ZDGQxmF5S9BFjFyFMrBnIbiPHTkJ+o4YbqeVWfO7GFt/ocYgtLskJY2LsJpT2iAl3QmZgEyeU3on1L74wIyeMCYUhse4nRR2yHCn+poY6SvLVYMfElIm0wJTkYVq5Z6DCf6DTwCgexaN4aGEAkpUfNA==
   </data>
  </layer>
- <layer name="Objects" width="30" height="15">
+ <layer name="Objects" width="30" height="24">
   <data encoding="base64" compression="zlib">
-   eJytVEEKg0AMtOBxC/Y1/UOfUuiHLdUHCFXoTbQ2AYNxNnFt6cCymJ1MZmM0yxI4xaEDxZ5hOednj7dHSzRewedrLc3rg88zteZaFdaaMcC9zrmjR6jDwvNQgr/ojPAo/Pxfgb28O/dFCG8kTxOtltYb/DWqRyaMnoheiidcXZP7UxnvXM+OB85DPYmnIL0oDW6jY1B/MPg9aOXHtVY0+4YPC3j3rVnyalwp5/LlEuh77NW6OR7Rew9++Xvbq+XBmmcGvuNWzX80typHPNYqvwEtmb9qg8MzgzXbIu3Dilvz50H6Map9Mnzof8HonKe8WXzpWxfs+8rOvM7p0T/2DxIhjnw=
+   eJy1VUFqwzAQVCBHF5zX9A95SqAftqlz7MFgH3IzcVNtmyXj0a6kQDogZEm7q9FqVv5qQwiHEHax7d/CL/rmb64WO7W9x8E+sakB+xljjHdpHt+dft9tehhbXKYm9eM1tdf8dLAfYjLyNjRbvoPju5Av52shv4HsR+KKfC0ka+BXuv+zcwbkOZJNj2Mjxx6XElB7COuOLg5vT5usPZzn8wnMsxjcSusSp8/kmLk8E1t9JqoTz25Ta0bNoU2SX0fPaOfpnvUegIPYeHV0pXO97207wRlq09NGl6kF1dhn6+/xKtTqQe3WyOkW2xzbN/EbIUc54J1pvA0Otv5W2lPyMxh3ntOXQvw4ns6XoLmw3gKsX70/5XE17BeKhe+nxPL0gzwscP5yWvL2OEWf45NNwf+BmlgfDkfmzjUs9VYby4OlZwHf8Qz6T3QLPsoR/2n8tqv+hoyNaIb3nNsyD2ve0p8HzccK/c3ggW/B6qyXuNXYW3vmYryq/4+YNf0PGU7KQw==
   </data>
  </layer>
- <layer name="Above" width="30" height="15">
+ <layer name="Above" width="30" height="24">
   <data encoding="base64" compression="zlib">
-   eJxjYEAFHwUYRiw4SwW/fxCgbhi+BZr1TgBB47ITBpDtxuYWbOYQ62ZC4UOMGbj8QA3wYQDTLrrfqZGWBgrQw+340jM2dcSqJ2QWueoIuYNS9xHrNmQ3IOshxW3Y9FMDEHIbserxmU0rAAAfEz0I
+   eJzdlNENgCAMRB2B/XdiFA1soHwQSdPSkxZIvB8+bO9eGzCHY6lSk5cnZpcci3/pTWA/l+U1W/WmJ8Kq8Y9wS1m1D90Z52XdGTKv5Xuvp50fnUOqQ3dMz56nt0Z2NVvRgcn636A6H68rvKeUWUWzKQ/ngzJr+0HesDSDhyJ5SzvlcZd2aQV77z5zdWi95jVap3FY+VC2lqHt+cLG9XtIY0Pre95/0w0uWGn6
   </data>
  </layer>
- <layer name="Walkable" width="30" height="15" visible="0">
+ <layer name="Walkable" width="30" height="24">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcEXDyABdDl0NLnlSzCJWPbI4MepIVYNLPSVqsLmXVHliAL54ocQ8csIUX1wSEsPlF2LsJuROWgFqmE9JPBFrDi3DgBpgIPIJIXWkqKe2nYTKR1LMpsROYjEht1HTLmpjAFHRNx8=
+   eJzdVUEOwCAI8wl+iv9/aZctWcyAlmK2rAk3aFGK2hzDzrjDJhdIzcrtgdG88j0Oj5PVRhHdJVrL5rM6DBc655VL6VvxHqKLeBP1HnPebk1vJru0lR6jfUV8X92NKBflROarQtndiK96p9mORj1n8/a0Ub5uML6KODrqFB++jS/tSeW96NbM3keGW9Gs/C9PvXVq/SUOUOlr6g==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="15">
-  <object name="west" type="mapchange" x="2" y="292" width="32" height="96">
+ <objectgroup name="Mapevents" width="30" height="24" visible="0">
+  <object name="west" type="mapchange" x="2" y="548" width="32" height="96">
    <properties>
     <property name="map" value="wild6"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="928" y="224" width="32" height="64">
+  <object name="east" type="mapchange" x="928" y="480" width="32" height="64">
    <properties>
     <property name="map" value="wild10"/>
     <property name="place" value="west"/>
    </properties>
   </object>
+  <object name="north3" type="mapchange" x="864" y="0" width="64" height="32">
+   <properties>
+    <property name="map" value="fallhaven_sw"/>
+    <property name="place" value="south2"/>
+   </properties>
+  </object>
+  <object name="west2" type="mapchange" x="0" y="352" width="32" height="64">
+   <properties>
+    <property name="map" value="wild6"/>
+    <property name="place" value="east2"/>
+   </properties>
+  </object>
+  <object name="west3" type="mapchange" x="0" y="128" width="32" height="128">
+   <properties>
+    <property name="map" value="wild6"/>
+    <property name="place" value="east3"/>
+   </properties>
+  </object>
+  <object name="east2" type="mapchange" x="928" y="352" width="32" height="64">
+   <properties>
+    <property name="map" value="wild10"/>
+    <property name="place" value="west2"/>
+   </properties>
+  </object>
+  <object name="east3" type="mapchange" x="928" y="96" width="32" height="32">
+   <properties>
+    <property name="map" value="wild10"/>
+    <property name="place" value="west3"/>
+   </properties>
+  </object>
+  <object name="north2" type="mapchange" x="576" y="0" width="32" height="32">
+   <properties>
+    <property name="map" value="gapfiller2"/>
+    <property name="place" value="south2"/>
+   </properties>
+  </object>
+  <object name="north1" type="mapchange" x="96" y="0" width="96" height="32">
+   <properties>
+    <property name="map" value="gapfiller2"/>
+    <property name="place" value="south1"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="15" visible="0">
-  <object name="bandit1" type="spawn" x="64" y="256" width="832" height="96"/>
-  <object name="fallhaven_bandit" type="spawn" x="416" y="32" width="32" height="32">
+ <objectgroup name="Spawn" width="30" height="24" visible="0">
+  <object name="bandit1" type="spawn" x="64" y="512" width="832" height="96"/>
+  <object name="fallhaven_bandit" type="spawn" x="416" y="288" width="32" height="32">
    <properties>
     <property name="respawn" value="false"/>
    </properties>
   </object>
-  <object name="forestwasp2" type="spawn" x="160" y="96" width="736" height="352">
+  <object name="forestwasp2" type="spawn" x="160" y="352" width="736" height="352">
    <properties>
     <property name="quantity" value="3"/>
    </properties>
   </object>
-  <object name="forestwolf1" type="spawn" x="128" y="64" width="736" height="352">
+  <object name="forestwolf1" type="spawn" x="128" y="320" width="736" height="352">
    <properties>
     <property name="quantity" value="3"/>
    </properties>
   </object>
+  <object name="forestwolf1" type="spawn" x="416" y="32" width="352" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
+  <object name="forestant" type="spawn" x="800" y="64" width="96" height="224"/>
+  <object name="forestwasp2" type="spawn" x="64" y="64" width="256" height="224">
+   <properties>
+    <property name="quantity" value="2"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="30" height="15"/>
+ <objectgroup name="Keys" width="30" height="24"/>
 </map>
diff --git a/AndorsTrail/res/xml/woodcave0.tmx b/AndorsTrail/res/xml/woodcave0.tmx
index 196baa8af..c138924ed 100644
--- a/AndorsTrail/res/xml/woodcave0.tmx
+++ b/AndorsTrail/res/xml/woodcave0.tmx
@@ -1,165 +1,172 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
-<map version="1.0" orientation="orthogonal" width="15" height="10" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="8" height="19" tilewidth="32" tileheight="32">
+ <properties>
+  <property name="outside" value="1"/>
+ </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="15" height="10">
+ <layer name="Ground" width="8" height="19">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcBSIPwkwMDAJYtJH8cjDxGFqkMWR+ejiyPLI5iPL4dOHzT2E9OHyHyF78PkLl3p0e/HxCbkPn7nk+AebPC57cZmHz10weQDB0Gcb
+   eJw7ysbAwCTIwHCUDYI/CSDY2MSQ1YLYIDl0/ch8dLXo4vjspQRjcxs5bkL3Lz796GYNNv2U+h+beTAxdBomDwDdlGu5
   </data>
  </layer>
- <layer name="Objects" width="15" height="10">
+ <layer name="Objects" width="8" height="19">
   <data encoding="base64" compression="zlib">
-   eJydUUkOgDAIxDuH8v+fdUn0B/oD20QCUkqMcyCFDswQCgKcCX6B+zbqgaRuc1uP/pvjh+tWV+NKfl/BmbvCy19HRQj30vz86GifFYW39/ehcu2rBR7HXhlFZ8z8uhPz2ZvtW92Bdb15E5/8u944fxqs
+   eJyVUUEOgCAMm/eZwBP0cf6XK2iivsShILABxl5YurXrAmgQGIjbUHIQZpcx1V3oUpf7+NcogJ32HJh6juqJ/Oeww2KaX/Hp5/CcDZyLXq1sMQ9UMnVwqoon0/vMudetacz39n/pX55pjJJePH/R+3F/FdyPIf7hBf5wFHA=
   </data>
  </layer>
- <layer name="Above" width="15" height="10">
+ <layer name="Above" width="8" height="19">
   <data encoding="base64" compression="zlib">
-   eJxjYMAPPgowMHwQIKCIAkCK+SB1H8lwCy3dj24PzD/Y/IWNT074kqIen3soAYTiAQAAABYK
+   eJydUFsKACAI2xG6/7E8Sd0gIgwZq6x9ieylwEQrQC1YGDPvELhqF7mKw3C+yrjpPK+Jzpm+EbbxUnqfjTz5hl+9iZ8oveqfyT8h/oD1r36u6d7pLoA=
   </data>
  </layer>
- <layer name="Walkable" width="15" height="10">
+ <layer name="Walkable" width="8" height="19">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcB0CGBmQo49c+8hxHzFuJVYdTC213EWv+AIA26op1w==
+   eJxzFWBgcB1EGARw8YkBuMxENweXGlLNIsYP1NRPrDyp7sfnf2LCDxcGAP7CJds=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="15" height="10">
-  <object name="west" type="mapchange" x="0" y="224" width="32" height="64">
+ <objectgroup name="Mapevents" width="8" height="19">
+  <object name="west" type="mapchange" x="0" y="160" width="32" height="64">
    <properties>
     <property name="map" value="wild0"/>
     <property name="place" value="east"/>
    </properties>
   </object>
-  <object name="east" type="mapchange" x="448" y="64" width="32" height="32">
+  <object name="east" type="mapchange" x="224" y="160" width="32" height="32">
    <properties>
     <property name="map" value="roadbeforecrossroads"/>
     <property name="place" value="south"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="15" height="10">
-  <object name="larva_2" type="spawn" x="64" y="256" width="32" height="32"/>
-  <object name="larva_2" type="spawn" x="320" y="64" width="96" height="96"/>
-  <object name="larva_2" type="spawn" x="256" y="160" width="32" height="32"/>
-  <object name="larva_2" type="spawn" x="192" y="192" width="32" height="32"/>
+ <objectgroup name="Spawn" width="8" height="19">
+  <object name="larva_2" type="spawn" x="64" y="192" width="64" height="32"/>
+  <object name="larva_2" type="spawn" x="128" y="160" width="32" height="32"/>
+  <object name="larva_2" type="spawn" x="160" y="160" width="32" height="32"/>
+  <object name="larva_2" type="spawn" x="128" y="128" width="32" height="32"/>
+  <object name="larva_2" type="spawn" x="128" y="288" width="96" height="288">
+   <properties>
+    <property name="quantity" value="4"/>
+   </properties>
+  </object>
  </objectgroup>
- <objectgroup name="Keys" width="15" height="10"/>
+ <objectgroup name="Keys" width="8" height="19" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/worldmap.xml b/AndorsTrail/res/xml/worldmap.xml
index 5f1946e7d..637b49f77 100644
--- a/AndorsTrail/res/xml/worldmap.xml
+++ b/AndorsTrail/res/xml/worldmap.xml
@@ -39,9 +39,9 @@
  <map id="fields1" x="179" y="253" />
  <map id="fields4" x="210" y="253" />
  <map id="fields3" x="127" y="263" />
+ <map id="woodcave0" x="201" y="331" />
  <map id="fields0" x="179" y="284" />
  <map id="fallhaven_nw" x="210" y="382" area="fallhaven" />
- <map id="wild14_clearing" x="318" y="425" />
  <map id="waterway12" x="457" y="228" />
  <map id="waterway11" x="581" y="228" />
  <map id="mountainlake10a" x="724" y="31" />
@@ -58,11 +58,11 @@
  <map id="wild4" x="201" y="351" />
  <map id="wild7" x="147" y="459" />
  <map id="wild6" x="155" y="428" />
- <map id="wild9" x="186" y="442" />
+ <map id="wild9" x="186" y="434" />
  <map id="wild8" x="126" y="468" />
  <map id="blackwater_mountain0" x="53" y="469" />
+ <map id="roadbeforecrossroads" x="210" y="318" />
  <map id="blackwater_mountain1" x="11" y="441" />
- <map id="roadbeforecrossroads" x="210" y="317" />
  <map id="blackwater_mountain2" x="11" y="430" />
  <map id="blackwater_mountain3" x="14" y="419" />
  <map id="wild1" x="179" y="353" />
@@ -104,6 +104,7 @@
  <map id="vilegard_sw" x="349" y="505" />
  <map id="mountainlake8" x="779" y="31" />
  <map id="gapfiller1" x="259" y="434" />
+ <map id="gapfiller2" x="186" y="407" />
  <map id="gapfiller3" x="179" y="375" />
  <map id="fallhaven_se" x="241" y="413" area="fallhaven" />
  <map id="gapfiller4" x="194" y="382" />