diff --git a/AndorsTrail/res/xml/crossroads.tmx b/AndorsTrail/res/xml/crossroads.tmx
index 3a856bf4d..b29173022 100644
--- a/AndorsTrail/res/xml/crossroads.tmx
+++ b/AndorsTrail/res/xml/crossroads.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">
-   eJy1lEEKwjAQRYuFdlWwV/EGHkc8gXi+UvACgicQl65caqEh009mJjOJi0+haefl/5lk6ppmEjSvSq0der8kpsY+9rJKuZpvThLfUkdjW/ph4VL2bYiau62sNS3sxxCF3H/xl5qnMYrj1mSHepcximaO2ddkol+aeSr7mlzq95yQxH3vfexXu/V7TUji7ka/52cb/UpzVdPvos+Pe19lZXr8Yp8tXgPT49fKx76W+K3BLuWm2Km10nnW2LlrNHPMHt9zT8++aNaYPTKwlrVXlJ3yx/nFOp7ZDOzcLNFXzlnk1mdhTaqZ21/vWeX+ye279p22X+s552aT+0batzcnznfNuyMnp8Aruact84978pwhrY/aeadZe+4p7KNlrr9Jh4dn
+   eJy1lFEKwjAMhoeD7Wlgr+INPI54AvF8o+AFBE8gPvrkow5WmoUmadL48DOwNV/+P23noetmRnFVae0w2sUxJfZx5NXKlXxT4viaOhJbMw8NF7JvU1YcttLW1LAfUxbm/ou/1DyFLIrryU71LiELZo6z92RivzDzUvaeXOj3XJB31kudV7/1ey2I4+6C3fOzz365c1Xivvd27ufHva/SMi1+8Zw1XhPT4lfLx3Nt8evB9jrjFIdie3Cp+hIbzhv2gn+nvq194ewxQ9pvZUt+pf0adm2W2FfNXaTWI7PG1aydr/WuUv+pnbu0T+pXe8+ps0nt4fq25kT59nw7anJKvJZ3WnP+cU+WOyTNUbrvMGvLO4XnqMnqC6khiTQ=
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJydVr1OG0EQXiTsK7yRz4g3oCGvwkkpEgkkg0SDJX4E6aNAykgR1DwAjwAVbVLxCPadJYSgckGKUDOTvTGzczPn4z5ptOu99XzzzczuXeKdG4MhChhXP4T5r9S5r2mYz2D9DOanYJ+7zn0BOwK7Tpy7SdqNxDMtuTk4N4K4Ecj7G/7/J2k3PvWCTsTkHdwHwLtRY0OwqySYpvel9+ZzynJ+76vcM1/VncPaN5j/SPW4hkZeUK+mc5FuC6N+4P6+IC+od6r0FcUyVXRLbBrxkPZDsA1hT2We74Vm4ufg+UTcrui8M+ZrR4kJa8PrK/NdsN+ck/zeGbwcvBewd5DjwQe9ieDTztS24tvSK4GaUUPO/JJezOtYPHtkudB4ud4c5j87YURssf2Ua55P3s98fU3UV+sprncG88tOGDW9cwzCgHp5D8n+4jXeNuq7vuzcR7Dl0s9+P96HvKipEHr/9eI1guwzLdeIUU19T+DZhfJc3leIQjm7iKZ3BwflGN8lHF0f4u14fY7gv5H73ODn57Zypw7ivfIeaWLHqa591Nc1W9yytvwsjdlc1tvK+4mSE4tbQuszib1ulZv6COM1398G90MDTg6q+TnrXYrb+m5BLA3iGORvua7tH5a+MAe5f4vd0v1eWO/qLA18e139eZszSFgqNco64HpGPo185L763TL3afxnvl6DLI1738Jcd+lzIu4qs9+NunO9FnBfUermoHhzJe5I76CaB6pvtH9Bjij/iEmN3k81d9huA72ahomP3/v/8y10ZS360eobibpv2oz1Q1NddJbR73PLuDW9dTH8TQMXjREa3lNYA9JbF1uTfODzV62H3KY=
+   eJydVsuKE0EUrcCke5GSdMQ/cKO/Mg2CIyhkBmRgAj5wZFyKj6Ug49oP8BN05VZXfkLSnTEOzipbXVvHqpvcvl230smBS1W6KvfUuY/qzq0xU2dA7cYb14xZuPF9Yczzwj9fut9v3Py1s4PMmHvOnjr7nBvzJd9tBA8wD9yEs6zJDRA3AN5v7v/f893Gq4HXCcy24H7s1vYTNnb2KfcW0/t3sPY5ZzFf2Db30rZ1V+7ZSzd/W8TPNVbiAr1Sp0RMt4bJ0HO/2hAX6J2LuuIxp7WTBPd95Tyk/YmzfWFXIc4LoZn4CeDl8QS+Xo/zLpmvI7d2HHqAgNzw/Mp4U70dC07y+0PhjWkGUDvguLReby74ZE9B62HEt6ZXApqhoQp+L4q1XsR1ytaA34M0L9dbufm7vh+BB2z/UZhTPH8WzXrmcb7J8qvVM9e7dPOPfT/G9K4w8gP08hqS9VWzej5U8ntrz5jbzvaCn0fD5j7wQlPNfEPvn0HzGYHr12INTBL5PXVrHyLr8r4CatG7wDZ3Bwe0nok+AjLrz9u38TnAf4P7XOHnfdu6U0fNvfIe6WLPirj2yTCuWeOWueW9NGVz5Ptu5t/BB4m4n0ZionFLxOpMInZnUx1NbeL9rXBfduDkoJyfB84X2frc2ncLuHuj5hnkb/k8tn8cfCMGlV2fXdP9a8u+0N7VZeH5TrL4+i49SOgFjTIPeF6STyUelW1/t6x8JmLe21CHZdGsfQ0r3cHnTNxVar0reed6NWBfHXTz/NJ5q8i5G3pH7ThQfhv7N8SI4g/MEnrvJO6whx30xjTMbPO9/z/eQle5Qz1qdSOR+qYtlX5PcVIvb/pWTvmI6e16hhY63lPIAelNna1Vc8r4DzS35TE=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztlM8KwjAMxgPirvbi3sqDCnpWRM/zJfVx9KBnW7ZCF5s2CesU9AeltNvXL0n/ALzTVAD7Kj5fGsp7DP7eLY9p//sTjYfkEPjOUf61HZ9MeV/M1rSNYme1a8VeOd1Z6BvWPhVzipwu5lsHGqy/MfdE47uYxfVcT0fuLsV8j8FYW2dKe5kAXG3bmL5PSivJl/KVaqWejkZ5F7xW4/nLLG3NVl2jzjjnfbqbtvZh78HzVI/RnkG/puR/T+5N/QZwflS+eA+oec5eaPjEXeTUgaqfJO+ha4Xji81r16PQ5i2Bcxcla3LeEk5MOD7JuzQmkrxKoo3hBXelbzQ=
+   eJztlMEKwjAMhgvqrvbi3sWH8CToeTL0rC+pR/FJ9KBnO6TQ/SRb0nUVxA/GaJf1z58sM4amLoxZTtt7x4IJTswuk85fm9Z+ztrPXrAeiwX4L936YPNoh2zt5xqDU0ePKd2w9jW8e02UI6VbBlqomwpKdzWnde8u7qHw2zVLlO4+WKf2e54Yc3HXxrZ1EPSbC68bq7keUK+cPn8N7huviv6eNLPkZwpnC/e5OxI7N/5MTbynEmrevvSdhTXzcH6xB9y+pBexueZGUgeufmFcX39T1wrzo/Zjz+OI8aD1K5lFzZmSf4kkJ8xP81/SMmQOtL408RqkZ2LN3iXrcUE=
   </data>
  </layer>
  <layer name="Walkable" width="30" height="30">
@@ -204,26 +203,11 @@
   <object name="sign_crossroads_n" type="sign" x="640" y="128" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn uniques" width="30" height="30">
-  <object name="fieldwasp_unique" type="spawn" x="32" y="64" width="256" height="352">
-   <properties>
-   </properties>
-  </object>
-  <object name="fanamor" type="spawn" x="64" y="736" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="benbyr" type="spawn" x="416" y="352" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="crossroads_guard" type="spawn" x="544" y="384" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="crossroads_guard" type="spawn" x="704" y="320" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
+  <object name="fieldwasp_unique" type="spawn" x="32" y="64" width="256" height="352"/>
+  <object name="fanamor" type="spawn" x="64" y="736" width="32" height="32"/>
+  <object name="benbyr" type="spawn" x="416" y="352" width="32" height="32"/>
+  <object name="crossroads_guard" type="spawn" x="544" y="384" width="32" height="32"/>
+  <object name="crossroads_guard" type="spawn" x="704" y="320" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn monsters" width="30" height="30">
   <object name="forestboar3" type="spawn" x="64" y="800" width="160" height="96">
@@ -239,5 +223,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/fields0.tmx b/AndorsTrail/res/xml/fields0.tmx
index 773df582b..86eb56983 100644
--- a/AndorsTrail/res/xml/fields0.tmx
+++ b/AndorsTrail/res/xml/fields0.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="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="30" height="15">
   <data encoding="base64" compression="zlib">
@@ -131,20 +130,20 @@
  </layer>
  <layer name="Objects" width="30" height="15">
   <data encoding="base64" compression="zlib">
-   eJy1lEsKwjAQhseFLUhSXPQGgofpEbQXUEH3groXXHgWvYHu3dvGlct6Byc0Q6expdXUgSGTQPP1zzwAclMCSjYdAmTmLMZ4LPN44QH08dwTbmtq8RJRcMliE99Fzh1Id9d2YwxlcbVm4qYN3Jdoz5Wi7AH6Gjk7Sy+9A+dmX3Bs1/f5xkOZc/kbLzE+mP2zw3d+sPwm4pO7xXjD9l3mN5RF/jR3j5yVVc9UA03cY689l2qJa/93Peu7OE/rVaKa2/U7cwtq+ojPjV97x65nnuO6PqL8d1nPlN+0op55H5HeOe4jRyejHHMun1X63xKj9+QDnH231Z7PPLfaqvr3gt9dfbd1JAu9ysws6l/SzNkz5EboE0fdby6EfOc=
+   eJy1lL0OgjAQx89BSExLHHgDEx+GzVWZ3NREdxN1N3HwWfQNdHcXcHLEd/AaeuGoENDiJZdem9Af/94HQGaJgIJN+gCpPgsxHsosXjgAXTx3hN0aG7xI5FyyUMd3kXF70t6V3RgjMbhKM3HjGu5LNOdKUXQPfY2cnaGX3oFz0y84pqv7XO2+zLj8jZcYH/T+2eI7P1h+I/HJ3WK8Yfs28+vLPH+Ku0fOyqhnqoE67rHTnEu1xLX/u57VXZyn9CainNv2O3PzKvqIz41fe8esZ57jqj6i/LdZz5TfuKSeeR+R3jnuA0snoxxzLp9V6t8irffkApxdu9WczyOnvH+nTq73gt9dXbt1IHO9iZ5Z1L+kmbNn6AH62FL3G+qyfg4=
   </data>
  </layer>
  <layer name="Above" width="30" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFQxX85h4Ye7l5Bsbe4QrIiUdqxD058Tga9yMTBLIxMCSxERajBSjEYg82MUoAADxcBpQ=
+   eJxjYBgFQxX85h4Ye7l5Bsbe4QrIiUdqxD058Tga9yMXJLGh8gPZsKujNihkw7S7kMp2AwCAHwVt
   </data>
  </layer>
- <layer name="Walkable" width="30" height="15">
+ <layer name="Walkable" width="30" height="15" visible="0">
   <data encoding="base64" compression="zlib">
    eJxjYCANuApQB5MKyNFDDbOoZS+pYUBt/1LTXlrEH63iF5e5MHFq2ksKoJW9pIQzNeORnvGLbB697SXW3OFoL7rZyGLULCex2YFPnNw6BRkAAIDnFkA=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="30" height="15">
+ <objectgroup name="Mapevents" width="30" height="15" visible="0">
   <object name="south" type="mapchange" x="224" y="448" width="96" height="32">
    <properties>
     <property name="map" value="crossroads"/>
@@ -188,12 +187,9 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="30" height="15">
+ <objectgroup name="Spawn" width="30" height="15" visible="0">
   <object name="fieldwasp_0" type="spawn" x="64" y="160" width="64" height="256"/>
-  <object name="rolwynn" type="spawn" x="416" y="32" width="512" height="416">
-   <properties>
-   </properties>
-  </object>
+  <object name="rolwynn" type="spawn" x="416" y="32" width="512" height="416"/>
  </objectgroup>
- <objectgroup name="Keys" width="30" height="15"/>
+ <objectgroup name="Keys" width="30" height="15" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/fields1.tmx b/AndorsTrail/res/xml/fields1.tmx
index 456359a15..297c0428e 100644
--- a/AndorsTrail/res/xml/fields1.tmx
+++ b/AndorsTrail/res/xml/fields1.tmx
@@ -130,7 +130,7 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJytV0tOhEAQZeUKI6fwMN7A6NaNiR5gNp7As7FnwBUHkZqZF4pHfbrJvIQMdNNVr/5M0zTN0DYXPD9ef/Fs4a1b79+77d6Zzs3tfk90RPIFvZILGZHeWoztlc+k5DB34Xha9n8MvfrcqM5Nrb3OmBP7ta3fy/1vt3KKgPgxF4sT9iHTszXScZETxKIviJNnq+bo6QL3PvAP+OIsnq18Yts4hlFM9fkhyANLL97hHCyBFWcLpfUzOPksEPtKfVCr10Kmy8q9OahbgZeTme+92tPnolwWoPdldgmiumIc9THXxOfy/HK7AB1PzmvW+/G0vrOrXcor6PqiHlySz6zXkgV52ibej3TpGCHGrFf7xuNgyauFF1/4mmXXzIloFpXm1Z/TlyGf+SDvrHkp3O6htwbCx+sZ2rc8S3ZyAv0et6xneMjmu46xNfc9H3P/zpC9z301ii1y0fOV5/ezkWMa0Tzg2pmMugeGwv4Enkdjm8ndrCk+3jer18M9RL2K7R+NfDqSx9k3saDmf8Fm3tzWOZ54B+uQ78VYr5d8PzKs/egMzyBr5oL768Myf+5w/QP2TKHm
+   eJytVztuwzAM1dTJRX2KHiY3KNq1S4D0AFlygp7Nuz+dfJCaSR7MPJOUZOQBRmxLIh//Tkop9U264v319otnC5/tev/VPq4NdG5utmuiI5Iv6JRcyIj01mJsbnwmJYe5C8fzsn4x9Opzozo3NfZ7xpyxX9v6s9z/tiunCIgfc7E4YR0yPVsjHVc5QSy6gjh5tmqOni5w7wL/gC/O4tnKJ7aNYxjFVJ/vgzyw9GIP52AJrDhbKK2f3slngdhX6oNavRZyuqzcm4O6FXg5mfO9V3v6XJTLAvS+nF2CqK4Ye33MNXFcng/3C9Dx5Lxmvd9v655N7VJeQdeJenBJPrNeSxbkaZt4PdKlY4QYs17tG4+DJa8WXnzha5ZdMyeiWVSaV39OX4Z85oO8s+alcHuG3hoIH69naN/yLNnICfR73HI9w0NuvusYW3Pf8zH37xxy+7mvRrFFLnq+8vw+GDmmEc0Drp3JqHugL+xP4Lk3tjm5eoZpPt43q9fDPUS9iu0fjXzak8dRH4KOmv8FD/Pm/p7jiT0DyfdirN+XfD8yrPXoDM8ga+aC+8fLMn+ecP0DTnCjrQ==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
@@ -140,7 +140,7 @@
  </layer>
  <layer name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYBh8wFVgcNtDL/cNBYAvLKgdTrjMI8ae0TgbfoCcOB0q6YAe7hwqYTEKBjcgNR1RK90NlDmj+WZgwFAJd1q5c6j4n1aA1u31oRy+ILdTAwMAj8cNng==
+   eJxjYBh8wFVgcNtDL/cNBYAvLKgdTrjMI8ae0TgbfoCcOB0q6YAe7hwqYTEKBjcgNR1RK90NlDmj+WZgwFAJd1q5E2buUAkHagNat9eHcriC3E4NDABYUg3z
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -150,7 +150,7 @@
     <property name="place" value="north"/>
    </properties>
   </object>
-  <object name="southeast" type="mapchange" x="928" y="768" width="32" height="160">
+  <object name="southeast" type="mapchange" x="928" y="800" width="32" height="128">
    <properties>
     <property name="map" value="loneford1"/>
     <property name="place" value="northwest"/>
diff --git a/AndorsTrail/res/xml/fields10.tmx b/AndorsTrail/res/xml/fields10.tmx
index 6d6944af1..5ddaf6535 100644
--- a/AndorsTrail/res/xml/fields10.tmx
+++ b/AndorsTrail/res/xml/fields10.tmx
@@ -1,150 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="15" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcHQQ4jtQTE2zKDHvDg5MDTNIMY8YM4gxj1RzcJlHrjnYzKPUrDtUNusOlc2ipv+oHY/kmEevNI+MATQN/M8=
+   eJz7JMDAwCTIwPAJSB9lw48/EaEWJg+iCenDphaG70AxNrvw6cOG7yBhYvXgMwMZExMmhMxAdx8+vxFjBjJGDi9KzEE2jxrmYDOPUrPuUNmsO1Q2i5r+o3Y8kmMeJfmGVHNgGAD5q/XB
   </data>
  </layer>
  <layer name="Objects" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJxjYEAFt3gYMAA2MWRQJcDAUAPFxIC7eMwDmVUPxHlA3EOkefjcAzOrF4dZt3G4BZsZPVCMyyx0cyk1A90tlJiByxxSzUA2ixrmoJtFiTnUNgsEKDELOf5hmByzcMU/KeGOKy2C9N+D5gFceYEYtyCbQ6i8QAbRaG5B1otcTtwBskV4GRgA1mI9xw==
+   eJytlGEKgzAMhd/+O2jB23mHHWAMvIBe0OrOsoalNGpC1frg0VKbryGxBbIeHpga7KSt0d6ktwM+7JIobiGeVz76P6uPfkUPTpzl82iK98h8Ems0cgvNmp1GjTGwLZasCXGvMKyaVDFYGucsQ+ZUzUHuV6lPR3Uni1TDkv1PvsKy+n+m7ta/SPFfvt9BuedHc5Ec7b2w1G1ykbGLmM9x3j6BH/TpPyU=
   </data>
  </layer>
  <layer name="Above" width="20" height="15">
   <data encoding="base64" compression="zlib">
-   eJztkFESgCAIRKkTyP0vWZwgbAZRpKaCz97POuKuzFIBWBGAWBfWysbnvajKHZm3bY7qlXlVybC+E5zf9jlC86Cq98fgd3KEyQOO78ZvuezkI086eQU63QdI2akjK0eIdO+Rvd9PjANIdSZV
+   eJxjYMAEHwQYGD4KIGiYGC51DIIMDIyCmPIwM4gBMHuwmUNIH7I7wQCHe/DqQQOkugMGCJlLCiA3TFAAkl6KzIECqriJhoBaYQ8Dg9WfIxUAAHD1FdE=
   </data>
  </layer>
- <layer name="Walkable" width="20" height="15">
+ <layer name="Walkable" width="20" height="15" visible="0">
   <data encoding="base64" compression="zlib">
    eJxzFWBgcB3Fo3gUDwmMDqhlDjnmEQOoZQ7MLAAWPln8
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="15">
+ <objectgroup name="Mapevents" width="20" height="15" visible="0">
   <object name="east" type="mapchange" x="608" y="352" width="32" height="96">
    <properties>
     <property name="map" value="fields9"/>
@@ -158,6 +157,6 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="15"/>
- <objectgroup name="Keys" width="20" height="15"/>
+ <objectgroup name="Spawn" width="20" height="15" visible="0"/>
+ <objectgroup name="Keys" width="20" height="15" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/fields11.tmx b/AndorsTrail/res/xml/fields11.tmx
index 922c73299..eb23d0276 100644
--- a/AndorsTrail/res/xml/fields11.tmx
+++ b/AndorsTrail/res/xml/fields11.tmx
@@ -1,150 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
 <map version="1.0" orientation="orthogonal" width="20" height="20" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_border_1.png"/>
+  <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bridge_1.png"/>
+  <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="385" name="map_broken_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_broken_1.png"/>
+  <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="513" name="map_cavewall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_1.png"/>
+  <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="621" name="map_cavewall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_2.png"/>
+  <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="729" name="map_cavewall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cavewall_3.png"/>
+  <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
  <tileset firstgid="837" name="map_chair_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_chair_table_1.png"/>
+  <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="965" name="map_crate_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_crate_1.png"/>
+  <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1093" name="map_cupboard_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_cupboard_1.png"/>
+  <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1221" name="map_curtain_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_curtain_1.png"/>
+  <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1349" name="map_entrance_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_entrance_1.png"/>
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1477" name="map_fence_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_1.png"/>
+  <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1605" name="map_fence_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_fence_2.png"/>
+  <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1733" name="map_ground_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_1.png"/>
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1861" name="map_ground_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_2.png"/>
+  <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="1989" name="map_ground_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_3.png"/>
+  <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2117" name="map_ground_4" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_4.png"/>
+  <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2245" name="map_ground_5" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_5.png"/>
+  <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2373" name="map_ground_6" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_6.png"/>
+  <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2501" name="map_ground_7" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_7.png"/>
+  <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2629" name="map_ground_8" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_ground_8.png"/>
+  <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2757" name="map_indoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_indoor_1.png"/>
+  <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="2885" name="map_kitchen_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_kitchen_1.png"/>
+  <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3013" name="map_outdoor_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_outdoor_1.png"/>
+  <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3141" name="map_pillar_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_pillar_1.png"/>
+  <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3269" name="map_plant_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_plant_1.png"/>
+  <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3397" name="map_rock_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_rock_1.png"/>
+  <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3525" name="map_roof_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_1.png"/>
+  <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3653" name="map_roof_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_roof_2.png"/>
+  <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3781" name="map_shop_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_shop_1.png"/>
+  <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="3909" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_sign_ladder_1.png"/>
+  <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4037" name="map_table_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_table_1.png"/>
+  <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4165" name="map_trail_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_trail_1.png"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4293" name="map_tree_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_tree_1.png"/>
+  <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4421" name="map_wall_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_1.png"/>
+  <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4549" name="map_wall_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_2.png"/>
+  <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4669" name="map_wall_3" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_wall_3.png"/>
+  <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
  <tileset firstgid="4789" name="map_window_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_1.png"/>
+  <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="4917" name="map_window_2" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_window_2.png"/>
+  <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcJREfAcPpoYZxJhHrH585pFrxkjFx6lsFqXmHUfDpMYpun6YGaSkEUL6iTWPFDNwmUeqW7BhapgxikcOBgAvn0yO
+   eJz7JMDAwCTIwPAJC32UDTu+gwdjM4tUM5DxUTbsZhCrH5t5lJoxUvFxKptFqXnH0TCpcYquH2YGKWmEkH5izSPFDOT8RYlbYBg5r5JrBi4zydU/iocGBgB+gUbM
   </data>
  </layer>
  <layer name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjYCAMqgQYGGqguB6I84C4V4AIjVj0I5vRA8XEmIXNDT0kmgEClLgBGyDHDfQAsPCilln1FJqFHn+U6MdlRh4Bc4lxAzFpooqAG4hJE/jcgssNd3gg9CegGJMghCYUHshm3OXB4hBBhFkgGp9/kN1yG9ksoD5GQVQ+zMweLOEBc8ctHlR/obNhdoDVQ+3wYqMuNmTHxFEC2MWJUWeEBXsLYBcfDuoA8KVX7A==
+   eJxjYMANGAWBBBBXCTAw1EBxPRDnAXGvAB6NaABZP7IZPVCM1yxBTDPQ9RM0AwmQ5QY8gBw30APAwotaZtVTaBZ6/FGiH5cZeQTMJcYNxKSJKgJuICZN4HMLLjfc4cE0h1B4IJtxF4t+WP7CBXC55TayWYLQsgKLmT1YwgPmjls8mP5CZsPsAKuH2uHFRl1syI6JowSwixOjzggL9hbALj4c1AEAP85TzA==
   </data>
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJz7JMDAwCTIwPAJC80IpBkEoTSRAK9Z5ABBytyDy0yKzRgFo4BI8AGYdj8KQGhqmEUt94wCBoY3PAwM73ggbBD9Bsp24SWMQYCTFxUjm4VMk2LeREaEeTA3ogNs+kHqCLnvDZq7KPUvAHR8J+M=
+   eJxjYCAMGAWJUIQHfBKgohmClJtFFTNGwSggEnwApt2PAhCaGmZRyz2jgIHhDQ8DwzseCBtEv4GyXXgJYxDg5EXFyGYh06SYN5ERYR7MjegAm36QOkLue4PmLkr9CwA2xyEe
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20">
+ <layer name="Walkable" width="20" height="20" visible="0">
   <data encoding="base64" compression="zlib">
    eJxzFWBgcB3Fo5gIDALUNItS87ABSvWTah6pgBrmUMst2MyixAxsZlILDHTaH8XYMQC0wGhD
   </data>
  </layer>
- <objectgroup name="Mapevents" width="20" height="20">
+ <objectgroup name="Mapevents" width="20" height="20" visible="0">
   <object name="west" type="mapchange" x="0" y="416" width="32" height="64">
    <properties>
     <property name="map" value="fields7"/>
@@ -158,7 +157,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="20" height="20">
+ <objectgroup name="Spawn" width="20" height="20" visible="0">
   <object name="frog_1" type="spawn" x="64" y="320" width="256" height="160">
    <properties>
     <property name="quantity" value="2"/>
@@ -170,5 +169,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys" width="20" height="20" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/fields12.tmx b/AndorsTrail/res/xml/fields12.tmx
index c2536b5b9..c6973314c 100644
--- a/AndorsTrail/res/xml/fields12.tmx
+++ b/AndorsTrail/res/xml/fields12.tmx
@@ -125,12 +125,12 @@
  </tileset>
  <layer name="Ground" width="19" height="20">
   <data encoding="base64" compression="zlib">
-   eJw7ysbAcBSI71CIj1PBDJg51DSLUr8dR8LkmoVuxlEyzMJlBilmETKDWLOIMQOfWcfZiHcLLrPI0Y+MyXXDKB7FQxkDAK5JN9w=
+   eJzNkLENgDAMBCOK1LD/PFaWYAomgBQvRZYD9scFxReW8pezpZYiT87FtAQGOJms1d3aEJalGUKwZowI64vhZXkYb6xW/S7ItXO7WJzt4Bx0OqfzmC48ZnOUM3qwXuhleFkemC236D94rzvWPbz30x3rHtH7/S03ogguNg==
   </data>
  </layer>
  <layer name="Objects" width="19" height="20">
   <data encoding="base64" compression="zlib">
-   eJytk9ENgzAMRGk/+sUHXqsr0BkyQIXUBdoFCyzBBE1Kgy6HrSYRliyE5bs8mzB0TfPw6Xy+fJbG/acP8ezWrPEJ0VfqmGcAJlc5E3rEuBV4WR6uYEe5HlP73+cIDmaxPN4KjzVL9GGPkTwWgwE5cuYJPmfRGVg/AwPO9K3L6rPA2SX3nzksLuTgnaAuPE+ScqFW+yZJgC6XiyM5Q2yurabMwbHNLKkm9rOG92H9G7GO/QmXsY/RuBPcH312/LKffW6Vd+i/Xo7LD6UWUvk=
+   eJytk8ERgjAUROHiiUPSli1oDSnAYcYGsEGRXghocBN3hySyM/+QwN//NoTeNM3dl/P18FWq26d/0WDeVeOz6FLZl/L0wOQqM6FH0LXAS3m4gjPK9Xh1+z5HcKQsyuNJeFSW4JN6jMSDMSDHP3ePZZmAATOt+/a7HkxctQxKgYOdCaq1MRf2sm8Sye48z1A0A/wYV5s5b8ts83twhvo31P42Q8waxZ1Q+X74SY6pI2t4/3w6rmZvtjtR
   </data>
  </layer>
  <layer name="Above" width="19" height="20">
@@ -138,12 +138,12 @@
    eJxjEGRgYATiUTAKqA0+CAwvc0D6P1LBLcjuAJlHrruoFS7YALq7sPmdVuFBinpkPaSGBynqqeHPwQAAiFoWLA==
   </data>
  </layer>
- <layer name="Walkable" width="19" height="20">
+ <layer name="Walkable" width="19" height="20" visible="0">
   <data encoding="base64" compression="zlib">
    eJxzFWBgcKUCBgFqmTOYzEIH1DCDHLMIAWqYQaxZpABK9eMyh1xAqX5s7qGGO8g1i5bxRIkfSU2PxOYVbObjs5ccd1LTHGq6ixoYAO8oQr4=
   </data>
  </layer>
- <objectgroup name="Mapevents" width="19" height="20">
+ <objectgroup name="Mapevents" width="19" height="20" visible="0">
   <object name="west" type="mapchange" x="0" y="320" width="32" height="160">
    <properties>
     <property name="map" value="fields11"/>
@@ -157,7 +157,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" width="19" height="20">
+ <objectgroup name="Spawn" width="19" height="20" visible="0">
   <object name="frog_2" type="spawn" x="64" y="256" width="320" height="192">
    <properties>
     <property name="quantity" value="2"/>
@@ -174,5 +174,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="19" height="20"/>
+ <objectgroup name="Keys" width="19" height="20" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/fields3.tmx b/AndorsTrail/res/xml/fields3.tmx
index f6df73b75..39968c785 100644
--- a/AndorsTrail/res/xml/fields3.tmx
+++ b/AndorsTrail/res/xml/fields3.tmx
@@ -135,7 +135,7 @@
  </layer>
  <layer name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJxjFGSgKvgoQF3zGKnsvpEAzlI5DkYBYTAa5ggw3MJiuPmHmgAA0ZsEmg==
+   eJy7K8BAVfCRyuYxClLXvJEAzlI5DkYBYTAa5ggw3MJiuPmHmgAAKrYFdQ==
   </data>
  </layer>
  <layer name="Walkable" width="20" height="20">
@@ -157,15 +157,15 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn uniques" width="20" height="20">
+ <objectgroup name="Spawn uniques" width="20" height="20" visible="0">
   <object name="tinlyn_lostsheep3" type="spawn" x="64" y="64" width="512" height="512"/>
  </objectgroup>
- <objectgroup name="Spawn monsters" width="20" height="20">
+ <objectgroup name="Spawn monsters" width="20" height="20" visible="0">
   <object name="fieldcritter_2" type="spawn" x="96" y="96" width="480" height="480">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" width="20" height="20"/>
+ <objectgroup name="Keys" width="20" height="20" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/fields6.tmx b/AndorsTrail/res/xml/fields6.tmx
index 645b5c7ac..d53deb38f 100644
--- a/AndorsTrail/res/xml/fields6.tmx
+++ b/AndorsTrail/res/xml/fields6.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="28" 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="28">
   <data encoding="base64" compression="zlib">
@@ -136,7 +135,7 @@
  </layer>
  <layer name="Above" width="30" height="28">
   <data encoding="base64" compression="zlib">
-   eJxjYKAjEGRgYBSE0KNgZIOzAgPtguEHCIXpaJiPglFAGaBlHhrNn6OAHDCaboY2oDT+RuOfdgAAPJoHHQ==
+   eJxjYKATEGRgYBREokfBiAZnBQbaBcMPEArT0TAfBaOAMkDLPDSaP0cBOWA03QxtQGn8jcY/7QAAIYAHLw==
   </data>
  </layer>
  <layer name="Walkable" width="30" height="28">
@@ -166,10 +165,7 @@
   <object name="sign_fields6" type="sign" x="480" y="768" width="32" height="32"/>
  </objectgroup>
  <objectgroup name="Spawn" width="30" height="28">
-  <object name="tinlyn" type="spawn" x="384" y="640" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
+  <object name="tinlyn" type="spawn" x="384" y="640" width="32" height="32"/>
   <object name="tinlyn_sheep" type="spawn" x="192" y="416" width="256" height="224">
    <properties>
     <property name="quantity" value="4"/>
diff --git a/AndorsTrail/res/xml/loneford1.tmx b/AndorsTrail/res/xml/loneford1.tmx
index e1df2ad9e..9b79d0358 100644
--- a/AndorsTrail/res/xml/loneford1.tmx
+++ b/AndorsTrail/res/xml/loneford1.tmx
@@ -125,22 +125,22 @@
  </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztkzEOgDAMAyMGusJTyg94fD/ECxADS6TWDkqRKBlOXSxbauwyi5QgGIAt+fkgGH3kttkTRus9cr06YfXICaP1X75v5OJc1PleuR6beLJf1Ple1P6E2WQ2aNn9MjezaNk+R+4YubWtMZu0aPV+39jqnzkWkWnFGovn5Xf76ldrTjh1BxY=
+   eJw7ysbAcHQUj+JBiI3YCWN09QNlLyE1o/ZiYkd2whhdPTXspVaaINUMQ3bCeDjF76i9hO0llOZpZS818gSp+deIiDRPC4wvTIjJk4YkqEUPH1z2EhNnpKglxs+0tpdSs0btJd5eXHmNmDxJilpalBvk5N+BsJecspge+JMAaeqZBCF6sNHoagENtAHU
   </data>
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzNVj1PwzAQPaTQ0CaRkoEPIbHyX2gQO12YaX8e/APY2UOyIFaYKRM+Ndecz3aTRk7Kk05O7Lu8e3d2ZIAGVQwa3uv3MjbXrxPTj6OQsSnAagKQp5s1HvOW6jG7YPOpGBd9a7vGeHHkKDvwSXy2xFBd7hXXkvG64mSNccScaV7WlvdA9guBXHcq/kHope/zvtlQOnhdsdgP1EY1Rt3zEW3BajxV+U1ULsexPi5Se61sc+h7nrTbSvDOLJbXe/ErAvhWFgcNDz7TPCIfgDcKNka4Csx537zEgbUlvbSXqN7o45P3Vq3PO9q+vsi7TN16K3Ze6N+0Vj39jXTN6HuRtBvXe7ajznhOfxgPYqrmZmxPY06+eSUP/4dy3UPolaDa8nx88xasv5jDWtQcUQxQZ86D35e9pd735XXtd+KR9S5FrfvyPocAT6E+jnF+XxXPS6iPtJ85ksCco311mbQb13vq0Eu8J7E+2vLoy9tVrwtj6LXpH1rvIft7CL2++yvvX3m9ftPhrraPL787Lz39C7r64t35sc7j3yADOMqaV3z+qPtNI8d2LjPXDD/m8wfZKuHQ
+   eJzVlr1OwzAQxw8pJLRJpHTgQ0hdeRcaxA5LZ9rHgzeAnT1NGCpWmCkTPsVHzmen+VBSxF86ObbP+fnuHCsAlYoIDG10P4/s+avY9uPKxNq1D/CWAKRJOcfXvCbmmn1y+RSMRe8iIbfQXHzmylvwpN4b1lBekIUxErduncwxtrhfGpe55TWQ9SLurVq/1NzFgezeL2O90/1MnJm5p3wSe791Qt/zuNnWfpXjier7inccmS3Ou3LlGkt7cqcOS3W8HyHAp7LIqzj4TONjcUOvNNLcs8eH5hIDc0vxbhxnYUjujZpftLSuvshdJfXxFuw7pTO/UzX9Ds2Y0fcibjYe79mePOM98cU4qIkam7IzTffPkFzJ4Xcoj3uMeKUot3w/Q3MzVl/cw07kHJWNkGfOwffL2lLt+3LrzjtxZL5zkeu+3KcA4DEw27G/X+S+KM5zYLZ0nrlizx6jc3UZN1ubeIl7Epmtax99uHhftY23Tn24px3jdcXfl/sX9f0P8Q5dX/nfl+r56xb/iF18V5I7wF3Q1nfJuIcWfb+WZgBHs6qLz1vtt3X4/47N7Dnph/ag8/4DPdvjWg==
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYKAPOCtAJ4uoCIaim4cCOMvNwHCOm3hxSkEqNB7vAs2+h8V8XOLo4DeV1JAKuHmoo2YUjIKBALTIE8SA0TwxCgYaDLe0P9z8MwpGATbwAdhm/Iil/Y8sDmNfgvIvYVF/CU0tLvoSlI1uD7o7PqDZkcaLW/1jIvIMuh8BKOIsuw==
+   eJxjYBgFuMBZgYF2wfAEZ7kZGM5xEy9OKUiFxuNdoNn3sJiPSxwd/KaSGlIBNw911IyCUTAQgBZ5ghgwmidGwUCD4Zb2h5t/RsEoIAV8ALYlPwqgsi9B+Zew9BcuoanFRV8SQNWPLo8sjgzSeHGrf0xEnvmIZh4AYcwpvw==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzFllEKwDAIQ3uEXWr3v9I+xmCMajXJUkH6oe2L1ULH8Nh53B7FlJyIq+RUdKBcRud7r7veZ3X7iuuod5X7zevom/V0dl7ERTRHGlZ7K/PXYTOaFYbeFaoVmavdXIav6G+mR81l57DzjrLeIroRbjeOcv8yVC/Dq3Kz/wH7jlx3zdSb1R/tRbjZOV1z1ctwlVb9X2VxRa7bdnN3+QWQL0q2
+   eJzNlksOwCAIRD1CL9X7X6mLbhoj6HzETsIK9A2VRlur0X29EeWcnIjr5CA+UK7is+dWxoy5Q3/hzmr7OsTfaJZG+0VcxnPkYbZ2Ze4RtuLZIfZbsV6ZuTrNVfiO8838uLnqHCL/UXa2jG+Gi+ZZ7i6xfhXeKvdbq/oY3YMVUvrN+o/WMtxsH1RV/Spcp1bfV1neUVut09xT8QDMaEwK
   </data>
  </layer>
  <objectgroup name="Mapevents" width="30" height="30">
@@ -156,7 +156,7 @@
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object name="northwest" type="mapchange" x="0" y="0" width="32" height="160">
+  <object name="northwest" type="mapchange" x="0" y="0" width="32" height="128">
    <properties>
     <property name="map" value="fields1"/>
     <property name="place" value="southeast"/>
@@ -182,11 +182,11 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn uniques" width="30" height="30">
-  <object name="tinlyn_lostsheep4" type="spawn" x="64" y="64" width="768" height="96"/>
+  <object name="tinlyn_lostsheep4" type="spawn" x="64" y="64" width="768" height="64"/>
   <object name="loneford_farmer0" type="spawn" x="64" y="192" width="768" height="640"/>
  </objectgroup>
  <objectgroup name="Spawn monsters" width="30" height="30" visible="0">
-  <object name="fieldcritter_2" type="spawn" x="64" y="64" width="768" height="96"/>
+  <object name="fieldcritter_2" type="spawn" x="64" y="64" width="768" height="64"/>
  </objectgroup>
- <objectgroup name="Keys" width="30" height="30"/>
+ <objectgroup name="Keys" width="30" height="30" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/loneford2.tmx b/AndorsTrail/res/xml/loneford2.tmx
index 390d34a3a..bd30c7ed9 100644
--- a/AndorsTrail/res/xml/loneford2.tmx
+++ b/AndorsTrail/res/xml/loneford2.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="26" tilewidth="32" tileheight="32">
  <properties>
   <property name="outside" value="1"/>
  </properties>
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
-  <image source="../drawable/map_bed_1.png"/>
+  <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="26">
   <data encoding="base64" compression="zlib">
@@ -131,7 +130,7 @@
  </layer>
  <layer name="Objects" width="30" height="26">
   <data encoding="base64" compression="zlib">
-   eJzVls1OAjEQxysLRMMukl7UN9D38CIYOGOCnEgUzugTKAdPnnwEnwCDiWfiwSdg4Q3Em3oysWM7ybQ73WX9ODjJP7O7TPvbmU67VCMhqo4aNSH2o2xB3EZk63ot+QzidiJbLnMZCtFhuPB8FS4nyoV5OC6oXRainqFGWc93kBF3VF4tX9BAxf6WDf4Rd1TSfix579pEasG4iUxycW2RC/cc98Zwp5L3YG+BEO+Bvn6UWjDuy4d6rk6OfNcrQhyr+DrRoXPvE8S1lG4V99TTbz7uUOlSaaR0oXRu6pVmuA+g1913duUyYd/7+gq489DPhXF36vd7EwPXvj2Zp59pvmOZ7DvkwrvPlJ+Y9W2ukC/l4tzgF6HNncpk33FriedGIbKV1s84N84L42ekznC/XVT9qbRb9Nfe5UI9uNr3lU42hbiq6DHgkTN0+mxP8WLzLgtm7SkX8kM2twd899xvLafH6dr48i0w3wCIgVhaz6XK98XkvgxsYe0xV3dtfFy337o1vp+b5rePwBa3T7ukBpT7HNpceN521pfu0zjMPjN8lpZvw5Mjtawz4y+5aA+S92C9klZertuPHPdJ8h5sqMaefYPr9iPY3Kxv/Md15noIn8H39tWIs17NvqZcOKfSuNzeyPPt7ZIe9OWL+5Jyt0g98TzAc6Rn5qQ5u+djTMb4uFg/3/+Cn6rPcOGc/gSrq9I/
+   eJzVls1OwkAQx1cKREOLZC/qG+h7eBEMnDFBTiQKZ/QJlIMnTz6CT4DBxDPx4BNQeAPxpp5M3LE7yXQ621I/Dk7yz7Rld3+d2dkp1UCpKlOjptR+kC0YtxHEdb2WfAbjdoK4OHPpK9URuPB8Fa4kyoV1JC6oXVaqnqFGOVrvIGPcUXm1eEEDM/a3bPCPuKNS5Mda9twmOhLMm+gkF/cWuXAvcW8sd6plD/bmKfXuRdePOhLM+/J+tFYnR7zrFaWOzfg60SG7dwnGtYxuDffUUW8u7tDo0mhkdGF0bvOVZngOoNb5O3NxJpx7V10Bd+67uTDvzvx+b8fAtetM5qlnGu9YJ+sOufDuM+Mndn+bK8RLubg2+IUf5051su6kvcS+UQjiSqtnXBvXhfkzkme43y6a+jTaLbpzz7mQDyn3faOTTaWuKtEc8MgZsjrbM7zQvstC2HvKhfiQLZ0B1730W4vVON0bV7wF9g3AXg9jaT6XJt4XG/vSiwtzj7HyvXFxeb11a3I9N+1vH15c0jntkhxQ7rMf58LzNttfek5DP7tnuCwt3oYjRmpZPeMvuWgPWvZgvVKkvFxejxL3ScsebGjmnn2Dy+sRbG73N/zjPEs1hM/ge/tqJVmvFr+mXOhTaVzpbOT59nZJDbrixXNJuVskn9gPsI/07Jo0Zt4fQzLHxcX8uf4X/FR9gQt9+hOwx9JA
   </data>
  </layer>
  <layer name="Above" width="30" height="26">
@@ -208,42 +207,15 @@
   </object>
  </objectgroup>
  <objectgroup name="Spawn" width="30" height="26">
-  <object name="loneford_wellguard" type="spawn" x="320" y="384" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="loneford_villager0" type="spawn" x="288" y="544" width="96" height="256">
-   <properties>
-   </properties>
-  </object>
-  <object name="conren" type="spawn" x="544" y="416" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="loneford_villager1" type="spawn" x="512" y="480" width="96" height="64">
-   <properties>
-   </properties>
-  </object>
-  <object name="wallach" type="spawn" x="704" y="320" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="loneford_guard0" type="spawn" x="192" y="480" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="loneford_villager2" type="spawn" x="128" y="736" width="32" height="32">
-   <properties>
-   </properties>
-  </object>
-  <object name="loneford_villager3" type="spawn" x="544" y="736" width="64" height="64">
-   <properties>
-   </properties>
-  </object>
-  <object name="loneford_villager4" type="spawn" x="672" y="704" width="96" height="96">
-   <properties>
-   </properties>
-  </object>
+  <object name="loneford_wellguard" type="spawn" x="320" y="384" width="32" height="32"/>
+  <object name="loneford_villager0" type="spawn" x="288" y="544" width="96" height="256"/>
+  <object name="conren" type="spawn" x="544" y="416" width="32" height="32"/>
+  <object name="loneford_villager1" type="spawn" x="512" y="480" width="96" height="64"/>
+  <object name="wallach" type="spawn" x="704" y="320" width="32" height="32"/>
+  <object name="loneford_guard0" type="spawn" x="192" y="480" width="32" height="32"/>
+  <object name="loneford_villager2" type="spawn" x="128" y="736" width="32" height="32"/>
+  <object name="loneford_villager3" type="spawn" x="544" y="736" width="64" height="64"/>
+  <object name="loneford_villager4" type="spawn" x="672" y="704" width="96" height="96"/>
  </objectgroup>
  <objectgroup name="Keys" width="30" height="26"/>
 </map>