diff --git a/AndorsTrail/res/xml/pwcave2.tmx b/AndorsTrail/res/xml/pwcave2.tmx
index 6a7bc2c78..c3ccf3c9a 100644
--- a/AndorsTrail/res/xml/pwcave2.tmx
+++ b/AndorsTrail/res/xml/pwcave2.tmx
@@ -1,125 +1,124 @@
 <?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">
  <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">
@@ -138,7 +137,7 @@
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztk1EOgDAIQ3cEL7X7X8n4Z5YlbaHVDyXhS+CVMucxxvwT5hXp+UqkWKqeDrOrN8lEs1y1zh2S3Lf2TXHv9bsZTq/XuQ7PUC8b7vukuOgmSqS4SEvKZ+SDi6nuy7DZ+mpU/h2Vy3jP6GLfHKN19y3B7N7VnV/jorun+yu9SlS5lZlrb1d/1csn387KPQGfDc7c
+   eJztk1EOgDAIQ3cEL7X7X8n4uxjbQjs/lIQvgVfKnMcY80+YV6TnK5FiqXo6zK7eJBPNctU6d0hy39pXqVc5TzOcXq9zHZ6hXjbc90lx0U2USHGRlpTPyAcXU92XYbP11aj8OyqX8Z7Rxb45RuvdtwSze1d3fo2L7p7ur/QqUeVWZq69Xf1VL3e+nZV7ArgOzzE=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30" visible="0">
diff --git a/AndorsTrail/res/xml/waterway1.tmx b/AndorsTrail/res/xml/waterway1.tmx
index cd91afa36..4c3cd9f99 100644
--- a/AndorsTrail/res/xml/waterway1.tmx
+++ b/AndorsTrail/res/xml/waterway1.tmx
@@ -1,145 +1,144 @@
 <?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">
-   eJzV1jsOhDAMBFBoOBh3j3IJDoNSIEWRHf/GAYppQPgtkW22HNtWknMRyagtmRGXq6fNas/jauqscCPnkmFWwawff9exFvV7zx1vzubzudfc7PmhrqNd7VygXOseoFxLT1o9ztXOgtcbXU9vRF3L3CPMwrizvkKY2j5BnLF1FhD9GzW1bmTHRPYD96z0LUDupXF2vGeEdtF7f+ZqLcqtRCirv99cy3+WPn0d7roUj+vNG+afcwMpcOeA
+   eJzV1j0OgCAMBlB1cPdK3p1wCQ9jGEwIaaE/X1GHLhD7BFo07cuSguMiIiL3yPS4XD5pzPYsriTPDNezLxFmHpj542ttc1Hve654s9efz1xxo/uHGte424HrV9R6tfcA5WpqUutxrrQXrF7rWmrD62r6HmEmxu3VFcKU1glij7W9gKhfryl1LXea5Rykz46+Bch7qe0d6x6hXc+ZaF2pRbmZCMqq54ur+Wepo87DjY/C4lrjDfPPcQO/XObI
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytVkFuwjAQNJxBdV5DOfYKVT8AKqde4R6Vckflgyn8ocoL6oWsMhmvTdJ2pBUQYs/Oene9tXduXDhXh89R+BQsw3dX3J6n8DVpv5fh/XewvW+fH4KtfbxeOZVD9ls279Xgk+A8sXlk722wz2C7YB/0/GTw1nf0ok+lwaMme8+nzh2N5xaY8wJ6kbskPtwP9e8TPCm9COW9nmHDvaKYIZf6gzHO8ZcUY80V4T1T3mh+PE5j7apfY7xL5BLupZwX4FnSGtaKv1+CLYI9B3sa9TerVoRX/ZAYrBr/Z9OWd91wboK9PdzWYBysfML/MXcUr42GxR0NG9+esyDHyXH69t3cwnPV76qP13b8d/m6wX1qH/cGQUX94UC8ffpCjnds9Abm43rt2xesmlaf96Q3xzcEGH+sqSP8Vs7/4uP4Y25gH8j1vyF8At6H7yPMyaG5YXEeKJ+l9rmW5c5A7b/ViJxbn36O/Vy1Y28cysfnqD09x4k94y8aNVbaL/twXpGZY1gb33l4J1icfG+dfNv/qh5xXvnufacaq0l7F7A/M4NzKLAvsgk45nODk2epPufLfRFNgPVgabfmtD7new/WvMP9nvVeEnOpNaPpmeXirNpRnzWvCtRPC3yuqfeiWarIczJw9h4C5cWZwTpX7FMcI5mncrnEfnGdYG2m9Naw5mzUMte3+ns0fI2QmCkE0SxZ5M8BYe0XrS+6elHbDzgyF6I=
+   eJytVkFuwjAQNJxBdV5DOfYKVT8AKqde4R6Vckflgyn8ocoL6oWsMpmsjdN2pBUQYs/Oene9tXduXDhXh89R+BQsw3dX3J7H8DVpv5fh/XewvW+fH4KtfX+9ciqH7Lds3qvBJ8F5YvPI3ttgn8F2wT7o+cngre/oRZ9Kg0dN9p5PnTsazy0w5wX0IndJfLgf6t9HeGJ6Ecp7PcOGe0UxQy71B2Oc4i8pxporwnumvNH8eJz2tat+jfEukku4l3JegGdJa1gr/n4Jtgj2HOxplG9WrQiv+iExWDX+z6Yt77rh3AR7e7itwThY+YT/Y+4oXhsNizsaNr49Z0GKk+P07bu5heeq31Ufr+3479J1w/twbxBU1B8OxJvTF1K8Y6M3MB/Xa25fsGpafd77rt4U3xBg/LGmjvBbOf+Lj+OPZ4p9INX/hvAJeB++jzAnh+aGxXmgfJba51qWOwO1/1Yjcm59/Dn2c9WOvXEoH5+j9vQUJ/aMv2jUWGm/zOG8IjHHsDa+8/BOsDj53jr5tv9VGXFe+e59pxqrSXsXsD8zg3MosC+yCTjmc4OTZ6mc8+W+iCbAerC0W3NazvnegzXvcL9nvZfIXGrNaHpmqTirdtRnzasC9dMCn2vsvd4sVaQ5GTh7D4Hy4sxgnSv2KY6RzFOpXGK/uE6wNmN6a1hzNmqZ61v9PRq+9hCZKQS9WbJInwPC2q+3vujqRW0/wOQWoA==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztlwEOgyAMRcsBTOAs20U2lyxeYLu+3mDOjazWgiUUzIwvIShU6gdaFCDOYAF6+6knHIBxzDUl1sf48PR23icdQ5vBrtuUoJTeNT2b6E3YI//AIlYy6AxA+y23sVxQ3aKCqTWXNEZDejvyzlfD2z0F80V9vsnVe5esE+Mjd31FfhnfVfQSNPZUkl/FnPDYKIcfHNTEnzlaZ4/UZwm4syCmS0svzVFYn5/bEixy1I6+h3KI/RNoEhqba0+JL85WtI/d757a0zg/NQDnZt6Oxws9H2T0/QLWPj7f
+   eJztlwEOgyAMRT8HMIGzbBfZXLJ4ge36eoOZbWRYC5ZQdFt8CUGhUj/QokCawQK9fdVPHGAcc01J9TE+PL2d9knH0GawyzY1qKV3Sc8mejP2yC8wi5UCOgO073IZyymo26CEfFusdOSdz4a3uwvmi5vXUr1XyToxPkrXV+SX8b2KXoLGnsryq5gTbhvl8J2dNfG5UevskfqsAXcWpHRp6aU5KtTn57YGsxz1R99DJaT+CTSJjc2158QXZyvax+5zT+1pnB8a4NhM28PxYs9HGX0/AGeiPuA=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJztklEOwCAIQz2Cl+L+V9rXksUIQ1tgMWvCj0aeLUhvTR51S3pejapgn+5XU0ZOq2xLKFPrg8rbgz2XCB+R8x3vEa9e9uwc4SK5sfzuvGP1Qrg7mSFcZFas3fiZcbwTmF5l+ovM1fpPNvMLXCRz79xY+xWlKu4bu4Kp7YTWY/XM4l4F+82I
   </data>
diff --git a/AndorsTrail/res/xml/waterway10.tmx b/AndorsTrail/res/xml/waterway10.tmx
index 4fc99ffe5..bb1c76ee4 100644
--- a/AndorsTrail/res/xml/waterway10.tmx
+++ b/AndorsTrail/res/xml/waterway10.tmx
@@ -125,17 +125,17 @@
  </tileset>
  <layer name="Ground" width="30" height="18">
   <data encoding="base64" compression="zlib">
-   eJyt1EEOgjAQBdDSJrDVnZxAExJY60r0BnIFr2rCIUi8g/EATtM2KZPOdEAWP0Mo8Oi00GmlWkjnazieynxuBT32gtwLV1PjfcJtN3An71JjA+FK7H/clnFz9j/uVbv0hCvt+VL3oV0GxpXuM6k7Qp7ahTKDO5Z0JC6+h/OkLhXr4nOfnVJ6z3sH41KbdS624kqZb8gRvBOk8W5pXJa62OTmW8Hzz5BL5Kx1Y9P+v2xS3+0WveVM7H79POPebrWetqbc0MMK9RYnXMf1O2ViuzbzZ+X6K3EpM66Nmc8111/J3sLrmbJL5ObWTrqn8Xpie4kr6TFnx+/wAyFMRwI=
+   eJyt1EEKwjAQBdA0gXarO3sChUK71pXVG9greFWhhyh4B/EATkgC6ZCZTGsXnxGjfeQn2mmlWkjnZ3g9lfncCnrtBbkXbqbW+4TbbuBO3qXWBsKV2P+4LePm7H/cq3bpCVfa+VL3oV0GxpXeM6k7Qp7ahTKDO5Z0JC7+DudJXSrWxe99dkrpPe8djEtt1rnYiidlviFH8E6QxrulcVnqYpPbbwXPP0MukbPWjU37/2WT+t1u0S1nYvfr9xl3u9V52plyQ4cV6hYnfI7rO2ViuzbzZ+X6lbiUGc/GzPea61dyt/B5puwSubmzk95pfJ7YXuJKOubsOD8kN0e6
   </data>
  </layer>
  <layer name="Objects" width="30" height="18">
   <data encoding="base64" compression="zlib">
-   eJydVMFKw0AQzVaPKaQf4B94U1BvlXqyIIgFDxH8A3sPVc+W9A/8Lf0FIWnFUr27487U1+lsU32wZJPM7pv3ZnbrNFliBvMYjtrNMXmWJA9ZmD/6501mx9Xp+vw6EhvDCeQz9mtLXk/PCc+PG3IW3Xste3+teRsPdH77vHcd8djixrxPXXxsi8rwm75Z3IRLv/fAheeVC1oG8M1C4T0f/aGGoyw+7o190PsCYqnP7jj+yQW/Z4ZemZeZPYbcu1Y+kq9wyZpJRG+lztaiFb69+PhXWEP5jCP5YD/HuCqjp4jrk4f2inx9k306SeL8mMIe7zzvb6hjzFuNnL0aqnvAylnww9ux/1m9Slp77VB3wu7O7x2E98+BjzmE/sE6kB+WXvJGckGdC5WHeIZ1lFqdtVfjLvz3cxi3itcZ2omv23DvYI2t87OpnoQ5/P9qrWt8dsFbgfgnNS6NOi95I/VE7g9Y1wOtVJtlv3C/ko85cxVYZ/5Pnjfp/S+EV3TrM6n1Yg9poJ+kWd71HYEahV9ian1emWsu59zgFn+7qjcJ0q/TdFWj8GIsxfQhF+SWXFD/NxJ+g0o=
+   eJydVEFOAkEQ3EWPkCwP8AfeNFFvGDxJYmIk8YCJP5A7QT1L4Ad+S79gwoKRoFfjtNsFRdPDop1MZna2p6urumfyarKwKa1jdlQr9+lkSfKQFevHMN9kvl9eXV9fR3xjdkL5DMLZoZ6XeaTr45KcwXuv4se3nLfRwOa3r7HziMYeNud9msbHtjZ29JY9D1vsMsRup8V8lRZc2rTnWS9o3v9DDftZfNw7cVj7HvlKn92p/1Na6D11+GI9zPzR1d718kG+wMKZUYTv2NyteaXYewn+r3RG8hlE8uF+jmGNnZ4SrE8dVivR9Q1x6kmShjGhGO+6bm2oY0zbRQztj45q1TXvgJcz7Be37v/zelW4NmtF3b/D2N1ZvkH8/hwEn0PqH66D6OHxFW2QC/OcmzygGdcRtTqrrfpdhP1zGrcGN3W4C16j5N3hGnv3Z1M9xWbZUpOvyjrHZ9UWBl/UGPfHvveb6snYH3SuSVylNot+0X4VHTuK1eM663/RvIzvfw244G3vpOXLPWSN9RTO+LZvBHMEPnxye18Va4Z77mBD34bpTTH066S6yhG47Cs+LcqFsZEL+Mv8A8CIhxU=
   </data>
  </layer>
  <layer name="Above" width="30" height="18">
   <data encoding="base64" compression="zlib">
-   eJxjYGBgCBdgAAMYjc7GB4hVh08vshmyTNSxNx2PfBoWe4kFhPQQYyYlYTaQ9gYzkmdmGh41+OIJH6DULyD9R4H4GInmoPvlA5D/kQQzcLmbkDnPBRBqPtAg3eIC5NgFitN30LSCL+5hgJx4wAZAfvyHJY2SAvD5F1dapSRsccUncpigmw9zByxsSQk/QvF5FSh/DYe9yHxC6ZXUfIHLHmx8UgAp6Rc5rYLCOI3IMoJa6RcEKC3XyHULNeokZLtxsQFWgzi5
+   eJzFVNsNgCAMrE7AAk7lhxvgpLqKv7iBYtLYEFpawHiJEWJ716cAAIuDB/hOzxK0dpIv5ZjGPrqr8N1ndLUo+Wg4W2r2p+481HF6wUbqk4TWXKL/dj+7kSfNJdz308DBxV3iOdxrEz6YWw41WrSnUu8RNX3IocdeSflys9pSW66ftCYpP8aBtbXUz9LPVJfeS/Nq3QutrhWWfOmsxhp75T+i1/xGtM5wbSw9dodqc+cLqKE1AA==
   </data>
  </layer>
  <layer name="Walkable" width="30" height="18" visible="0">
diff --git a/AndorsTrail/res/xml/waterway11.tmx b/AndorsTrail/res/xml/waterway11.tmx
index 32ce78a1d..b2f79f36c 100644
--- a/AndorsTrail/res/xml/waterway11.tmx
+++ b/AndorsTrail/res/xml/waterway11.tmx
@@ -1,145 +1,144 @@
 <?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">
-   eJzl1UkOgCAMBVDYeDD06t6Cw7giaUzpQIcEXfyNsX2RofajlI7kZoLVeNRbXa6HtlbiYfVntfVZzQ5uq76u9N0vutR6Z7iY7eG+7xF8flU8mj2ZebOZQa3zzKVmCTfnxjdRdwlzub6SrJz9LBfb92hXe16iTKvrdSebYs2tJsyYKxG9JW52/ubulswzCM1IN2uGRM8uj/+RxvXyJK63BfMAIb3tRA==
+   eJzl1M0NgCAMBlDx4FlXUld3C6ZwAuOBpCGlP1CaoIfvYmwfIjQu0xSRXEywGov6Vpfroa2VeFj9Edr61GYEdw+2rvTdL7rUfnu4mG3h5vcIPj8DHs0/KXmlmUHtc8mlZgk359I3UXcJc7m+ktScfS8X+++9Xe156WW2ulZ3clfseasJk+ZKj94S1zt/c0eL5xmEZk/Xa4ZIc691Ltdz3nhT41LeayUT9oZryddksYel3tSaHqbm6Sk=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytl7FOw0AMhq8MTK1IxcO0jKwNI1uRmJiQYI/SsiPygqG8A+0TcG79k1/uXXJJY8mKmsv5s31nG5w7l3Xm3JNXN3du4vV7qgv6+389IrK+9brxuvN7X6+dy7PT82fava/UveAV+u6jg/vp196Jzdw2kX1ftLck3puuVcS9m52ei1mYXeq3XVzLZ2Uec5azhh/yX0RilzMrWnI1pqyVs6W8WVkYn+8n46gI5y3E4nw9TsaJ2drFnZHcW35sTx+xNvGb7+1G41+OxEfd4T6XxKinzZ1vq8m2XMR4XHciHN8q4U4zk2PgM4rxKu1Z0jc4voK+qzp8KIxN21vO+or2OZEHE2MKE+e95m/Vpu0tsoYevKNeLPG+3DS9Hd+mnB/PA2u71uet2pG+dHyn/uXZuY2+stKcIXcp+kxn2pcLXxFbbs7QzjjkAj059R6FuDxXkbuaeDvKLdYuYYqEZhvqKFRfdn4OYTKbezv8sPXVNj8hbb0vNNNjfgyJJ2TXvltGfBgyMy6dqSn+Wxnz743UuYG7nbqHczl0FnM9ddkawojVlK2nPrO1j/1YPf32PF/L6bIvwvNDeHvtrX14IU6ltsTmwevVvOHUxMK69M+2/1WKSFyIY581vVhYYB4oh+wLnvAhxrSx4VyQJ/Eb8VjbInXEp+O88PoHVY3VEA==
+   eJytV71Ow0AMvixMqSjiYVpG1rYjW5GYmJBgj9KyI/KCIX0HHoFzY9Ovru9yucaSFeV+/Nm+8+fEuUvZzp179urunCu8/pQ8we//8wGh+b3XndfO7327cW4975+Hsh+L7at5r+BVPPY5gPvl5z4AG3FjQvu+YW8NeO881wDuw6x/LmY2ds1rj7gcQwo+KuIhznJ2wrf8J6HY6cyqSK6mlC3j7CFvWhbK58diGiXBvFlYmK+nYpqYtV25M5R7jR/aM0a0TXnHe7vj+JcT4UvdyX2uAaMtT3c+VpOxXITwsO5IML5Vwp1GTIwBzyiE1zBnEW9gfBWsawZ8qJRNzS0XvAIcsVExpmDKeW9xLdvU3EJzB+Zf5GGK9/X2xO2yNuX8sB9o2y0/79kO8dJxjP1bzy9tjJUV50xyl6IvcKZjccVXiW2tzvCg+pvkQjg59R5ZuNhXJXct4HWQW5m7BpPE6m1SR1Z96f6Zg4nYyO3ih66vWP8UiXGf1dNDfuTEY9nVY8uADzk949qemuK/lim/N1L7htzt1D2Yy9xejPU0ZCsHI1RTup7G9NYx9lPraSxOin2rNw19P2s8Cyfkf1ee8ydiah4PxRb6TxAutmzniPVdcRYX8z7F8xuIt4355PUPLke9aQ==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYCAMPggwMHwUIEIhsUCQimYRCajuBzwgmw2JA/QrI539i2I/HUE6ncIXHYSTYC/IjYGMDAzBUBzCSB6fVHtJUUtNs6hpb9oA2UsKoMReYsqISCzpAp+9tC53KA1nbO6LZKS9vbQCtAjvQLQ4DyIifGjllpEOhkIdMxzsJaWsRwaU1q2jYOQAepaPH7DYQyu7sdmFDOjdH4ABYvwLAPMsKsU=
+   eJxjYCAMPggwMHwUIELhIAb09EM2G33sGWz2pw9QGgknwV6QGwMZGRiCoTiEkTw+qfaSopaaZlHT3rQBspcUQIm9xJQRkVjSBT57aV3uUBrO2NwXyUh7e2kFaBHegWhxHkRE+NDKLSMdDIU6ZjjYS0pZjwworVtHweAEtCjLCJn5gYr2wexCNhPZbmzylNpFjDp0QC03YAPEuAkAIn02hA==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJztkskRACAIAy3Bpuy/Jce/IuF+kJl8WcFdc4wV0JMITnPrc62TcZsqXOoGEdwbw4L7+mMrFxAnpXem3obshnjFnfnbF/VZykC5Hon0U8Pkzuf458W2Zt6885iN+l6dq03Gvt1uN7cbXnXsvg==
   </data>
diff --git a/AndorsTrail/res/xml/waterway11_east.tmx b/AndorsTrail/res/xml/waterway11_east.tmx
index 963295f5b..ade54d097 100644
--- a/AndorsTrail/res/xml/waterway11_east.tmx
+++ b/AndorsTrail/res/xml/waterway11_east.tmx
@@ -1,145 +1,144 @@
 <?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="25" 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="25">
   <data encoding="base64" compression="zlib">
-   eJzt1MEJACEMBED92NjZul1YjBycIIIavWQV9bHfHQJLnFHKHRj/Be3NdlF+yZX2W66ULenWuijuqF3r4nKpPTFW94XD7E1qPRpj5nldtHnd8g64tkfZ1d+fTOni/CVIV+L3t9ydzRVuPdENXO5jow==
+   eJztlkEOwyAMBKEHzumb2q/nF3lFXhAhtZKL8O7iIE49rJAC8djEZNlLSueW0uO5dtyLr9mx7fz32fERy4Hlhuqw647yK1Y/mleZdWy5iM/qYSxUr1p/G0th2nnG7bFn9G2Ey2KivRzhemz2fVGsKDeyb1bvPKYZzFFZ1iuvYbaq3NXMP9fvg1m9p/RV9Kz11kV9SGGjfzfznSjX8xWm3nuqDzH/iOaEarX5Ieao5ytc1bvZ83aP7fpe7yqxVW/31nln5s6dFfWUdwe4AMNqO4Q=
   </data>
  </layer>
  <layer name="Objects" width="30" height="25">
   <data encoding="base64" compression="zlib">
-   eJy9VkFOxDAMTDkvUvoa4BkIbuUNcK8KvUfb//CfPSCxYgUcoQdstoap6yQtlRjJyippPBkntvfVO/dOdlL+71iTNWD3ZAWtuXK9b/Fj+WtpvCXbkt2R3ZDtNu4IY0/Kl15/HPw8DyN+x5ydP85XND6AbsaT/z0D72Ec5FzqbMWwvsN1N+XkUTgZAXRrftkrvmPogTN1B4yL0/Fezf/NXY45ta+cvskdJRDgznM+c++1MeKHOFfaK9C837jkG8O3VsF73VrxI5wprqzmchxbS1trxCkA9xyg5g+VY7Uf5yJaZ/iXt7MGyGlxpHBZOHdFdl2kf2NuNwPHXzmXIKgYMjCWOhfXIvXm1gJzJ3Xu2Blw/9K8nYNa3a/lb07e5nzLdzKH+cLAOm7lrfSHkOHGvMBagRqsPmLlrfS+XnFjLdF6eB/mTQt84mev+g7XkE+j/+k7EF5db7qhJgUfrzsvRq/7QeS/gPAIL2qM9ddYr7N6fmy+8uMaY3FaenI9vzdiLHHXWhnCOad35+Z1jAVaa+rbxf8bE/sqP+2Jb37KvXSMaZDR4v0CkRffhA==
+   eJzFVktOwzAQdfZBck4DHAPBLj0D7KPQ7KPmPhzGOxZIregBKAts8MDLy9ghDRJPGjVN7PdmnPnEmP9BY41pwR69FZV/UK3nFh6Nr/M699523h68bbw9l/GhsifHxc+fPI/zti+n64LmYL+ua/+7hbgDXuyPD4Ij8lTkiwG/MxDNgB7iZv1RPApc1Hr/habg+mL8n/U/tWM8bgEvg88lhR7e+bl6rZK3GtcVxV5DzIfSZHOMc03ydaedn8claaVi/kbkFr+5FoN1vAe4tnQ/BYz5jWqsseNaRBsUfsmdc4BxiqamkcNNYcytt7sif4213UaNczWXoKczDMCz5Fpci1zOrQXWTs7vlA+4X8ttre8tQUPvV+Orldzmup3jlnVyD+slAPu4VrcyH/oZbawL7BUYgzZHtLrdw5wIdaf1H4knQOoC66YDPZk3B+qxoYecZnp4DboSo2CIPam36b7zmuNPfAuIjuh2drpGoM0NNzPztfthj7yrAc6VNVPx5OamNu9P1E83dK7JeJZC8Uv4Jv30j74bXZn3mWeio1m+Chke1v0AUkyOhw==
   </data>
  </layer>
  <layer name="Above" width="30" height="25">
   <data encoding="base64" compression="zlib">
-   eJztVcENgzAMNP0jJbO0k/DpBnRd1AkqJqBM0EZVwFg2NiQoVdX7ICH7zk4cH0AheIDKL7+/hMGl5T835AetEL9Hs3Mzh8TJ1ZLa38PIiWtI1eRg5Ty953N0y5k91wCXOn9NGJMmg+6oGfOyZgB3d3980FSlK5hxK3RP1y/WTX0zHFoDZ643cz9oB2p+0wv7eotP0Vy826x9aT6Fa6KcUTPs8hiD+7J4naVfyhk1tX72niULb9Ok/znP1/5L3DSWQvJ06Rxi/JonatwWSHl4bnJC4+T6fQGHYVUN
+   eJz7IMAwMECQgYFREJUeTuADheH6kQT9ILtA6smx84IAwgxcZmJzC6X+e0CkmchuoNRObIBUM5HTrDEvA4MJL/XdhNVOLOACrdKYIG47QQBb3I0CCAhiHGgXIED6AMVT+CC2l9I8gw2kEWEmtfLMJRqVgYTqm0c4ymtS6il0vSAAK2eI9RehegrZTehmIuuFqUH2FzF1HTH+RTcTHyDVbKIBnvIbl5tw1fmExHGZja4WHeCq03GFA7J6fPUTPrOJAfj0UTWOSDAT3b8AxhpOoA==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="25">
+ <layer name="Walkable" width="30" height="25" visible="0">
   <data encoding="base64" compression="zlib">
    eJztklEOwCAIQz3CLuX9r7TsYwlZKKtQ+dmaGD9EXsXOY4z54XXJ7op+t9g6z4N3jnyzzIgfsZFUs7dMZk7KP1L1VGaji73rX5lZZ1kKdc66i+l56Gb+XJwDlUcmV08mm0GvDvVaVZYb9apw7Xl0FzErOWTfw8yJ8WR9vfXIKJvVHe/M1CruVdcq8wTos7ee
   </data>
diff --git a/AndorsTrail/res/xml/waterway12.tmx b/AndorsTrail/res/xml/waterway12.tmx
index 10ccbb80c..8e56834b0 100644
--- a/AndorsTrail/res/xml/waterway12.tmx
+++ b/AndorsTrail/res/xml/waterway12.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="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">
-   eJw7ysbAcBQHvkMDTE+78NlPL/tG8SgexRB8nEhMbXtwlTnomBy3kGMPKW6hh12EwoLWdg1VbM/EwOCAhOllbyDQriAkTE8/pzAh8ECH/ygexaN4FA8HrDdIylMAYJ7evA==
+   eJztlMENgzAMRVEOnYIVSEeAFdoZWDViiQ4DVYWwLOz40zhccngHLv/5OyTp0XVJ4ONATZfmr+VrNBo/FiOlPdKbw7kyi9XTB/scSfAjnb6+SOgDNsOV/Q3MSXmC/RE0bwR7I4xb7kSo1fu1Zb4JUn+PznM4kLyeZ62d911er13vaP+2V+fcnfK6VzmnR2+tK39HS3l5ruSj3/+4rD7eFem8ezSX5kO8uSyr68xLd53rZNkjiiXLy7cCHO5QPg==
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztVbFOwzAQtSqxBSnMDV+AKJ/DxM5EV1RBu1fwh3GkembKF+Ajd/A4znZC061POtVJk3vvne+cUDvXVu4Lm7h+4djFeIrxXrtZsI951jG2nJ84N4rrjWMuTuSW3Jpvbq4UTuXtjDOmAGe8FK9H9Krm2U3ItZ2oRZ9bGni2pGKdyC9axnBpHpr1Pp5zy4VzTYzrGJ7fubocfvcFLWO4iIfyBX5G+FYQDWggeD7zPeRFLTkuQV/9fu5WcWLcLez6Sh0Eun4aopu+H7LO8a7At9YroFyi48N4xhs6OuNezrd8Y4PxHqL0P2p5vBh+U/7vjVy6BsKHvntD6yGub9jLc4FXPOu9nQqqMWk4sI6HevBf4kW0lb1GoE9adzy3uja5PpNaW71C6I15073m67/7vyz0Nnn2kEdqnqo93kctXf1zHTI1tubqO19mviwE5pTalLxq39Y8W/X30M+65nQ9xqvuMdynlG+tK3BY5/OYwHnujT1HTS3UtPknX+oM08Bv3LFcmle8IfccnsbWem5POT6cq1Ny5eITZ1+s9Q==
+   eJztVbFOwzAQtZDYgmRmlE9iZmJiYaIrqqDdK/jDOFIzUrLkC/CBDx7XO9sRYeuTLLu1c+/ds88evHNd4z6xjuOn1LaxPcT26t0i2MU4q9g2KT5xrgXXS2pLcSI3x5Z8S3NZ+K/cTjhhDrDGS+35D2dV8mxnxNrM1CLvLQm8W6y2MuKzlhouyUO1PsV77urMuTH2bexD+uby4qvfFbTUcBEPxRvSGuKz0Ka5kO78AHFRS46LMTU2z1tmDsE+MKR/Eqyb3o9Q4DjAPOVt6aVYrONdWRMUHf3M2uA3dih8V5pHLffnx/Mj6L9RYkkPmA/znhSt+zi+S2fnEXgPmT2QezsX5DFp2Ccdt17fi9xZ6xp9jMA8adynutW80UCes9eaPsKk1JuMG/zx/udq+fs7iMOeW97j/6ilB29RA3qr7XUL+qx6zPke/I83NbmiDq2eNf8DnGfpOf8elVjX/nePQI9K9xDrGlKz8tR48H+s50nZc9TUVXgq+Up3trWP/MblYOUmIfeBc0Nu5sLziNotrtxdJdex19q5kKjNjaH5rN3V1nrJJ/OqeXtlXhST4nwAhVadwA==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztVbERwjAMzLmmoAdmYJyMwLRu6FmAHDsQ31nHn5AlK8ak8ZdxpNe/JHua/o/HcQfSgYGBgYzY8Q66C7lfBz2mZz174CnovTVqlDzSfFsUz6Ueec49qNGt8eGZVRfO2SXYvDUgj5GbvpU83tJrj04Eztqc46x9ss49/MnzFq8j81XyW0PrXmk86K22Txyav627RXUk3d5cMcfwOOl+Pq09PYfv3s6d7g7iQyD/r/a5xMfv7Gv4zFbrjBEX18eR+pB4yWPNa5xHrL3EZc0v8S6wz9a7jXy1kN5Grbf8f87HdUn5OVAXzVjK8wa6vTs7
+   eJztlMENgCAMRY0TeCfMxQhOy8W7uxgTmjSEttACeuBdsfz2/8q2zec+PhBdLBaLRBz4Bl2Ku0f28xdO44wlj7S+SRlpMqSomZvTw2ctffm9/lsO8BhrS75rstbOiQmpTupPOm/Vt3gdM19LfnNY/6ueuw5w/vbSe+duvSummpo6lzLNsw2D3g5H7JAn+rBC6WFgt6w7VqOFAY8lr3tolXRbvLboAbP1KP0HdgAiMA==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJztk8ENwCAMAxmhS7H/Sv2iKoAdjNVHkPwK5AwO/Wmtl0ql0mWhy8VReMn0yPKRvaxn5Xs5c2G4p/zobHYedz6QuvIvrPaMtW9PR9ZRvxvcVf+Znxn7JN8MUzXXTLZKPpMtwkXnOfLBcNl7s4zMW0d1B1fJQTN2yMn6i17tGsmM
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="30">
+ <objectgroup name="Mapevents" width="30" height="30" visible="0">
   <object name="west" type="mapchange" x="0" y="416" width="32" height="480">
    <properties>
     <property name="map" value="waterway7"/>
@@ -158,7 +157,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="30">
+ <objectgroup name="Spawn" width="30" height="30" visible="0">
   <object name="izthiel_2" type="spawn" x="64" y="320" width="256" height="160">
    <properties>
     <property name="quantity" value="1"/>
diff --git a/AndorsTrail/res/xml/waterway13.tmx b/AndorsTrail/res/xml/waterway13.tmx
index d424da14c..c1dd35d2f 100644
--- a/AndorsTrail/res/xml/waterway13.tmx
+++ b/AndorsTrail/res/xml/waterway13.tmx
@@ -1,142 +1,141 @@
 <?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">
-   eJzt1LENACAIRFEq91+KuITDGCsrIhiw8RevvbtQoE1EDeOClZWRnbGjutfa8LIX+F13yM5bPL8vssH7T6NOt6jqPe141QsAALYJe8/lnA==
+   eJztlL0JwCAUhCVFpnCG7L+AZAmHCRICQe7wKU9T5Iqv8PB+sDDtISRCHoBleWR77Jjdyzas7BXi75wGvPMKlr+vZ4P1P+2l9Razels7VvUKIYT4jmO7GfFG4Csa0lEn6kb+R4uVD2lvHfnQmflrnYH62Ob6Psq7ALKquHE=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztVstuAjEMjDhvJXou/AKfVu7VUu6I/mFy2U/gCxpXa8kdjZNYfXBhJB/wxuOJ7fUyb1OaiZ2rvVa7BuxY7R14TtVKteenlPKUvrB0eD62KYRLR4dqKFOMN4pLQ8N/AWvxwAP3wpuzW9BOgTkd4TsP8uGO+A30duYR8rB9aTG6e2VnLib2BrsOd1OrFvO6rxV2by4k1oPlQA2eDoV+K5Ajw71Em/oK4cPzoh91/NWexB6gT7R53yT0e3X3+hTVh7XDurMYD15sFKM8rO9YL8t1C8xzHjiLM8byeOidwefe+V7v2ftUGv1XsB60+hKZQbwLi23xsTu1+un1KYKfzr88Y3rdvnbmE+tTOnws5mWT0n7Trp3+f8+wv0ZzICTnYTXJrTXROO/9lXtJ7G6N02fqs37LkafvOW1u1YPxomVn/DaO+ayfxbHfXjz6PWP5PM14nvF9Ah5Ckyw=
+   eJztVrtuwzAMFDy7gDsX+aT+SrMXTrMH6R9Ki0cHXfIFFYsSYQ4kJfa55AACBiWeTiRNe55SmhXbV3uqdgzYttoL8OyqlWr3dynlMX1gafC8TimEQ0MHayhjjDeKg6Phr4C5uOGG/8KzMVvQdoE+7eHbd/LhjPgJtGbmFs7R5qVE7+ylmbmI2DPMOpxNXi7mz3nNkHNzUWItSA7UYOlg8LcCOTLci7Sxryh8uJ/0o47fmpNYA/SRNuubhH4r71adovowd5h3LcaCFRtFL49Wd8yX5DoH+jl37MUe086x0NqD69b+Vu2196k49WdoNfDqEulBvIsW6/Fpd/LqadUpgu/2P61pes26NvoT81MafFrMw5DSZvBzx//vGeZX7xkIOpNBZ3NOOM56f+leHLsZLmvsW8eLX3JkEXcS2ngvra3jtY+1yP1vX+yhx+n62eOx1k7gR57V4dTWpCbmfgdYO5UW
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYICAuwIMdAFn6WTPKBgFo2AUDAS4RIcyjh52kAuIKeMHs/vxAVq7eyjXj9jcTmx4kRKuQzXtEAOGcvwjg6EWR4TcS2q8UBKPgynsqOEWevrnFQ9hNa9xqMGlF1n9WyLMxwakmRBsWSb85uCSQ3e3NJo5+PyOTU4WyU0wswEA7B2h
+   eJxjYICAuwIMdAFn6WTPKBgFo2AUDAS4RIcyjh52kAuIKeMHs/vxAVq7eyjXj9jcTmx4kRKuQzXtEAOGcvwjg6EWR4TcS2q8UBKPgynsqOGWweSfgQLSTAi2LBNudeSaSQ7A5g4A2dQSCQ==
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">
@@ -144,7 +143,7 @@
    eJxzFWBgcB3Fo3gUj+JhhIkB1DaPHEBNeylxJ7H20jIsKAXEuG0wux8foLW7h2q4gAA2t5NSBlBiz3ABw8VvQ80fhNxLjzqAHvUcPjtJzb/Y9GEzD90MfHUsLvcMdDuG3hgAPqyQGw==
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="30">
+ <objectgroup name="Mapevents" width="30" height="30" visible="0">
   <object name="west" type="mapchange" x="0" y="352" width="32" height="544">
    <properties>
     <property name="map" value="waterway12"/>
@@ -158,7 +157,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="30">
+ <objectgroup name="Spawn" width="30" height="30" visible="0">
   <object name="erumen_2" type="spawn" x="64" y="416" width="832" height="480">
    <properties>
     <property name="quantity" value="6"/>
@@ -175,5 +174,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="30" height="30"/>
+ <objectgroup name="Keys" width="30" height="30" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/waterway2.tmx b/AndorsTrail/res/xml/waterway2.tmx
index 3001e13f9..ea26f88c1 100644
--- a/AndorsTrail/res/xml/waterway2.tmx
+++ b/AndorsTrail/res/xml/waterway2.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="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">
-   eJzVlsENgzAMRSsOvSGVKaAjACME1BE6LWpH6IEpOkEVNZF+LSdOSALq4SvgmP9sSyjpqtOpMxrhmWpg5Mqzz71553wH2JsdXnpvYtQTn5HElXmfCasDD46J9XBcZRgjeNh4C/56vZJ6J9jjatdey9ktBTyM2xkPxM/W5Zop5xUjVf3OhtZPa0rloZCL8ffFX1OqtH/VfFeM65irphyyTL3m9v4ntQVmm5v7EBTD7SO4q6CYGpSHK3FCakjtpQS/FJPyj+By7L24dO57cpG9N3c9kOvSs5ZVgvuqZeX8J+33If3aXO583cJcIvv1ne0xTK1bIwvzubtMCJ/m3RtZ9BvsN7T/rec3Cvv19Z/K5O6Ivv4pe+udLyafy/0AmlaGXQ==
+   eJzVls0NgzAMhSsOvSGVKaAjACME1BE6LWpH6IEpOkEVNZZeLeePJKAengKOeZ9tCSVddTp1RiM8cw2CbHn03Jt3yXeAvdnipfcmQT3zGVlcmfeZsTrwkJhYj8RVhjGCB8Vb8NfrldU7wZ5Uu/ZaznYp4GGcZjwwP6rLNlPJK0aq+p0Nr5/XlMpDIRfj74u7plRp/6r5rhjXMVtNOURMveb2/ie1BWabm/vwKIbbR3BXj2JqUA6ujxNSQ2ovJfilmJx/BFdi78Xlc9+Ti+y9ueuBXJuetV8luK/ar5z/JH0f0i/lSufrFuYS2a/rbI9hat0avzBfusuE8HnevfGLf4P9hva/9fxGYb+u/lOZ0h3R1T9nu+biUky+lPsB8KGHFQ==
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzdVstKAzEUzQxtF7aFTMEPUFH0M1xqBZfiA5cuBHVftF2KQ13Pxt/wE7r0B+r0Jwri1tzOZHLnNjeToVjEAxcyyU3OOcnkIYQdu6EQeyHTuEKuzv8LcGl+CUw5Cfg83Aa+oJ9t3LegmrNoi4QIoqyYdsrzpcen9ZwmFxJGK4Ze21mnery0Y/rYcCMNnx5vSsb9ZHimzNhV+hftaD6xTqyjAMnlADmLvig3QWuMOThPHEr5Li1Iq2t9ijm2eNNt1v46H/UDbZuhRacn0hp9qKa5+j6WWZxKYfU/UPWPHvFE+lMvWGfUNd/X0mjQcaciVvEgqz0NqYYceB/MpdEVRuV28Ek9jlTcqxgzQXUNLfwwFyH6N2zzaON5dXiOGQ1L/Pk6wN7mvLh4XIgZfuDW/wz4XoWjDv+Q+P5txIR7ad3XxK351wXf/fgfuccW7oGnHvasrAl9fow8+9rOrLr/64CcUT44I3lxTX7MCefHx4YfL3071OW/RJxwN8xy3veeEM9NU4bQZY4bzl59/1XxA++VNPmad6LGT5qmPOmZMsaU8c3519yH6m11IrO7FnDQEGK/kXnpq7rvthA76p7+amft+D7fUvXb3bJfl3/KjeftVpp7H+sB0LdNMS71a/EPuZgb46il+PK4aGV+z1EdRL+VvRuWkN+tKX0DIg3gS3P/AH0+oQ4=
+   eJzdVstKAzEUzQxtF7aFTMEPUFF0rT/gUiu4FB+4dCGo+6LtUhzqejb+hp/QpT9Q258oiFtzm8nkzm1uZoZiEQ9cyCQ3Oeckk4cQbmyHQuyETOMSuSb/L8Cn+SWw5STg83Ab+IJ+rnHfgmLOrC0SIoh0cdLKz5cZn9ZzmnxIGK0YZm2nreLxJi3bx4UbafnMeGMy7ifDM2bGLtI/b0fziXViHRlILgfImfdFuQlaY8zBeeKQy/dpQVp965PNscObaXP2N/moH2hbDx06S2JSoQ/VNFPfx1LHqRRO/z1V/1ginkh/6gXrjNr2+1paDSbuVMQqHmSxpz7VkALvg5m0usIo3w4+qceBinsVQyaorr6DH+YiRP+Gax5dPK8ezzGjYYE/XQfY25wXH48PMcMP3OafAd/LcFTh7xPfv42YcC+s+4q4Df+qUHY//kfuoYO7V1IPe1ZWhDk/BiX7us6sqv9rj5xRZXBG8uKK/JgTzo+PtXK89O1Qlf8SccLdME153ztCPNdtGcKUOW44e839V8QPvFfS5hvekRo/qdvyqGPLGGPGN+ffcB+qt9WJ1HctYK8mxG5Ne+mquu+mEFvqnv5q6nZ8n2+o+s123q/PP+bGdwJw3Up772M9APq2ycalfh3+IRdzYxw1FF8aFw3t9xzVQXQb+t2wgPRundA3INKwr+bmoK25fwAFu6Cp
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztlj0OwjAMhQ0SDIhK7QBX4wbtaVk4AicoRTDTAqaWiV2H/MDAJ3WI8uLnOGkSAIDzGl7sSoBZMbZp30DH2hKoq4oxrkTT99WlO34jjKM5arq6fNfSPi2ftv9OikaLoeWEYG0ssRBJw9eQQ2vg4+cDxhvqxvdNM1FPjqbFPqpplfWPgRQfsc4LY/noP/XJRch8YoxPBc0rV36ufZazNujVDedmlc93Xj28c3reye1HOHxpzx9/8F/7k5bLwqa7GnVWNkubbvvUxboLfOZLz9xQb9/5UkK89yubTnuHp7yHXe8wfMPRdmwsb0SXlubkWxfJR4o9hcWb19GaM9feAJnxVLU=
+   eJztljEOwjAMRQ0SDIhK7QBX4wbNSTgeC0fgBKUIZhrA1DKxcWgaGHhShyg//rabpgEAOC3hyaYEmBT9mM55WjaWQF1V9HElXDdXl+H4TlhHc9R0dfmqpXNaPk33HBWNFkPLCcHeWGIhkoa/Qw7tQYxfDBjP943vG/emnxxNi3NU0yjvPwVSfMRaF8aK0X/qk4sh9aRYPxY0r1z5hfZZzt6gV+vPzSqf77S6e+f0vJHbj7D/0p4//OC39mdczjOb7mLUWVnNbbr1Q5fqXxBTLz1zh3rH1ksZ4r1b2HTaPXzM/3DoHoZ3ODpOjeWOGNIi2yK+L5IPj8Hrl2JYvLnemjPXXgGp1FVG
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30" visible="0">
+ <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztlGEKgDAIhXeELrX7Xyn6EYxQ8z2da9ADoeDpN83Wj9b6H5+JS+Pz+K75MpiaNI9VJ8J702yu5UW+QZasuiiL9UtzXqFo/1I9T351v5G9ZffRmzfjnsm6xxh+FTt7lruyK7kju5p7s1dwd4zMfxPJf3pZPpojedH+mbNqfmT+mgfNsWYv1fbUYOaIsj2K7B6zO5EYuSdJQcji
+   eJztlGEKgDAIhXeELrX7Xyn6EYxQ8z2dW9ADoeDpN83Wj9b6H9vEpfF5fNd8GUxNmseqE+G9aTbX8iLfIEtWXZTF+qU5r1C0f6meJ7+638jesvvozZtxz2TdYwy/ip09ywi7krsLu5p7s1dwvxiZ/yaS//SyfDRH8qL9M2fV/Mj8NQ+aY81equ2pwcwRZXsU2T1md7LiBFcfyeE=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="30" visible="0">
+ <objectgroup name="Mapevents" width="30" height="30">
   <object name="south" type="mapchange" x="224" y="928" width="32" height="32">
    <properties>
     <property name="map" value="waterwayextention"/>
diff --git a/AndorsTrail/res/xml/waterway3.tmx b/AndorsTrail/res/xml/waterway3.tmx
index 8dc1c2838..5a7e76b93 100644
--- a/AndorsTrail/res/xml/waterway3.tmx
+++ b/AndorsTrail/res/xml/waterway3.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="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">
-   eJy9VdsNgzAMRPnod/vDCoURgBGAsdmCKTpBhUrU6+mcxGnVjxOSX2cb21lC0yyAzsBoyGfyX4XNkPAfDd0hm86YA9ihbS7vWfh3EJd1Ub6eX67t7ugP+/cQl3VRvl3eQF6un/NV/UVejIuxWc7g+jlf7i/yK14PFC/rrf+Ldm144ZtcrPywP9PJ3YoZ/jU39of3rQe5J17sU2mvrF31cKp9yvmoXU3Vo+TWDpf226qT64k5WHwl3CW7WhLfurs188kzbt1wxYV9rJ2VPnzeBd5/tsG7661VvQ/qhg/CJhd7T+j4fbDmYk7YKL49w1s6c9HOw3ngcfX/gxowb7j9n/PAE0cANIY=
+   eJy9VdsNgzAMRPnod/vDCoURgBGAsbsFU3SCKoKo19M5iWnVjxOSX2cb21lC0yyAzsBoyGfyX4XNkPEfDV2UTUfMAezQtpT3LPw7iMu6JF+PL9d2d/SH/XuIy7okf1zeQF6un/NV/UVejIuxWc7g+jlf7i/yK14PFC/rrf+Ldm3Y8U0uVn7Yn+ngbsUM/5ob+8P71oPcEy/1qbZX1q56ONU+lXzUrubqUXJrh2v7bdXJ9aQcLL4a7ppdrYlv3d0z88kzbt1wxYV9PDsrffi8C7z/bIN311ureh/UDR+ETSn2ltHx+2DNxZyxUXxbgbd25pKdhzPiefX/gzNg3nDbueP3X5wRLw9XNAU=
   </data>
  </layer>
  <layer name="Objects" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJyNVT1PAzEMTU7qdhV3Q3W/oPwYQGVkAJUJiYkZVUjMSHTun+ovaK8DMx+V6FgKxG1M3jnOHU+KWiWx/fxi+4wxZmeNeXKLcJyZBmzfRPjM470uG8QG7NHXRvH7anXboeO5TvDW/JT95u9tL/aN2PqzdcudMpHnELh8CPv7XvBNmPv/MxtyIPsfe9hDoFYpjYkT2X/bYEN+TwtjVnng9mWbmtXgeyX0e1M0aNOOuS2cn7GLeyLWeRHHYCyBYw3aEIgvn6e0qdzZRXG4N8jCWeU1+EPpeLo1Uvi1LeKO7/veogOD4i7yeI+R0n6Zi/ueM8XfQVzWW9Y92dwcBT/ku6GBOfBindgPaUV1VCv39yjjOUHgGj5TdLsG/m2ossCdeUvtuO9Ye9aMucp3ZwwyvWc3UDtavZ4IDXaid1SNEkj1baX0IufNupIeI6Ep5pSqA4mu+a29k9T2P0jxaMwOH4tye1Fqn+KSHsw55TM1ixmk4RZ0ZEyc/4eima/WJ+gnBdQV53mtxHt0687HiPpcwf4O9D9ymXfMoAnEe3ZrCvlyjY1hts38d1X2OM4Ruie/IQs4J1z6mFORU6q2JGTfSyyVc871qqMno9mWmk0d8wpjarn+AoC9fJk=
+   eJyNVb1Ow0AMvovULRXJUOUJygvAUxRURgZQmZCYmFGF1IkBic59qT5Bkw6w8lOJjiXAuT1zjmNf+aRTotzZ/vyd7RhjTG2NeXQLcJiYBmzXtPCZtr/ts6FYE3vqay34fbWybd/xXCm8JT95t/m86bR9U2z83ipyJlfy7BMuH8z+rhN8A+b+fWZDDmD/Y3ffKKhWmsbACey/bbABvyeZMcs0cPuyTc0q4nvJ9HsTNIhph9wWzs/IxR2wdZa1YyBKwrEi2gCAL+5r2hRu7zzbneslYa/wGvwhdzzdGgr8Ygu40/t9j+iAgLiLtP0NoWlfpuy85wzxaxIX9eZ1DzbXB8EP+G5oYHa8UCf0A1pBHVXC+S3y9pwAYA2fCrpdEf4xFEngjry5dth3qD1qhlz5vSN6idyza1I7Ur0OmAY16x1RIwVa3xZCL2LeqCvoMWSa0py0OuDYN7+le+La/gcaj8bs8LEgt+c02JTkTkEP5Kz51GYxAjTcEB0RY+f/PmvmK/UJ9aOB6krneSXEm7h169ZDV+hzAdszpP8pl/meGTQm8Z7cmpJ8scZGZLbN/H+V9zidI3CO/0MWZB9w4WNOWU5abXHwvucohX3M9TLSky9ZmG1HTv9jqB2seeGJNjF/EyXXX0ldgT0=
   </data>
  </layer>
  <layer name="Above" width="30" height="20">
   <data encoding="base64" compression="zlib">
-   eJy9k9sNgCAMRdEJ5MvR2EDXVycQokRspNyalvNDaUhvXzinzzLpxVoVYyFxs1+zhjJ2Le5fPaQ/waAWJF9Ed4tvduX85lE3HqWWc2unrKCzaO2wRc8TFnvGYflXOXrpWc2JkvrYUytD+yjJAflTnNYLj2kmAtAryT9A60V2TrKXveYtpZZX6c82PVt8va3dS//ob9tf9hHtwT93TvsEY2o1uw==
+   eJy9U8ENgCAMVP8m8nI0NtBJXNBJ1AmkUSISKYdpuY+Fmrv2aJtGHtMgxzULciG8/l6yh5A7xftXD/HHKvSC1Ivobu6fXbi+sZPli5GqOTdTGnUQ4rfIzbCG5wSNOeOguascaulpvVMM8rGmlkfsY0kNyE5xWi8YTJNgAa9K9gDtF5m5krms9d6c9vqh73Op75rJIQj7TvkQ3nfmjs0VHy5uzXOm3NJ/a51aSjv0
   </data>
  </layer>
- <layer name="Walkable" width="30" height="20">
+ <layer name="Walkable" width="30" height="20" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztktsJACAMAx3Bpdx/JfFPREzS1oJgoCBUvfTRaintR1oMefIe7u7vk6KYqiL6g2r1eMzqQxZXfWvlol20stEd1jfjXeFGzEvJR3Fv8+b/17PS/xfqPUmpl/GCpO4b609hsl69sswC7QaqZZfr1t99Lg==
+   eJztk8ENACAIAx3Bpdh/JePPh0oLlZdNSExQryBab81+lMVUJp/h7u6+ScVkpeiPV2vGY1Ufqrjs2SjXm8Uo29uD+ka8M1zFezF5Ffc1b73/tH7Nrar3JoaLePHEzhv6Hxgm6jUrtFfKudrFAJi8gdQ=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="20">
@@ -165,7 +164,7 @@
   </object>
   <object name="sign_waterway3" type="sign" x="256" y="256" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="20">
+ <objectgroup name="Spawn" width="30" height="20" visible="0">
   <object name="izthiel_3" type="spawn" x="32" y="416" width="160" height="160">
    <properties>
     <property name="quantity" value="2"/>
@@ -192,7 +191,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn2" width="30" height="20">
+ <objectgroup name="Spawn2" width="30" height="20" visible="0">
   <object name="frog_3" type="spawn" x="256" y="96" width="640" height="544">
    <properties>
     <property name="quantity" value="4"/>
diff --git a/AndorsTrail/res/xml/waterway4.tmx b/AndorsTrail/res/xml/waterway4.tmx
index 392a14d75..944324044 100644
--- a/AndorsTrail/res/xml/waterway4.tmx
+++ b/AndorsTrail/res/xml/waterway4.tmx
@@ -130,7 +130,7 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytVtFtg1AMBNTPRoIh6FLpDl2gzX+7QHcLzRJ0geIkDsfJ9vNLehIigHnns++ZtEPTNMvRyhnw3a4Hot1dzsNuvff7bMcgZor56OGC+E8Uy+/eC8nrsPC+91v+I6z/E3BxLcauaV66y2+tgdz7hDh9rjgQN2PsVi58d4Tfg1FfD2/AhdybGhv9v9XBeCbAHlte+Op97hpgPdUHnicVHvdEvcVrywPsQ82H+VE/c7/eoVl5BOyfCMiN9fY8bek7g3o+gbdZu2Jf6rXhI+5HKbejcS/ymRWfWbOUh8ctvX4y9mY0UzZw9lqJO7W3lnW7RP0zue49fzv5z31eVwRLc8bDHGP1vFQ/z9/S78gjHvSdUu8y82QKZrnXT1mzNJs8j2H92O9RLSRW6pjxa2meWLowF8xR6qNaajR73LiuBc4tq7n62xHMC9lzWc3Mfcu18L/M0q8zJqtZYxVV30vM7zrfVEdtvTk+8+3gPGrqHWnG/16iCeent7/u8VgUL5z8vbCe/ZfmM7Sf1zP2QDlneO9RzZZ/TzQ3lBNrUeOxR7zN57bC35nZzVoFf9ByjQQ=
+   eJytVttRw0AMPHv4JDN2EaYB6Cb0QAOQPz6gAXqLSROmAaxgxZsd6U7nsDOZ+CHfaqU92e+7lFKfUjP/HufjJzmf8dWsP0Sz3O9367WfezsGMVHMWwcnC7/iRLH87FZIXoeZ97W75j/C+t8ZLq7F0Kb00P4daw3k2gfE6X3FgbgZQ7ty4bMDHPdGfT28ABdyX9WY6i+41MG4J8AeW1747HzuGmA91QeeJxUe90i9xXPLA+xDzYf5UT9zP2/QrDwC9k8OyI319jxt6TuDej6Ct1m7Yl/qteEj7kcpt6NxLeczKz6yZikPj1t6fWfszdxMuYKz10rcob01r9sG6h/Jde/528l/6uK6crA0RzzMMVbPS/Xz/C39znnEgz5T6l1knoyZWe71U9YszSbPY1g/9nuuFhIrdYz4tTRPLF2YC+Yo9VEtNZo9blzXAucW1Vz97sjMC9lzUc3Mfcm18F1m6dcZE9WssYqq9yXmt8w31VFbb46PvDs4j5p65zTjt5dowvnp7a8tHsvFCye/L6x7/6X5DO3n8o89UM4JnrtVs+XfE80N5cRa1HjsFm/zf1Ph78jsZq2CX+gujgU=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
@@ -138,7 +138,7 @@
    eJxjYECADwIMDB+BWJWJgSIQLkCZPD6QjkdvGgFzCcnTSi+xABb+pMoNFMAXF7QElKQfSgA90gAyoEWcD8Z0NNgALcOIHuGPzw56x/2HEZrWRvMZdjBQYcIoSDuzaV1vk2sGLf2MDNDdN5DpnhZ2w/xHKB5u8VDfblzgNg/typgPeOISnxy9AChd36FjWMMAMWmAmgCWf5Hz8V0a+xsAefs0Mw==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJzV1EsOgCAMRVGW4KbY/5aYEqLQz7sgTZyI8VBaWp9S6oGnj7d34xrhzuIvrmI/VpM4h2yctEffsx+1+7VG2kqX7gc66D7rDasbmSve7z3uqm8Urvc/1tg1TyIuUefdc/Qml7jThG25ixk7chYKN5J/1M3WmnQttaFtZb4rl8w322M3uhG7ATvRkBs=
   </data>
diff --git a/AndorsTrail/res/xml/waterway5.tmx b/AndorsTrail/res/xml/waterway5.tmx
index 251da5e2c..b1cc760ec 100644
--- a/AndorsTrail/res/xml/waterway5.tmx
+++ b/AndorsTrail/res/xml/waterway5.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">
-   eJytV1FOwzAMzcQkpLVFVIJvPjjBjrBzdHfYBYADcABOxQm27mcSX/BVaf/Eaqy6xk6dhCdVzRrX9ntOnO5w79zeXxre/dwhzKPdsZ7mz2F8qufvXSI+AZ2ff/PXa8SuY3EtONfy8yE8Rz4xnxgX8+vRZ+vcqp34c85gh7xhzHPpMrT+DyzFRRst7oxH0ADBNWibuU9rjakd9dkr9UTQdZZS4xKtYzmlaI2cY/oehVjIOVXrXM40juYzlTNA6iN0D1EMZB41smhdUmeJN6xNi9YArY8MQt8AcN58nVm1ppwteUqx+JyVs6Q36ijtVYR2Xlg5A6Q1FgPPQfKXy1kCX0/avirhTDlJmvI6b8m4qW17iuYIoPbcv1bXHftt1RptAZo9zYHXmJ/JKVrzffUS4sf6IwXtd6cErQEds5Peo3mgBrfCWbpb5V087iVS9+eQC+oNd9Qvtc4Yd2m/Ar4q567VOKZ6l9SZ5wq8181c7wc/fmT51euJh5VzrH9yfG7muj8Rre8K9Kb2wBNiUO37zXjn334fN395lPQSDd++vj/VyFM6t3J6yT7UVFvT2v8KihS9tW8Day/Jjb20tn8BwoSlmw==
+   eJytV0tOxDAMzYiRkKYtmkqwZsEJOMKco7NlPRcADsABOBUnmM+mEitYVWJPrMaqa+zUSXhS1Uzj2n7PidM5bJ3b+0vDm587hHm0O9bT/CWMT/X8vadG9wnovK9Xf71EYncsrgWXWn4+hOfIJ+YT42J+Z/TZOrdqJ/6cM9j122nMc+kytP4PLMVFGy3ujEfQAME1aEndU2pM7ajPs1JPRE98p9S4ROtYTilaI+eYvkchFnJO1TqXcxvZyxatMT8AzVHqI3QPUQxkHjWyaF1SZ4k3rE2L1gCtjwxC3wBw3nydWbWmnC15SrH4nJWzpDfqKO1VhFRz6s9SO2mNxcBzkPzlcpbA15O2r0o4U06SprzOj2Tc1LY9RXMEUHvuX6vrjv22ao22AM2e5sBrzM/kFK35vnoO8WP9kYL2u1OC1oCO2Unv0TxQg2vhLN2t8i4et4/U/SHkgnrDHfVLrTPGXdqvgM/KuZ9qHFO9S+rMcwXe62au960f37H86vXEw8o51j85PjZz3e+J1jcFelN74AkxqPbnzXjn337vV395lPQSDV++vt/VyFM6t3J6yT7UVFvT2v8KihS9tW8Day/Jjb20tn8B5h6lGw==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
@@ -191,14 +190,8 @@
     <property name="quantity" value="2"/>
    </properties>
   </object>
-  <object name="gylew" type="spawn" x="96" y="704" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="gylew_henchman" type="spawn" x="64" y="800" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
+  <object name="gylew" type="spawn" x="96" y="704" width="32" height="32"/>
+  <object name="gylew_henchman" type="spawn" x="64" y="800" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Keys" width="30" height="30"/>
 </map>
diff --git a/AndorsTrail/res/xml/waterway6.tmx b/AndorsTrail/res/xml/waterway6.tmx
index b79501f28..4d32aca3e 100644
--- a/AndorsTrail/res/xml/waterway6.tmx
+++ b/AndorsTrail/res/xml/waterway6.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="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" opacity="0.99">
   <data encoding="base64" compression="zlib">
-   eJzt1TEKgDAMBdDq4KzH0dFVry1ewlN4Au1QKEEl+T9UBIc/P/MT7NaEsCmyEOnrEAYRjRmzEu50OrOI1mVtxk0246dYXennKeHm/lhhHbB2dNG793K1ecvdW95G3Lrj+0bnlbbVR+fNu0Z89K6u5rXYqJu6fpr7yWf2e7dnzTd47NdiL4Qru7XOnf+fmXdKs2fper2N1q6RXPV6N6+lB89evXso0au261Km5+689/vnu/stfc8H9DnMOw==
+   eJzt1TEOgzAMBdCUoXN7nDJ2hWtHXCKn4ASQIVJkQbD/t1Ihdfgb4uHviKRnCEmRSOQzhDCKaMychXCn3ZlFtC5rM26xGb/E6kq/Tg+39r8PrAPWzi567r1cbX7lri/eRtzhzfeNzittq4/OW3eN+Oi5OprXYqNu6bo1d8tn9nu2Z803eOzXYkfCld1a567/z8w9pdmzdL3uRmvXSI56PZvX0oNnr9499OhV23Uv03N33vv95777Re6k1juvntkApq3LAg==
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9VztSwzAQlVNQmUEaSkJJSwOnIAU9ZqCihQsQehioORIngALsycABUpgLIGHv+Gm9kj/57MxOFEV67+2uflEqbk9aqTvrD9bnuurL0+rzRzfjzG57bpn633/T9piYZTU+cRNeznA4D9c21Chm4r6H2J1hrMSDfUcTpV6Tqv2YjOdGfvS5EBvPCemRxsa4nxk/2qXQXwprgXQP4Y7xE5a0xlDDd9peq2P4nZEOKf+SU92kHI3V0cedZSvEvKrOVfK9Lu7QntgkN18fm+ZPjFJFWu1zzr8RbtM0P9nZss3cJ8bXIOV+G/nPGf+66/8fp/H7viDvBbR5Dpz1OaPQiXMZu5NNk3/Ukwmxvu30c4e3IE7AJp6C6cF7jfPeDjgnz8DPtWrlGuPjxs/jF+3r9Oqk5X5nM/jNxcv3FfWjXdg5N3uyLm7S/ejwZnW8HLuaJGOh1n3AzaF2XXgOg79LghgGtAZMqk8hjL9i9e7j15ppG6CBzMuHac5sT2/XG1jIK39bYZ1p7DLwNg7pjcXBNWL9UV8rV5E1IfYrGSdUg0VEM99LFF/oPOmqQ2gvheZ1rRvJCjhHDux/hsNJj0l1Lk+svtNa47vF+eh5/5S6mu/4ptaPa5/W/gc9zp/G
+   eJy9VztSwzAQlVNQOYM0lISSlgZOQQp6wkCVFi5A0sNAzZE4ARRgTwYOkCJcACnyjp/XK/mTz87sxNlI+96+lWRFqbg9a6UerM+tz7SPZan/nA7LcWZYn7tKq9//0vqYmE0KPMKmfBnLw3Gc/epuWGhUM2E/Qu3OsFbCwdjpQKm3xD8/Jf2xER99JtTGNSE+0tgY9gvDR7sR4qQ913se4NkHn3JJaww5/KT1tdoH3xnxkPSXnPomadSXRxt3Ntmg5k15bqL3trBDe2KX2Hx97Bo/MUrlqd/nHH8n2KZ8/GJnyz61T0yVg6T9PvTPGP62+7+u01Rj36B7Ds9cA2dtzih0wlzG3smm1B/5TIRa3w/aucu3IEzITTg544PvNY573+GcvAS/0qqmNdbHjZ/Hr7rKs9InLcedjeE3Vy/fVxRHu7ZzpocyL27S+9HlGxf18tx+kpwLuR5B3gx615TP5eD3kmAOA1wDJvUnF8bfsn638TvNuHXgQFbRw5RndoVv0x1Y0JXfrbDPNHYZuBuH+Mbq4Byx/8ivplVkTYhxJecJ9WAR4cz3EtUXOk+a+hDaS6F5TetGshzOkWP7n+FkEB+/rr/Q8tzyuxj62IfN86kb/vMU+q+0n+/wRtbPCh8V/g87aqIf
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNlj0OgzAMhaEzA5yuN6AnLRsLN2jHTqUnIJaKcCNbTWzH4UkoPyL5bOslStOU1dIXBjhzcrTH5BkbsJ5f3qNCTTC/JCPuA9OyzjdiL5wX19fqmrnXO/y/GvBzuaB2qMOtla8FW8rVSpOvxmMSP1tIW2evfFPYKfUfFVxcc4uzdQbNiTWk5qzuVIrD+Vvqe6tYcXyS/eJ6e/uI87A0H2rdGd+YlLicS/jaS3vskhz+rY29m7Mn1j2MJ3SOPuG7DEcr9SUXezxHMaGFd9rS03fMq/sdb1y+WrI=
+   eJxjYKAtuCRAYwvobA8pAOYmeroNZNcjqH0PByBMkO2npR3obJCd1AzndCxmIfsLF5tSEE6iWR+A6j9SwX5S7QUBRsGBsXeg/EsNu8m1l1JAiX8pSWPkpGdqAErDmV7+JcZuYsI/jQJ7kcOcGnlrMICzRIYhNjFqlanY7MGVvslN99RyK7L7yDEPPbzpnY5wpWFy/YNN32BsY2IDuPxMi3RNLwBzOzl+IKQXPe0SMgedDQNHgfxj0HYoSP4TEDMJImhkN5DjD0L1AjY7QTSonYYr7b7iQeUDAAvTXJU=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzFlcsNwDAIQzNCl8r+K/WKEBA+BpC4tHEeBtTe75z7SC2sd/xcNrNRYUbY0rkp9qumST7VbPhHMClbqoN7RLPRPia4G9rq3Ks1Z/nV+Wb3Huk3wkbtc5SP4Hpj0q/Gr3C5D8kbMqxeTUYXU+vhq9fomrS9zDAjuogHT32eO6h+a4+8M/bex59Z3O7w+urc643ZUm7222xprb5qOulOz/9H0/P8Ae8smBM=
+   eJzFlcENwDAIAzNCl8r+K/WLUCBgHLDEpw05DKjd31r7Epa8d/ocGqgqzAz7dK6Lfaupky9zJvwzmJJ9qkN7ZLPZPjq4E7nVuVdrRvnV+aJ7z/SbYbP2OctncKPq9GvxK1zt4+SNKa9XnXrFtHp46zW7JmsvEWYmL+MhUl/kDpk/tUfRGUfv08887mtFfb3c64nZSi76bfZyvb4y/iNI/KDDmmY=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="30" visible="0">
+ <objectgroup name="Mapevents" width="30" height="30">
   <object name="north" type="mapchange" x="288" y="0" width="192" height="32">
    <properties>
     <property name="map" value="waterway5"/>
diff --git a/AndorsTrail/res/xml/waterway8.tmx b/AndorsTrail/res/xml/waterway8.tmx
index 3ba5a9e9c..97c70a4ed 100644
--- a/AndorsTrail/res/xml/waterway8.tmx
+++ b/AndorsTrail/res/xml/waterway8.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="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">
-   eJzt1UEKwCAMBEB76cP8e/ATPkY8eBGtSbtuoLiwV0fUoNwhiLIZWLb35O5wTk//WsTMWOcPNat1jXjx3ezsWs8oKYp2+3cx62pPu9zVnqqbjHeHcFst/9pX9+3/zXBHPtMVR1ccXY+2sD2WOwvbQ7ijNbSx3jkjbI+RAj6YlP4=
+   eJzt1VEKgCAMBmDbQ6fwCnmI7j68hIcJH4KQTV3OCdHDDyG0b1pD3J3DziTFWHs1d4bz589XozEz0vnTmtVc49zs3bTYlZ5R7Ii2W/4XXFo9zXJbPWU3Cr+dhntHcq+Num/vbwuX8i1dXOjiQndFPDgXwN4LRm7pzXY5T8PNtT30ex74d8o1zqJq1vbH9UCtS85t1OvdhyfSqnU8ni97N6eH
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJy1lb9OwzAQxk3mIJmZ8giwUsZSJjYEGzxDu1dJulvhDVOGPEKeAFvJiYt7fxzSnPSprWN/v/PZlxojx8EaU3gdvXZe31ae/3StGCqcIuLVDPNR4EjPCoFTC7z/BK5Fbc91Cc7zlTEbQUtF4H54vXm9D8K/l+RCSOe8JHepoHqH40K/zIm450rkF7hxPgfUL3PiE/Xc3usr4nLz5/ZL8Km8tp7xMkGvM7lu2GfgHqP9SnmW9vx9RakU/NzAxe+bNdM3kGeVuN9KyWk7oWcc8X6ktFdyg/PV6jPlf6rJ5fwgJ9jvDtVROx+ILu8/bxLzam1/T3CEe+VQThJf44R8TsO6Jh8/i2sR7lVrx880fvD8QeMtU6Mup8cpP4pfEns4MSyqJnisZeqBc3QEm5sbe1H8mEXNw3sHNne+3NqpgWvY5X9seAa+mj93Ftw4jtvMmJXXQ5a2D+ouhXXc3Wvt2BfzQJQ3d0+4M2mY3qd4MTc1pDubwgNBjtivI3or5oF30F3Wr9F4KyTOB9cM8sBzpL2kiPMBfmrd5vKoeVrNUr3u0fdfANWdow==
+   eJy1lbFuwkAMhlPmVLrOFc/RdmzpVImharf2GWBHBPYofcPQISOIJU/QsxKLn8P2JaSxZAG+O3+2zz6SxJaVS5K1163XhdcfZ+9/uo04jHDWAa9QmA8Gx1pbG5zC4F0jWIvCXep/cF5ukuTZ0LGEuJ9e371+tIq/x+SyWPc8JncskWZH4/K8DJFw5jLwR9wwnhXMyxD5gplbev0OuNr+ofNCfjZeZ57x2kPfBnLzNk/iboN8rTgzd/leSZoZ/vKWi+/NozI3HOemY76bSEyzHjOTC++jpMtIbHy/sfr0+Z8qUzs+jonzXUAdY/fDUqfN513HuCrX9AkK9VUOMVn8GIfi2bXnyvR8LawF9VXlztdifPL5C/ZKqVGdynbJn8TPhBx2CkuqCdoqpR4YYy6wtb2hL4kfsqR9mDuztfvVzvYVrGGdnti8xn5j/rW70Owo95PT9y55SL1E57Teq9y5X+YdW9sB1tC31ifanZTK7GN+Q8XqWeTtwX4I9tAax1gquWtvBuYynTRnrPzmrZ+j4Idt5AdrxnFgHmEOoT9eJ/u8Q8/hmenkxLtWiMn+6PtRqf9euK8wF4wfz7J9n17uQ6Ezf9Ljod8=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJw7K8DA8ImHgeERkAaBS1BakJeB4S6UTQtwF8keEHhEQ7tGAW1A+gDFWfiovaP2DmEQycjAEALEgUAcjIRhYkGM1LdzpOXVNDrZe4kO9pwlwQ5y3INsPj38QykYCm6kF8CXNkhJN7jUkmKGNBPxarEBXPFKbnxTM50gh8NbHgj9mod65lMbkBJvyOAVkp/Q/fcKjU9s+JLjFlhaeosljLGJoYNXOOIIXS9MHiRObPpFNpPSNAayE2YeiP0WR/ijhz0IoPsF2f3IemWZUM3A5U+QHgCUIzJq
+   eJw7K8DA8ImHgeERkAaBS1BakJeB4S6UTQtwF8keEHhEQ7tGAW1A+gDFWfiovaP2DmEQycjAEALEgUAcjIRhYkGM1LdzpOXVNDrZe4kO9pwlwQ5y3INsPj38QykYCm6kF8CXNkhJN7jUkmKGNBPxarEBXPFKbnxTM52QEg6DAdDDvcSGLzluoTQtkQPIsZPSNIZsJ6V+xqVflok4dSAAAO7yHh4=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJztldEJACEMQx3Bpdx/JX/lIJpe0xbBQP+kr8aoo7c2Xl1bJ0Vyq/b7uLVcxUwoo6i3Ks9/pfKU7aXmRnik5nrOZ52pgotmicyjh69i7NaeuN+cq8Vwrf2s7AplcNF5W/lorTXfHrEzsPdI5f+N79XOE8WfxPqfVdm86JrYhrWg
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="30">
+ <objectgroup name="Mapevents" width="30" height="30" visible="0">
   <object name="west" type="mapchange" x="0" y="416" width="32" height="480">
    <properties>
     <property name="map" value="waterway13"/>
@@ -164,7 +163,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="30">
+ <objectgroup name="Spawn" width="30" height="30" visible="0">
   <object name="erumen_2" type="spawn" x="64" y="416" width="288" height="512">
    <properties>
     <property name="quantity" value="4"/>
@@ -206,5 +205,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="30" height="30"/>
+ <objectgroup name="Keys" width="30" height="30" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/waterwayextention.tmx b/AndorsTrail/res/xml/waterwayextention.tmx
index d820d8119..37f820c4d 100644
--- a/AndorsTrail/res/xml/waterwayextention.tmx
+++ b/AndorsTrail/res/xml/waterwayextention.tmx
@@ -1,170 +1,169 @@
 <?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="14" height="14" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="16" height="14" 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="14" height="14">
+ <layer name="Ground" width="16" height="14">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcHQE4jtQTI6eO0Tqx6aeGP3k6KOnXcToJTUsBzo9wDAAbkugRw==
+   eJz7JMDAcJRtFGPDd6CYEr13SDQHmz5SzKFE/0DaTYwZ5Ib9QKcjfBgAGja2sg==
   </data>
  </layer>
- <layer name="Objects" width="14" height="14">
+ <layer name="Objects" width="16" height="14">
   <data encoding="base64" compression="zlib">
-   eJyNkk0KwjAQhac0dKEJ1pUrEb2EeAQVL2DrAVTQvbS6Fz2aF7C69wiuxBkzIdOfhQMfQ9P3Oi9Jgy4AIAEyjQBmyAZZxgBrfibmkddR39JaCPDUtrtaxXaN/D1lubUAXqH1EFQDbTvp7rrsp/q08Tvoe4d+XlHRHZCMyZEHv39yl/OGBmBkrOeE7JA9chR+KspCnt8+wc9wnityRi5Nfs5JORLWX9gjS/rT2Od02dKKnmpsfJ6T8FHORGSbmLqXSmrcvITz53F9zsSUZ2nl7/8s9i69TWe1EPM6quzNKnp3Vn3FdynufSHOXXLlbHfWFHx/8t/9F/rvv/2pTGQ=
+   eJyVk0tuwkAMhl0lygIyalixQqi9BMoRKOICPA4ASLCvKOwRORoX4LHnCF0h/OOx4hnYYOnL5OH/t+NJiIg+WnxoydrPiH6YOTMqiGb+GgyyOk/XxznHICG65LJqTAu5B592KhwaRNdEWGSCRjeXFfnHPPRB3Jrsx/r/RLD6U5T/y6w9f8zZP7+YPNXrvS9H9O1Eu2WWzIrZGB8EeoNf3L/WVG3F7Jj9C59Yj+ux1+291ob1mRRh/8Oi7nkS6RA9V/enOdBAi/07mdqoW7pnD4TNsfX12cbMyNYt3XN/8fvvzIysx6uZovc8DfWfaeixjnQ6004a7r9+v5jB0OyXpfL1jj5HvzXo7f/xLvjH7l4QVNY=
   </data>
  </layer>
- <layer name="Above" width="14" height="14">
+ <layer name="Above" width="16" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjYKAf+CBAup5fXAwMqWTog4GPZOglx52UAnLcSS4A+Y/e9tEbwPwH8ys2P2MTAwDZew+B
+   eJxjYBh64BcXA0OqwEC7YnCAjyM8HAba/x8EEG6AsZHFsKlDBgAC/guA
   </data>
  </layer>
- <layer name="Walkable" width="14" height="14" visible="0">
+ <layer name="Walkable" width="16" height="14" visible="0">
   <data encoding="base64" compression="zlib">
-   eJxzFWBgcMWCQQCbOLoafACfPnL0kwqw+QWbHD59+NyDrgaXHYTCkBr6iNVDrj585hAbLvj0oqvHFw/oAJ99pGIAp2wnLw==
+   eJxzFWBgcMWBQQCXHLo6QoAY/cSYRa79+Mwilk9IP6nuxCZOSnhTWz+pcU1t/YTMwKUOxsdlBro+fPbjAvjijxIMAOU8KS0=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="14" height="14">
-  <object name="north" type="mapchange" x="192" y="0" width="32" height="32">
+ <objectgroup name="Mapevents" width="16" height="14">
+  <object name="north" type="mapchange" x="224" y="0" width="32" height="32">
    <properties>
     <property name="map" value="waterway2"/>
     <property name="place" value="south"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="14" height="14" visible="0">
-  <object name="izthiel_4" type="spawn" x="32" y="64" width="384" height="352">
+ <objectgroup name="Spawn" width="16" height="14" visible="0">
+  <object name="izthiel_4" type="spawn" x="32" y="64" width="448" height="352">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn2" width="14" height="14">
-  <object name="frog_3" type="spawn" x="32" y="64" width="384" height="352">
+ <objectgroup name="Spawn2" width="16" height="14" visible="0">
+  <object name="frog_3" type="spawn" x="32" y="64" width="448" height="352">
    <properties>
     <property name="quantity" value="3"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="14" height="14"/>
+ <objectgroup name="Keys" width="16" height="14"/>
 </map>