diff --git a/AndorsTrail/res/xml/blackwater_mountain3.tmx b/AndorsTrail/res/xml/blackwater_mountain3.tmx
index 54631b786..8e94f8018 100644
--- a/AndorsTrail/res/xml/blackwater_mountain3.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.2" orientation="orthogonal" renderorder="right-down" width="20" height="10" tilewidth="32" tileheight="32" nextobjectid="7">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="20" height="10" tilewidth="32" tileheight="32" infinite="0" nextobjectid="7">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -183,22 +183,19 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../created/drawable/map_entrance_1.png" width="512" height="256"/>
- </tileset>
  <layer name="Ground" width="20" height="10">
   <data encoding="base64" compression="zlib">
-   eJyVktENAiEQRAl/3KcF2Kvahi2ImisA1w4QS6AQIdnJDRs08WPCzQKPYbnonbs2RRV/Q2sY/WWyJk4Yjyb5k3fT8Uw1Ub2aijnnsDh3bDotWz3RmqfhizK6KuWE+jx4qGVivA2/mJ4hJ6vzEnlkZD4890/IY29RXqZa8qPP5HGnWcb6hYf9VcUeGcSP/exzu/34Ht0zj/sGjwz2be5h0xpGn38wbS7LmvEsk/+XD1G/kxw=
+   eJyVktENAiEQRAk/hivFLtU2bEHUXAGIHSCWQCFCspOb3aCJHxNuFngMy0Xv3LUrivgbWoP2l8maOGE8uvKfvJuMZ6pl0aurmnMOi3PHrtOy1ROteRp+FsZQo5zQmAcPtUKMt+FX0zPkZA1eIo+MzIfn/mXy2FuFV6iWvPaFPO40y9i+8LC/idgjQ/a6n2Nuv9PvMTzzuG/wyGDf5h42rUH78oNpc1nWjGeZ/L98AFOFkx4=
   </data>
  </layer>
  <layer name="Objects" width="20" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYGBg+CTEAAbvBRkwwHExCH0CSl+HqrkE1XNYEqF2pxhCHhlcQxJDNw8ZwPReBso9RjLXmQlTLQisA4rPhcrNRlODzS/CUDXBUFocSD/FYfZ+HOJ5UHFYmIHAUzRzNksyYICLSPKrkdjPkNigcIKZc1kSYTZyGGMLX2RQh2SeJA6zQYBRjoGBCYiZgZiTCZUPAzJMqObhA4JyCPeCwGMoLSyHqu6OEKr/YQBbPNwRQ00vIP49qP85kdSLMaGaiW4WiP9cEGHeDUGEeSAA0iuJxX6QOADfeDVm
+   eJxjYGBg+CTEAAbvBRkwwHExCH0CSl+HqrkE1XNYEqF2pxhCHhlcQxJDNw8ZwPReBso9RjLXmQlTLQisA4rPhcrNRlODzS/CUDXBUFocSD/FYfZ+HOJ5UHFYmIHAUzRzNksyYICLSPKrkdjPkNigcIKZc1kSYTZyGGMLX2RQh2SeJA6zwXLsDAxSQCwNxJxMqHwYkGFCNQ8f0GRHuBcEHkNpbXZUdXeEUP0PA9ji4Y4YanoB8e9B/c+JpF6MCdVMdLNA/OeCCPNuCCLMAwGQXkks9oPEAehwNW4=
   </data>
  </layer>
  <layer name="Above" width="20" height="10">
   <data encoding="base64" compression="zlib">
-   eJxjYICAy2IMcHAYiU0IzGNCsGcjsQ9jMe+5AKpedD42c5DNgJkDo7+j6Ufn4wKXxVDNu0SCf7EBmFmX0NxHDKjD4tdLSG67DDX3MhXceJlMN+IyD9mNMP8Ly0HEBOVIC9fDSP5ENpsccBmLWeTGMQCX0Sqe
+   eJxjYICAy2IMcHAYiU0IzGNCsGcjsQ9jMe+5AKpedD42c5DNgJkDo7+j6Ufn4wKXxVDNu0SCf7EBmFmX0NxHDKjD4tdLSG67DDX3MhXceJlMN+IyD9mNMP9rs0PENNlJC9fDSP5ENpsccBmLWeTGMQCZlyqg
   </data>
  </layer>
  <layer name="Walkable" width="20" height="10" visible="0">
diff --git a/AndorsTrail/res/xml/blackwater_mountain4a.tmx b/AndorsTrail/res/xml/blackwater_mountain4a.tmx
index f7505da8e..9e85b61d3 100644
--- a/AndorsTrail/res/xml/blackwater_mountain4a.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain4a.tmx
@@ -183,15 +183,12 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_ground_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="7705" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_pillar_1.png" width="512" height="256"/>
+ <tileset firstgid="7577" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="7" height="27">
   <data encoding="base64" compression="zlib">
-   eJxbz8TAMEeWgWEtkF4HxOuR+OsHSG4/kD4AxAexyF0E0peA+DIWOXRMDbnBFC6jctSRAwDQwITK
+   eJxbz8TAsIWTgWEtkF4HxOuR+OsHSG4/kD4AxAexyF0E0peA+DIWOXRMDbnBFC6jctSRAwBfioXG
   </data>
  </layer>
  <layer name="Objects" width="7" height="27">
@@ -248,5 +245,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/loneford12.tmx b/AndorsTrail/res/xml/loneford12.tmx
index 85450135f..c676f3e47 100644
--- a/AndorsTrail/res/xml/loneford12.tmx
+++ b/AndorsTrail/res/xml/loneford12.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="8" height="17" tilewidth="32" tileheight="32" nextobjectid="9">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="8" height="17" tilewidth="32" tileheight="32" infinite="0" nextobjectid="9">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -183,29 +183,14 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_ground_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="7705" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_fence_2.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="7833" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_trail_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="7961" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_plant_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="8089" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_crate_1.png" width="512" height="256"/>
- </tileset>
  <layer name="Ground" width="8" height="17">
   <data encoding="base64" compression="zlib">
-   eJzbyMnAsBGKZblIx2xyAysvSkB+pizCf9jwQLt/oP1PSB4AbnskKA==
+   eJzbyMnAsBGKZbmGHtYlIL+REz8eaPcPtP8JYQCgByRa
   </data>
  </layer>
  <layer name="Objects" width="8" height="17">
   <data encoding="base64" compression="zlib">
-   eJwz42BgMANicyBmEoJgVii+KcjAkCWPEEeWvy4IoXHJwzA58oJMlOlHlp8nx8CwTQw3zgTqZxRCxWxIGFke5C588oT0UyIPigty9BPyv5wcJP5xYQCG3yCm
+   eJwz42BgMANicyBmEoJgVii+KYgQQ8YgueuCEBqXPAyTIy/IRJl+ZPltYvgxoxAmZkPCyOIgd+GTJ6SfEnlQXJCjn5D/zTjwYwCYpRrX
   </data>
  </layer>
  <layer name="Above" width="8" height="17">
@@ -218,7 +203,7 @@
    eJzbKMbAsBGK0QGyGDZ5WgF62kUKoJa7yDGHVmGyUQw/BgBJ6w04
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" visible="0">
   <object id="1" name="west" type="mapchange" x="0" y="32" width="32" height="480">
    <properties>
     <property name="map" value="loneford1"/>
@@ -238,7 +223,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn"/>
- <objectgroup name="Keys"/>
- <objectgroup name="Replace"/>
+ <objectgroup name="Spawn" visible="0"/>
+ <objectgroup name="Keys" visible="0"/>
+ <objectgroup name="Replace" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/tradehouse0.tmx b/AndorsTrail/res/xml/tradehouse0.tmx
index 29ef17dcb..07688c6f2 100644
--- a/AndorsTrail/res/xml/tradehouse0.tmx
+++ b/AndorsTrail/res/xml/tradehouse0.tmx
@@ -180,9 +180,6 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../created/drawable/map_ground_1.png" width="512" height="256"/>
- </tileset>
  <layer name="Ground" width="18" height="12">
   <data encoding="base64" compression="zlib">
    eJyT52JgMEDD8kgYXQ4bBqlTAOL9UqhYgQuB0eWwYZja81KoGNkcdDlsGKa2jpuBoYEbQSObs42TMIapnQfUu4AbQetzITAp5qC7B9nvlLgH2e+kmINN7gwSJsYcXGFArBkgrM9FfBjgw/tJCAN8GGTGS078eBsBeRgGADo5jcI=
diff --git a/AndorsTrail/res/xml/waytobrimhaven0.tmx b/AndorsTrail/res/xml/waytobrimhaven0.tmx
index 7c9ca1f18..fc954a9ff 100644
--- a/AndorsTrail/res/xml/waytobrimhaven0.tmx
+++ b/AndorsTrail/res/xml/waytobrimhaven0.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="32" height="23" tilewidth="32" tileheight="32" nextobjectid="13">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="32" height="23" tilewidth="32" tileheight="32" infinite="0" nextobjectid="13">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -183,8 +183,8 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../created/drawable/map_tree_1.png" width="512" height="256"/>
+ <tileset firstgid="7577" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="32" height="23">
   <data encoding="base64" compression="zlib">
@@ -193,12 +193,12 @@
  </layer>
  <layer name="Objects" width="32" height="23">
   <data encoding="base64" compression="zlib">
-   eJytVcFOwzAMtSZN2jUcKuWwAz/BH8AfwP50E+I+CGfI1GnrF3TVPoGY1uBaTpqutfRUNXP8np+zxiwAlnc6dgXA8wrgYSY8BXytAb4DKCSnWfT577s1fE7FZvXPuw8aGgtwMC1XafT++X7M1eqWkXWNf7tuPfABlY17r/FznDI5H5n/LwEu7NsH1LbtX+MlTyR/qk/yBnMkJ4YP6x8GelEP9O8S/Wv9SU4t3oWGpaJ5DJBL1qR3emKfF9vPIS9Sdf7OqrIuvcQ4RvanYlvEURZtjs9cp99Qmxe5r0Wf99qdQ/5t0Po9Ci8p+Dvla544tqb5ixrfJnznULcXdd2IOTQh9zMxgxRiuslL6pf7yc8i+tUI4LdWrsWg6Zaa+Fwp+Dkd4igztWiaNC00GzorY+trOEQ8lFo2ihexGhrGzEZiJ/hrm+f/XCB+fv5+76Ab+uIzi+2VfvL+T4H3PNB/zjxyQPqIH7mr7u492+lnLeUNh2P+N52Gix2ue+u9GLsrMah/zX+pX/vPTIlK9J+jmXs25xPjByPlilI=
+   eJytVkFqwzAQFIFArurBoGM/0R+0P2jz04TSe1r10KODg5MXOKZPqLbO4vUykuXYC4PxRtqZHW1s25Ux6weMfWHM68aYp4XwEtA4Y64BHJrTrob8j7ccXediu+l5L0FDG3C0HVdlcf9yP61FdatIHvH/uM4D4iYNMe8Rv0Sdyfks/H8L8GHfwfYaEC97ovlTfbI3tEZzUpQh/2XNIJqR/n2if9Sf5kTxqTSsgeYpIC5dk+/5qmeegr1I1eE4gLz2kuIU2Z+KXRFHVXRrysw8/0baSrX2vRjy/t7mUD4bUL8n5SWHvOf1yBMvcshf0vgx4zlHuktV1084hzas/U6cQQox3ewl9yv9lLNIfrUK9KzVuRiQbq1JniuHnNMxjipTC9KEtPDZ8KxMrY9wjHiotWyBF7EaCFPORmOv+BuX5/9SYH45f//voDv6kmcW26v9lP3Xgfc80n/OeeSA9TF/7fpvj7ObP2spbyS88J+/Pa5uvO6978XYu5KC+0f+a/3oPzMnLqr/HM3SsyWvFH8L6IrK
   </data>
  </layer>
  <layer name="Above" width="32" height="23">
   <data encoding="base64" compression="zlib">
-   eJxjYKAvuCILoY8A6aNAnCFAX/uXyULsphSkE3A3Of4iZCYyKKdBuNHCzMEA7kgyMNyVHGhXjIJRMDzSIinlFC0AtcqpO1jigV5+w2Y3CNC6DB6K6W+4pLdRgJruiU2HsDRLDXowAZCbAJeLJwM=
+   eJxjYKAveCMJoe8A6btAnCFAX/v3SULsphSkE3A3Of4iZCYyKKdBuNHCzMEAYGltFIyCgQbDIS2SUk7RAlCrnMJWD9DLb7jqIFqXwUMx/Q2X9DYKUNM9sekQlmapQQ8mAHITANQ7J2c=
   </data>
  </layer>
  <layer name="Walkable" width="32" height="23" visible="0">
@@ -206,7 +206,7 @@
    eJztldEJACAIRJui/Vdww/5DPU2toAT/zHenQtSbGtTrc+ZxGjJCY0cYVs3Ie5Qp1Ul+LbP3Mj0eM/ZquanVHiv3q/VH7BfjFv+V+0fcCt2oHr2P+PbMp/IvsWjJ5iPWLjanJWvvEf6p/Pyz/J98DoNvS/0=
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" visible="0">
   <object id="1" name="east" type="mapchange" x="992" y="160" width="32" height="288">
    <properties>
     <property name="map" value="waytobrimhaven1"/>
@@ -238,7 +238,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" visible="0">
   <object id="3" name="fieldcritter_0" type="spawn" x="288" y="192" width="352" height="160">
    <properties>
     <property name="quantity" value="2"/>
@@ -250,5 +250,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/waytobrimhaven4.tmx b/AndorsTrail/res/xml/waytobrimhaven4.tmx
index fa0e05efd..b81d7dfbd 100644
--- a/AndorsTrail/res/xml/waytobrimhaven4.tmx
+++ b/AndorsTrail/res/xml/waytobrimhaven4.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="2017.05.26" orientation="orthogonal" renderorder="right-down" width="9" height="6" tilewidth="32" tileheight="32" nextobjectid="5">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="9" height="6" tilewidth="32" tileheight="32" infinite="0" nextobjectid="5">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -183,9 +183,6 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_plant_1.png" width="512" height="256"/>
- </tileset>
  <layer name="Ground" width="9" height="6">
   <data encoding="base64" compression="zlib">
    eJzbyMnAsHEYYgDbqic9
@@ -193,7 +190,7 @@
  </layer>
  <layer name="Objects" width="9" height="6">
   <data encoding="base64" compression="zlib">
-   eJz7L8jA8EaSgeEdEJ+Fst8CsbwQA4MCEP8Hit2QZWA4hiS3Ccg+icQH0fjACUEIfQ9qD7L4OSD/OFQeZA/MvLeSmHoOQdXdAfLvSkL0IrsBRJ8GqpEFuhsAxC4kNg==
+   eJz7L8jA8EaSgeEdEJ+Fst8CsbwQA4MCEP8Hin0A4mNIcpuA7JNIfBCND5wQhND3oPYgi58D8o9D5UH2wMx7K4mp5xBU3R0g/64kRC+yG0D0aaAaWaC7AdBGJE4=
   </data>
  </layer>
  <layer name="Above" width="9" height="6">
@@ -201,12 +198,12 @@
    eJxjYECAu5II9h1JCP8Okhg+AFOPDPbh0AtTh00Psl5ku3GpwwUAAvEMPA==
   </data>
  </layer>
- <layer name="Walkable" width="9" height="6">
+ <layer name="Walkable" width="9" height="6" visible="0">
   <data encoding="base64" compression="zlib">
    eJzbKMbAsJEAhgFcfGQxfACbWmx8ZHW49BDCAEhoGBo=
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" visible="0">
   <object id="1" name="east" type="mapchange" x="256" y="64" width="32" height="96">
    <properties>
     <property name="map" value="waytobrimhaven5"/>
@@ -220,13 +217,13 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup name="Spawn" visible="0">
   <object id="4" name="erumen_1" type="spawn" x="96" y="64" width="128" height="64">
    <properties>
     <property name="quantity" value="2"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
- <objectgroup name="Replace"/>
+ <objectgroup name="Keys" visible="0"/>
+ <objectgroup name="Replace" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/waytogalmore0.tmx b/AndorsTrail/res/xml/waytogalmore0.tmx
index aaa088065..8028088b6 100644
--- a/AndorsTrail/res/xml/waytogalmore0.tmx
+++ b/AndorsTrail/res/xml/waytogalmore0.tmx
@@ -180,12 +180,6 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_trail_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="7705" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../drawable/map_ground_1.png" width="512" height="256"/>
- </tileset>
  <layer name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
    eJztlcFKAzEQhsMKrrtpb1VR+gI+QH0Q8RF8ARV8lL5C22MVxLUnFQRZ9+LNg30DL3ooehAzJMP+nSZpL1qhLvxkJ5nMl5lks8NMqeG/VlK3udWqcP9CrX8772Vxf0qDZHncA221r+v+DthY546u/UPCODHuo1MBaxg5G/eXNAL/kGjePDZxx04lzK2cjblSW4G/5GGc3pz965vxi6wWz2Vb5ps0lXprhPXesPMkt5tYFrX0UEs5h+L4uKzD1rRNWmtabjep1Q+IuOttpVKjjfZ0nBD3xDCPjM5as9wQx8e9ymotwpXrDOUWyvc6sWcUuROjNLetfCZuHLkcP1ZTOcZnF+Nw7EW5hVs/5yCZPdeOYA1jD5ffSfJhn02jLaPt9uz3J7mFY+LYIMJ9SJW6gb29o+83tT54XpGLuYfyxtypxVzo/dnDfUltbBkT74xj43eaz/qhXUENuG5cw1cPl/pKsXbWhxn/zGuu9EO7cgrdZ5LL/bj2PW15ubZiLr3L9RXAjd2jIW4Je0lxdnTNZWkPd5G7O8ZlNp6lL5cjt8SlMfwuJ+7uPs/juo9wh9n0f6xweSO3DHCf8rgu53Aln9m7TsSXXLzfuoGax+rsk++sy1yp7xvsGFbI
@@ -213,7 +207,7 @@
  </layer>
  <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJztVFsOgCAM8xT8eXCPwQ2NH0ayrKxssGhiE74Q+lixlm2rzZKoZf16A6eGbO4M32zmaD+ilfF74dif/Vk5tWc1Pz1kdE1q8mY9G965an4YjbOztXrr1cHyMnOUOlnf7JtasX7ePN77f/glvxpW82pnVvNGO+HNKNoJjdfSEpmNdUeroTdXT1be/CVvpE/Is7aHvmO7j3Rb3EiH5Eb3jHQEcSJeD7w9RH6QjtG32ONl+8z6tDzLO07wFczD
+   eJzdk1EOwCAIQz2F97+CN9yvIVRqFbKNxC8dj7Zs9NbGdGyNnn/ewPSqml2hm/Uc3Z/Myui197d8sj0r94Ct+b3q9e1Sc/X0MDPe9jbaW3UOlsvkaOdkdbP/VMb5E1fJ+8t6K7heZXO9b7K5p9lUe7TqEfXN4s45rbiK39G7lSbLPdknpNm7Q+/Y3UdzR2w0h2WjPjs7gpiIq5S6h0gP69vObuxk7OXJMpFm2+MBEojJJA==
   </data>
  </layer>
  <layer name="Walkable2" width="30" height="30" visible="0">
diff --git a/AndorsTrail/res/xml/wild18.tmx b/AndorsTrail/res/xml/wild18.tmx
index 9c4872147..4249db39a 100644
--- a/AndorsTrail/res/xml/wild18.tmx
+++ b/AndorsTrail/res/xml/wild18.tmx
@@ -180,9 +180,6 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_trail_1.png" width="512" height="256"/>
- </tileset>
  <layer name="Ground" width="20" height="30">
   <data encoding="base64" compression="zlib">
    eJztlDEKwjAUhkMHtcXNqktO6eAB1DPkBqKOVVAUF5HiUBHsATyL+bGF1+drGsHBweGjtEm+/O+1TRIqlfz582OM4td1HH/H19dKDSxD7b/GBErtejIt62lbOp6+ZfDi0pP5JN+icCHfPJSh+SZdN6UP1M2h+T7xtXUV1zo+FxjiAgNdxeXjc5HraNkTH+8t9pxFVQ/uAcY3BPhulqxwLgQf9p0yH+6ngo/mymp8wDdfmetQOPc1PkB9J+s6R/I8OK+FK/uCDzwa6pV8qWVN2Ah+X9/drs0J25q8vv3jY1L9Tf1bOr5RyZc5fPR/BKvg3ZcKffT18Yz3hj66aqUYR84SOs7PCnpOGqF2/t7zyF2j9MwwaBbwBBXMk/g=
diff --git a/AndorsTrail/res/xml/wild19.tmx b/AndorsTrail/res/xml/wild19.tmx
index de72472dd..b156edf51 100644
--- a/AndorsTrail/res/xml/wild19.tmx
+++ b/AndorsTrail/res/xml/wild19.tmx
@@ -180,9 +180,6 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_trail_1.png" width="512" height="256"/>
- </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
    eJzbyMnAsHEUj+JRjBVvF2Zg2MyJinGpIwYfx2IeNnxcmDi8lBOCm3hwmwWSg6kjhEFqYfi7MHaMrIYQZpdBwiI4sAzxWAwNo8cDujwhPNDpa6hjAABzDvo=
diff --git a/AndorsTrail/res/xml/wild20.tmx b/AndorsTrail/res/xml/wild20.tmx
index f363d0d98..711e72df3 100644
--- a/AndorsTrail/res/xml/wild20.tmx
+++ b/AndorsTrail/res/xml/wild20.tmx
@@ -180,9 +180,6 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_trail_1.png" width="512" height="256"/>
- </tileset>
  <layer name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
    eJzbyMnAsHEUj2Iq4xAR6plVBDWrjFwzuRgYNgHxZi4IX1SGgUEMiMVlCOvdLszAIMQF0SME1X8QSB8C4sNQPhtQjh2IOWQg6vHh48IIs0B4tzCqebuFUd13XBg/Xopm/2k080B8ZHmQeny4iQfV/pPsqOadZUeVB6nHh9llUPFNNPPusmOqaeLCFINhMTT8Fs08EB9dTSMXphgMY4tzmHlHoelmE1r6aeQiLf3BzEPHsPSzGYqJNe8iUN8lLPgymeYRwvjMAwC/pQai
diff --git a/AndorsTrail/res/xml/wild20a.tmx b/AndorsTrail/res/xml/wild20a.tmx
index 1b8e43832..1b817a17c 100644
--- a/AndorsTrail/res/xml/wild20a.tmx
+++ b/AndorsTrail/res/xml/wild20a.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.2" orientation="orthogonal" renderorder="right-down" width="3" height="7" tilewidth="32" tileheight="32" nextobjectid="15">
+<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="3" height="7" tilewidth="32" tileheight="32" infinite="0" nextobjectid="15">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -183,15 +183,12 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7577" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_ground_1.png" width="512" height="256"/>
- </tileset>
- <tileset firstgid="7705" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_trail_1.png" width="512" height="256"/>
+ <tileset firstgid="7577" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../../../../../master/AndorsTrail/res/drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="3" height="7">
   <data encoding="base64" compression="zlib">
-   eJxbz8TAMEeWgaEdSK+nEhsAXEcNpg==
+   eJxbz8TAsIWTgaEdSK+nEhsAYaMNwg==
   </data>
  </layer>
  <layer name="Objects" width="3" height="7">
@@ -214,7 +211,7 @@
    eJzbKMbAsJFEDAL42ACehg3/
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup name="Mapevents" visible="0">
   <object id="9" name="south" type="mapchange" x="32" y="192" width="32" height="32">
    <properties>
     <property name="map" value="wild20"/>
@@ -222,6 +219,6 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn"/>
- <objectgroup name="Keys"/>
+ <objectgroup name="Spawn" visible="0"/>
+ <objectgroup name="Keys" visible="0"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild22.tmx b/AndorsTrail/res/xml/wild22.tmx
index 44fb72749..46a965c36 100644
--- a/AndorsTrail/res/xml/wild22.tmx
+++ b/AndorsTrail/res/xml/wild22.tmx
@@ -181,7 +181,7 @@
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
  <tileset firstgid="7577" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
-  <image source="../../altered/drawable/map_trail_1.png" width="512" height="256"/>
+  <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
  <layer name="Ground" width="20" height="30">
   <data encoding="base64" compression="zlib">