diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index 635e9cfed..e822edc87 100644
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -3,8 +3,8 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="62"
-	android:versionName="0.7.15"
+	android:versionCode="63"
+	android:versionName="0.7.16beta"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
diff --git a/AndorsTrail/assets/translation/ar.mo b/AndorsTrail/assets/translation/ar.mo
index e175d7dc8..179098aea 100644
Binary files a/AndorsTrail/assets/translation/ar.mo and b/AndorsTrail/assets/translation/ar.mo differ
diff --git a/AndorsTrail/assets/translation/cs.mo b/AndorsTrail/assets/translation/cs.mo
index 3a88f9c16..662183787 100644
Binary files a/AndorsTrail/assets/translation/cs.mo and b/AndorsTrail/assets/translation/cs.mo differ
diff --git a/AndorsTrail/assets/translation/de.mo b/AndorsTrail/assets/translation/de.mo
index fc3b63904..c62338044 100644
Binary files a/AndorsTrail/assets/translation/de.mo and b/AndorsTrail/assets/translation/de.mo differ
diff --git a/AndorsTrail/assets/translation/fil.mo b/AndorsTrail/assets/translation/fil.mo
index 58ad43616..f49447925 100644
Binary files a/AndorsTrail/assets/translation/fil.mo and b/AndorsTrail/assets/translation/fil.mo differ
diff --git a/AndorsTrail/assets/translation/fr.mo b/AndorsTrail/assets/translation/fr.mo
index fb04e64f4..14a7531b1 100644
Binary files a/AndorsTrail/assets/translation/fr.mo and b/AndorsTrail/assets/translation/fr.mo differ
diff --git a/AndorsTrail/assets/translation/hu.mo b/AndorsTrail/assets/translation/hu.mo
index 9b2e6192e..1af868ad1 100644
Binary files a/AndorsTrail/assets/translation/hu.mo and b/AndorsTrail/assets/translation/hu.mo differ
diff --git a/AndorsTrail/assets/translation/id.mo b/AndorsTrail/assets/translation/id.mo
index 7a6cdc097..73c65688c 100644
Binary files a/AndorsTrail/assets/translation/id.mo and b/AndorsTrail/assets/translation/id.mo differ
diff --git a/AndorsTrail/assets/translation/ja.mo b/AndorsTrail/assets/translation/ja.mo
index 2637d87b4..3d1b0caad 100644
Binary files a/AndorsTrail/assets/translation/ja.mo and b/AndorsTrail/assets/translation/ja.mo differ
diff --git a/AndorsTrail/assets/translation/pl.mo b/AndorsTrail/assets/translation/pl.mo
index f779ffb79..ae9fa2e2c 100644
Binary files a/AndorsTrail/assets/translation/pl.mo and b/AndorsTrail/assets/translation/pl.mo differ
diff --git a/AndorsTrail/assets/translation/pt_BR.mo b/AndorsTrail/assets/translation/pt_BR.mo
index 19ada5ee7..8c48f7b7e 100644
Binary files a/AndorsTrail/assets/translation/pt_BR.mo and b/AndorsTrail/assets/translation/pt_BR.mo differ
diff --git a/AndorsTrail/assets/translation/ru.mo b/AndorsTrail/assets/translation/ru.mo
index cbc62f616..44b65ffcb 100644
Binary files a/AndorsTrail/assets/translation/ru.mo and b/AndorsTrail/assets/translation/ru.mo differ
diff --git a/AndorsTrail/assets/translation/sv.mo b/AndorsTrail/assets/translation/sv.mo
index c8893e230..98a1ba703 100644
Binary files a/AndorsTrail/assets/translation/sv.mo and b/AndorsTrail/assets/translation/sv.mo differ
diff --git a/AndorsTrail/assets/translation/tr.mo b/AndorsTrail/assets/translation/tr.mo
index b46f02ce7..0ae425786 100644
Binary files a/AndorsTrail/assets/translation/tr.mo and b/AndorsTrail/assets/translation/tr.mo differ
diff --git a/AndorsTrail/assets/translation/zh_CN.mo b/AndorsTrail/assets/translation/zh_CN.mo
index 901de3bc3..38429f7a2 100644
Binary files a/AndorsTrail/assets/translation/zh_CN.mo and b/AndorsTrail/assets/translation/zh_CN.mo differ
diff --git a/AndorsTrail/assets/translation/zh_TW.mo b/AndorsTrail/assets/translation/zh_TW.mo
index 41fa16a0b..593bffaa2 100644
Binary files a/AndorsTrail/assets/translation/zh_TW.mo and b/AndorsTrail/assets/translation/zh_TW.mo differ
diff --git a/AndorsTrail/play/listings/en-US/whatsnew.txt b/AndorsTrail/play/listings/en-US/whatsnew.txt
index 88db7ace9..452220e34 100644
--- a/AndorsTrail/play/listings/en-US/whatsnew.txt
+++ b/AndorsTrail/play/listings/en-US/whatsnew.txt
@@ -1,30 +1,72 @@
 I put both (release notes + forum announcement) into this source, so it will be easier to maintain them parallel:
 
+APK 63 (0.7.16)  //Delivery
+
+Release notes
+=============
+* New quest 'Delivery'
+* Fix of Killed-by-Kamelio bug, postman bug and typos
+* Translations actualized (Chinese 99%)
+
+I tried to follow up 
+
+Forum announcement  //2022-02-20
+==================
+Hello fellow adventurers,
+
+here is a new Andor's Trail release! 8-)
+
+We have a new quest 'Delivery' made by Draze (actually his first - we will see more of him in coming releases. Thank you Draze for your hard work! :)).
+
+Translations are actualized.
+Chinese and Japanese would be 100% now, if we hadn't add the new quest.
+Thanks to all the translators!
+
+I once tried to keep track of who worked on the translations. However, this is a time-consuming work, so I gave up. If you think your name is missing in the credits, just contact us (e.g. in the forum, discord or via PM)
+
+
+And there are some fixes:
+- postman fix
+- Killed by Kamelio could block quest progress
+- Some typos
+
+Here is the link to the productive version: https://andorstrail.com/static/AndorsTrail_v0.7.16.apk
+
+(Google Play will follow in a few days, unfortunately we still can't provide a version for F-droid)
+
+
+
 APK 62 (0.7.15)  //just fixes+translations
 
 Release notes
 =============
+* Fix of the notification crash bug
 * Fix of missing scout and of a non disappearing Ortholion and Ehrenfest in certain conditions
 * Various small changes and bug fixes
 * Translations actualized
 
 
-Forum announcement  //2021-12-1x
+Forum announcement  //2021-12-18
 ==================
 Hello fellow adventurers,
 
-here is a new Andor's Trail! 8-)
+here is a new Andor's Trail release! 8-)
 
-There is no new content - and also no christmas edition  (awww)
-We publish this release mainly to fix a nasty bug that could prevent you from getting entry to the Elm mine.
+No, there is no new content - and also no christmas edition (awww...)
 
-This is what we have done:
-- Fix of missing scout and of a non disappearing Ortholion and Ehrenfest in certain conditions
+We publish this release mainly to fix some nasty bugs:
+- Loot notifications could crash the game.
+- A missing scout could prevent you from getting entry to the Elm mine.
+- Non disappearing Ortholion and Ehrenfest in certain conditions are somewhat strange...
+
+Beside that:
 - Venom dagger gets poisonous
-- actual translations
-- diverse fixes of little bugs and typos
+- Some more translations
+- Other fixes of little bugs and typos
 
-And here is the link to the productive version: static/AndorsTrail_v0.7.15.apk
+Here is the link to the productive version: https://andorstrail.com/static/AndorsTrail_v0.7.15.apk
+
+(Google Play will follow in a few days, unfortunately we can't provide a version for F-droid at the moment)
 
 
 
diff --git a/AndorsTrail/res/raw/conversationlist_arghes.json b/AndorsTrail/res/raw/conversationlist_arghes.json
index 30675d09a..019e0c8ea 100644
--- a/AndorsTrail/res/raw/conversationlist_arghes.json
+++ b/AndorsTrail/res/raw/conversationlist_arghes.json
@@ -26,7 +26,7 @@
         "message":"How interesting. The child from Fallhaven, here in Remgard?",
         "replies":[
             {
-                "text":"I'm not from Fallhaven, I am from Crossglen, west of Fallhaven.",
+                "text":"I'm not from Fallhaven, I'm from Crossglen, west of Fallhaven.",
                 "nextPhraseID":"arghes_3a"
             },
             {
@@ -36,6 +36,27 @@
             {
                 "text":"How do you know where I am from?",
                 "nextPhraseID":"arghes_3c"
+            },
+            {
+                "text":"And how interesting that you ordered a pair of 'Yellow boots'. Did you really order this?",
+                "nextPhraseID":"brv_wh_delivery_arghes",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_03",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":80
+                    }
+                ]
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/conversationlist_arulir_mountain.json b/AndorsTrail/res/raw/conversationlist_arulir_mountain.json
index 6943e7070..9a753c149 100644
--- a/AndorsTrail/res/raw/conversationlist_arulir_mountain.json
+++ b/AndorsTrail/res/raw/conversationlist_arulir_mountain.json
@@ -1576,6 +1576,26 @@
                     }
                 ]
             },
+            {
+                "nextPhraseID":"tjure_wh_delivery_90",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"mermaid_scale",
+                        "value":90
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":60
+                    }
+                ]
+            },
             {
                 "nextPhraseID":"tjure_30",
                 "requires":[
@@ -1626,6 +1646,27 @@
             {
                 "text":"Eh, sorry to disturb you.",
                 "nextPhraseID":"X"
+            },
+            {
+                "text":"I'm surprised to see you here as well. Did you order 'Mysterious green something'?",
+                "nextPhraseID":"brv_wh_delivery_tjure",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_05",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":60
+                    }
+                ]
             }
         ]
     },
@@ -1877,6 +1918,33 @@
     {
         "id":"tjure_90",
         "message":"*Sigh* You were my last hope. Leave me now.",
+        "replies":[
+            {
+                "text":"Hope you learned from it.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"OK. One question before I go: did you order a 'Mysterious green something'?",
+                "nextPhraseID":"brv_wh_delivery_tjure",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_05",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":60
+                    }
+                ]
+            }
+        ],
         "rewards":[
             {
                 "rewardType":"questProgress",
@@ -1888,11 +1956,65 @@
     {
         "id":"tjure_100",
         "message":"Thank you for your help.",
-        "switchToNPC":"tjure"
+        "switchToNPC":"tjure",
+        "replies":[
+            {
+                "text":"It was an interesting experience.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"No problem. By the way, did you order a 'Mysterious green something'?",
+                "nextPhraseID":"brv_wh_delivery_tjure",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_05",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":60
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"tjure_200",
-        "message":"Oh, you look better than the last time we met. Thank you for your help."
+        "message":"Oh, you look better than the last time we met. Thank you for your help.",
+        "replies":[
+            {
+                "text":"It was an interesting experience.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Indeed. By the way, did you order a 'Mysterious green something'?",
+                "nextPhraseID":"brv_wh_delivery_tjure",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_05",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":60
+                    }
+                ]
+            }
+        ]
     },
     {
         "id":"watermark_script",
diff --git a/AndorsTrail/res/raw/conversationlist_brimhaven.json b/AndorsTrail/res/raw/conversationlist_brimhaven.json
index 79b1c395f..a1c21ed17 100644
--- a/AndorsTrail/res/raw/conversationlist_brimhaven.json
+++ b/AndorsTrail/res/raw/conversationlist_brimhaven.json
@@ -3573,6 +3573,27 @@
                         "value":1
                     }
                 ]
+            },
+            {
+                "text":"Did you order an 'Old, worn cape'?",
+                "nextPhraseID":"brv_wh_delivery_venanra",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_06",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":50
+                    }
+                ]
             }
         ]
     },
@@ -6251,6 +6272,27 @@
             {
                 "text":"Do you have anything to trade?",
                 "nextPhraseID":"S"
+            },
+            {
+                "text":"Hello, did you order a 'Striped Hammer'?",
+                "nextPhraseID":"brv_wh_delivery_edrin",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_08",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":30
+                    }
+                ]
             }
         ]
     },
@@ -7694,6 +7736,27 @@
             {
                 "text":"Maybe I can help you.",
                 "nextPhraseID":"brv_fortune_300"
+            },
+            {
+                "text":"Are you the one who ordered a 'Crystal Globe'?",
+                "nextPhraseID":"brv_wh_delivery_brv_fortune",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_00",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":110
+                    }
+                ]
             }
         ]
     },
@@ -7994,6 +8057,27 @@
             {
                 "text":"I am searching...",
                 "nextPhraseID":"brv_fortune_30"
+            },
+            {
+                "text":"So you are the one who ordered a 'Crystal Globe'?",
+                "nextPhraseID":"brv_wh_delivery_brv_fortune",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_00",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":110
+                    }
+                ]
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/conversationlist_brimhaven2.json b/AndorsTrail/res/raw/conversationlist_brimhaven2.json
index 25cdb3765..068692a55 100644
--- a/AndorsTrail/res/raw/conversationlist_brimhaven2.json
+++ b/AndorsTrail/res/raw/conversationlist_brimhaven2.json
@@ -2149,6 +2149,56 @@
         "replies":[
             {
                 "nextPhraseID":"brv_wh_boss_900_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery_reward_nondisplay",
+                        "value":3
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_wh_delivery_boss_10_10_yes",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery_reward_nondisplay",
+                        "value":2
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_wh_delivery_boss_10_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_wh_delivery_boss_10",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_reward_nondisplay",
+                        "value":3
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_wh_boss_10_32",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_reward_nondisplay",
+                        "value":2
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"brv_wh_delivery_boss_10",
                 "requires":[
                     {
                         "requireType":"questProgress",
@@ -2248,6 +2298,11 @@
                 "rewardType":"questProgress",
                 "rewardID":"brv_wh",
                 "value":10
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_reward_nondisplay",
+                "value":1
             }
         ]
     },
@@ -2490,6 +2545,11 @@
                 "rewardType":"questProgress",
                 "rewardID":"brv_wh",
                 "value":900
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_reward_nondisplay",
+                "value":2
             }
         ]
     },
@@ -2524,6 +2584,11 @@
             }
         ],
         "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_reward_nondisplay",
+                "value":3
+            },
             {
                 "rewardType":"giveItem",
                 "rewardID":"gold",
diff --git a/AndorsTrail/res/raw/conversationlist_delivery.json b/AndorsTrail/res/raw/conversationlist_delivery.json
new file mode 100644
index 000000000..63f2862a9
--- /dev/null
+++ b/AndorsTrail/res/raw/conversationlist_delivery.json
@@ -0,0 +1,724 @@
+[
+    {
+        "id":"brv_wh_delivery_boss_10",
+        "message":"Ah! You have finally returned, my new worker.",
+        "replies":[
+            {
+                "text":"How may I be of service?",
+                "nextPhraseID":"brv_wh_delivery_boss_20"
+            },
+            {
+                "text":"What is it this time?",
+                "nextPhraseID":"brv_wh_delivery_boss_20"
+            },
+            {
+                "text":"Ah! You are still insolent.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_boss_20",
+        "message":"I need someone to deliver all of the items that are in storage.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_wh_delivery_boss_30"
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_boss_30",
+        "message":"Come back to me when you have delivered all of the items. The order is not important. Here is the list of customers.",
+        "replies":[
+            {
+                "text":"It will be done.",
+                "nextPhraseID":"brv_wh_delivery_boss_40"
+            },
+            {
+                "text":"You want me to deliver these items to your customers?",
+                "nextPhraseID":"brv_wh_delivery_boss_40"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":10
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":20
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":30
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":40
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":50
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":60
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":70
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":80
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":90
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":100
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":110
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":120
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"brv_wh_item_00",
+                "value":1
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"brv_wh_item_01",
+                "value":1
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"brv_wh_item_02",
+                "value":1
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"brv_wh_item_03",
+                "value":1
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"brv_wh_item_04",
+                "value":1
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"brv_wh_item_05",
+                "value":1
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"brv_wh_item_06",
+                "value":1
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"brv_wh_item_07",
+                "value":1
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"brv_wh_item_08",
+                "value":1
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"brv_wh_item_09",
+                "value":1
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery_reward_nondisplay",
+                "value":1
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"facutloni_docket",
+                "value":1
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_boss_40",
+        "message":"Yes yes, hurry now. I have work to do here.",
+        "replies":[
+            {
+                "text":"I'm going now.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Hope I get paid better this time.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_arcir",
+        "message":"Yes, an old but useful book, but you should have wiped it off first. Anyway, here's my delivery fee.",
+        "replies":[
+            {
+                "text":"Thank you.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":20
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery_nondisplay",
+                "value":10
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"gold",
+                "value":20
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_edrin",
+        "message":"Ah, yes, a striped hammer. Don't look so impatient. Here's my delivery charge, and now you can leave!",
+        "replies":[
+            {
+                "text":"Thank you.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":30
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery_nondisplay",
+                "value":20
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"gold",
+                "value":10
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_odirath",
+        "message":"Yes, indeed. A gift for my beautiful daughter... but why did it take so long? Sigh, here's my delivery fee.",
+        "replies":[
+            {
+                "text":"Thank you.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":40
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery_nondisplay",
+                "value":30
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"gold",
+                "value":30
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_venanra",
+        "message":"Yes I did, kid. Incredibly, it has become the latest fashion to buy new capes with holes. Here's my delivery fee.",
+        "replies":[
+            {
+                "text":"Thank you.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":50
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery_nondisplay",
+                "value":40
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"gold",
+                "value":10
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_tjure",
+        "message":"What?! My lucky clover...but why now? Anyway, I'll no longer run out of luck. Here's my delivery fee.",
+        "replies":[
+            {
+                "text":"Thank you.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":60
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery_nondisplay",
+                "value":50
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"gold",
+                "value":50
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_servant",
+        "message":"Finally, I'm no longer afraid of that room every time my lord turns off the lights to scare me. Here's my delivery fee.",
+        "replies":[
+            {
+                "text":"Thank you.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":70
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery_nondisplay",
+                "value":60
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"gold",
+                "value":40
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_arghes",
+        "message":"Yes kid, thank you. Here, take this gold for them.",
+        "replies":[
+            {
+                "text":"You're welcome.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Bye.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":80
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery_nondisplay",
+                "value":70
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"gold",
+                "value":50
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_wyre_negative",
+        "message":"That's not what I'm waiting for! Go out and find out what happened to my son, please!"
+    },
+    {
+        "id":"brv_wh_delivery_wyre",
+        "message":"Yes, I'm longing for it just like how I'm longing for my son. But now I can mourn as I play his favorite song until I die.",
+        "replies":[
+            {
+                "text":"My sincere condolence for the loss of your beloved son.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":90
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery_nondisplay",
+                "value":80
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_mikhail",
+        "message":"Oh wow! Finally, your brother's gift has arrived and we only have to wait for his arrival.",
+        "replies":[
+            {
+                "text":"Sigh. I hope so.",
+                "nextPhraseID":"brv_wh_delivery_mikhail2"
+            },
+            {
+                "text":"What?! Where's my gift?",
+                "nextPhraseID":"brv_wh_delivery_mikhail3"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":100
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery_nondisplay",
+                "value":90
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_mikhail3",
+        "message":"I already gave you his shield.",
+        "replies":[
+            {
+                "text":"N",
+                "nextPhraseID":"brv_wh_delivery_mikhail2"
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_mikhail2",
+        "message":"Anyway, it's been a very long time so please go look for your brother.",
+        "replies":[
+            {
+                "text":"OK, bye.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"I'm still looking for him.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Eh, you have to pay for it...",
+                "nextPhraseID":"brv_wh_delivery_mikhail4"
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_mikhail4",
+        "message":"Ah, yes, I almost forgot. Here you are.",
+        "replies":[
+            {
+                "text":"Thanks. I'm on my way again, bye.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Hmm... Bye",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"giveItem",
+                "rewardID":"gold",
+                "value":10
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_brv_fortune",
+        "message":"Ah yes, I need a new one. My current crystal globe has become a bit cloudy - otherwise I would of course have seen that you would bring me a new globe.\nHere is the gold for it.",
+        "replies":[
+            {
+                "text":"Do you want to try the crystal ball with me to see if it works?",
+                "nextPhraseID":"brv_wh_delivery_brv_fortune_10"
+            },
+            {
+                "text":"Thanks for choosing Facutloni's delivery.",
+                "nextPhraseID":"X"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"removeQuestProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":110
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery_nondisplay",
+                "value":100
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"gold",
+                "value":100
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_brv_fortune_10",
+        "message":"You say you want me to help you?",
+        "replies":[
+            {
+                "text":"What help can you offer?",
+                "nextPhraseID":"brv_fortune_20"
+            },
+            {
+                "text":"I am searching...",
+                "nextPhraseID":"brv_fortune_30"
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_boss_10_10",
+        "message":"You are back. Did you deliver all of the items?",
+        "replies":[
+            {
+                "text":"Yes. I delivered everything.",
+                "nextPhraseID":"brv_wh_delivery_boss_10_10_yes",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery_nondisplay",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery_nondisplay",
+                        "value":20
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery_nondisplay",
+                        "value":30
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery_nondisplay",
+                        "value":40
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery_nondisplay",
+                        "value":50
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery_nondisplay",
+                        "value":60
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery_nondisplay",
+                        "value":70
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery_nondisplay",
+                        "value":80
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery_nondisplay",
+                        "value":90
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery_nondisplay",
+                        "value":100
+                    }
+                ]
+            },
+            {
+                "text":"Not yet.",
+                "nextPhraseID":"brv_wh_delivery_boss_10_10_no"
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_boss_10_10_no",
+        "message":"Then what are you standing there for?! Get out and deliver everything!",
+        "replies":[
+            {
+                "text":"[Run]",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Yes boss.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_boss_10_10_yes",
+        "message":"That's nice to hear. Then you can now give me the... eh...330 gold pieces that you should have received from the sales.",
+        "replies":[
+            {
+                "text":"Sure. Here you are.",
+                "nextPhraseID":"brv_wh_delivery_boss_10_10_yes_10",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gold",
+                        "value":330
+                    }
+                ]
+            },
+            {
+                "text":"Uh, I had expenses along the way and I don't have all the gold anymore.",
+                "nextPhraseID":"brv_wh_delivery_boss_10_10_yes_1"
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_boss_10_10_yes_1",
+        "message":"And then you walk into my sight? Go get my gold!",
+        "replies":[
+            {
+                "text":"[Run]",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Yes boss.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"Oh, I just found the 330 gold pieces in my pocket. Please take it.",
+                "nextPhraseID":"brv_wh_delivery_boss_10_10_yes_10",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"gold",
+                        "value":330
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_boss_10_10_yes_10",
+        "message":"Good job! I am glad that you work responsibly.",
+        "replies":[
+            {
+                "text":"And seriously.",
+                "nextPhraseID":"brv_wh_delivery_boss_reward"
+            },
+            {
+                "text":"I travelled far and wide.",
+                "nextPhraseID":"brv_wh_delivery_boss_reward"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery_reward_nondisplay",
+                "value":2
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_boss_reward",
+        "message":"That is serious. And here you have your well-deserved reward: 100 gold.",
+        "replies":[
+            {
+                "text":"Thanks.",
+                "nextPhraseID":"X"
+            },
+            {
+                "text":"What the?",
+                "nextPhraseID":"brv_wh_delivery_boss_scrooge"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery",
+                "value":130
+            },
+            {
+                "rewardType":"questProgress",
+                "rewardID":"brv_wh_delivery_reward_nondisplay",
+                "value":3
+            },
+            {
+                "rewardType":"giveItem",
+                "rewardID":"gold",
+                "value":100
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_boss_scrooge",
+        "message":"Pardon?",
+        "replies":[
+            {
+                "text":"Thank you.",
+                "nextPhraseID":"X"
+            }
+        ]
+    },
+    {
+        "id":"tjure_wh_delivery_90",
+        "message":"*Sigh* You were my last hope. Leave me now.",
+        "replies":[
+            {
+                "text":"Not until I have delivered this to you. Are you the one who ordered a 'Mysterious green something'?",
+                "nextPhraseID":"brv_wh_delivery_tjure",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_05",
+                        "value":1
+                    }
+                ]
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/conversationlist_fallhaven_arcir.json b/AndorsTrail/res/raw/conversationlist_fallhaven_arcir.json
index 97d93e8db..81716afe7 100644
--- a/AndorsTrail/res/raw/conversationlist_fallhaven_arcir.json
+++ b/AndorsTrail/res/raw/conversationlist_fallhaven_arcir.json
@@ -17,6 +17,27 @@
             {
                 "text":"You really seem to like your books.",
                 "nextPhraseID":"arcir_books_1"
+            },
+            {
+                "text":"And I'm your delivery kid. Did you order a 'Dusty old book'?",
+                "nextPhraseID":"brv_wh_delivery_arcir",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_09",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":20
+                    }
+                ]
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/conversationlist_gorwath.json b/AndorsTrail/res/raw/conversationlist_gorwath.json
index 1ac792e27..ba308d034 100644
--- a/AndorsTrail/res/raw/conversationlist_gorwath.json
+++ b/AndorsTrail/res/raw/conversationlist_gorwath.json
@@ -24,6 +24,16 @@
             },
             {
                 "nextPhraseID":"gorwath_tmp",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"postman",
+                        "value":15
+                    }
+                ]
+            },
+            {
+                "nextPhraseID":"gorwath_letter_20",
                 "requires":[
                     {
                         "requireType":"questProgress",
diff --git a/AndorsTrail/res/raw/conversationlist_guynmart_npc.json b/AndorsTrail/res/raw/conversationlist_guynmart_npc.json
index 68156443c..104bd6235 100644
--- a/AndorsTrail/res/raw/conversationlist_guynmart_npc.json
+++ b/AndorsTrail/res/raw/conversationlist_guynmart_npc.json
@@ -2576,6 +2576,27 @@
             {
                 "text":"You are lying around in bed in broad daylight?",
                 "nextPhraseID":"guynmart_servant_20"
+            },
+            {
+                "text":"I'm here to give you your ordered item. You don't want it?",
+                "nextPhraseID":"brv_wh_delivery_servant",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_04",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":70
+                    }
+                ]
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/conversationlist_mikhail.json b/AndorsTrail/res/raw/conversationlist_mikhail.json
index 58737e168..98266d128 100644
--- a/AndorsTrail/res/raw/conversationlist_mikhail.json
+++ b/AndorsTrail/res/raw/conversationlist_mikhail.json
@@ -286,6 +286,27 @@
                         "value":100
                     }
                 ]
+            },
+            {
+                "text":"Yes, I'm here to deliver the order for a 'Plush Pillow'. But what for?",
+                "nextPhraseID":"brv_wh_delivery_mikhail",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_01",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":100
+                    }
+                ]
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/conversationlist_omi2.json b/AndorsTrail/res/raw/conversationlist_omi2.json
index 9d15ac6a0..2c901538a 100644
--- a/AndorsTrail/res/raw/conversationlist_omi2.json
+++ b/AndorsTrail/res/raw/conversationlist_omi2.json
@@ -8722,6 +8722,22 @@
     {
         "id":"elm5f_kamelio_entrance",
         "replies":[
+            {
+                "nextPhraseID":"ortholion_c3_fix1",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"bwm72_beginning",
+                        "value":39
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"Omi2_bwm1",
+                        "value":54,
+                        "negate":true
+                    }
+                ]
+            },
             {
                 "nextPhraseID":"elm5f_kamelio_e1",
                 "requires":[
@@ -9633,5 +9649,25 @@
                 "mapName":"blackwater_mountain43"
             }
         ]
+    },
+    {
+        "id":"ortholion_c3_fix1",
+        "rewards":[
+            {
+                "rewardType":"deactivateMapObjectGroup",
+                "rewardID":"Keys",
+                "mapName":"elm5f_2"
+            }
+        ]
+    },
+    {
+        "id":"ortholion_c3_fix2",
+        "rewards":[
+            {
+                "rewardType":"activateMapObjectGroup",
+                "rewardID":"Keys",
+                "mapName":"elm5f_2"
+            }
+        ]
     }
 ]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
index a94e47110..9ae9081c0 100644
--- a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
+++ b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
@@ -3017,6 +3017,27 @@
                         "value":60
                     }
                 ]
+            },
+            {
+                "text":"Did you really order such an ugly porcelain figure? Oops, sorry I didn't mean to offend you",
+                "nextPhraseID":"brv_wh_delivery_odirath",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_07",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":40
+                    }
+                ]
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/conversationlist_wrye.json b/AndorsTrail/res/raw/conversationlist_wrye.json
index b78ef057f..3f62b501f 100644
--- a/AndorsTrail/res/raw/conversationlist_wrye.json
+++ b/AndorsTrail/res/raw/conversationlist_wrye.json
@@ -49,6 +49,27 @@
                         "value":80
                     }
                 ]
+            },
+            {
+                "text":"Not yet, but your order has finally arrived.",
+                "nextPhraseID":"brv_wh_delivery_wyre_negative",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"brv_wh_item_02",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":90
+                    }
+                ]
             }
         ]
     },
@@ -63,6 +84,27 @@
             {
                 "text":"You are welcome.",
                 "nextPhraseID":"wrye_story_15"
+            },
+            {
+                "text":"Yes, I came back to deliver your order of a 'Lyre'. You must be good at playing it?",
+                "nextPhraseID":"brv_wh_delivery_wyre",
+                "requires":[
+                    {
+                        "requireType":"inventoryRemove",
+                        "requireID":"brv_wh_item_02",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":90
+                    }
+                ]
             }
         ]
     },
@@ -73,6 +115,27 @@
             {
                 "text":"What is the matter?",
                 "nextPhraseID":"wrye_mourn_2"
+            },
+            {
+                "text":"Excuse me, I'm here to deliver your order for a 'Lyre'.",
+                "nextPhraseID":"wrye_mourn_3",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"brv_wh_item_02",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":90
+                    }
+                ]
             }
         ]
     },
@@ -94,6 +157,27 @@
             {
                 "text":"What about him?",
                 "nextPhraseID":"wrye_mourn_3"
+            },
+            {
+                "text":"Maybe your order here will comfort you?",
+                "nextPhraseID":"wrye_mourn_3",
+                "requires":[
+                    {
+                        "requireType":"inventoryKeep",
+                        "requireID":"brv_wh_item_02",
+                        "value":1
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":10
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"brv_wh_delivery",
+                        "value":90
+                    }
+                ]
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/itemlist_delivery.json b/AndorsTrail/res/raw/itemlist_delivery.json
new file mode 100644
index 000000000..bacbdb73a
--- /dev/null
+++ b/AndorsTrail/res/raw/itemlist_delivery.json
@@ -0,0 +1,10 @@
+[
+    {
+        "id":"facutloni_docket",
+        "iconID":"items_books:4",
+        "name":"Facutloni's Docket",
+        "displaytype":"quest",
+        "category":"other",
+        "description":"A document listing the contents of a delivery   Arcir the book-lover from Fallhaven ordered a 'Dusty Old Book'.   Edrin the metalsmith from Brimhaven ordered a 'Striped Hammer'.   Odirath the armorer from Stoutford ordered a 'Pretty Porcelain Figure'.   Venanra the laundress from Brimhaven ordered an 'Old, worn cape'.   Tjure the unlucky merchant ordered a 'Mysterious green something'.   Servant the servant from Guynmart Castle ordered a 'Chandelier'.   Arghes from Remgard tavern ordered 'Yellow Boots'.   Wyre the mournful woman from Vilegard ordered a 'Lyre'.   Mikhail from Crossglen ordered a 'Plush Pillow'.   Pangitain the fortune teller from Brimhaven ordered a 'Crystal Globe'. "
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/itemlist_omi2.json b/AndorsTrail/res/raw/itemlist_omi2.json
index 8c718b214..d5a034101 100644
--- a/AndorsTrail/res/raw/itemlist_omi2.json
+++ b/AndorsTrail/res/raw/itemlist_omi2.json
@@ -454,7 +454,7 @@
         "name":"Unknown gem (extracted from the Elm mine)",
         "displaytype":"quest",
         "category":"gem",
-        "description":"It is very cold and very sticky to the touch. It gives a feel of dizziness when you stare at it."
+        "description":"It is very cold and very sticky to the touch. It gives a feeling of dizziness when you stare at it."
     },
     {
         "id":"bwm_fish2",
@@ -708,7 +708,7 @@
         "hasManualPrice":1,
         "baseMarketCost":132,
         "category":"food",
-        "description":"A fern inside a cave is something out of normal, not seen everyday.",
+        "description":"A fern inside a cave is something unusual, not seen every day.",
         "useEffect":{
             "increaseCurrentHP":{
                 "min":3,
@@ -748,6 +748,8 @@
         "iconID":"items_misc_6:1",
         "name":"Yczorah nucleus",
         "displaytype":"legendary",
+        "hasManualPrice":1,
+        "baseMarketCost":0,
         "category":"scepter",
         "description":"The spherical, polished stone on its tip drags your glance unavoidably towards it.",
         "equipEffect":{
diff --git a/AndorsTrail/res/raw/itemlist_v070.json b/AndorsTrail/res/raw/itemlist_v070.json
index 76d0f4c9e..b064cf9e2 100644
--- a/AndorsTrail/res/raw/itemlist_v070.json
+++ b/AndorsTrail/res/raw/itemlist_v070.json
@@ -691,7 +691,7 @@
             },
             "increaseAttackCost":5,
             "increaseAttackChance":6,
-            "increaseBlockChance":-1,
+            "increaseBlockChance":2,
             "setNonWeaponDamageModifier":121
         }
     },
diff --git a/AndorsTrail/res/raw/monsterlist_graveyard1.json b/AndorsTrail/res/raw/monsterlist_graveyard1.json
index d3ee68749..e8ae718e9 100644
--- a/AndorsTrail/res/raw/monsterlist_graveyard1.json
+++ b/AndorsTrail/res/raw/monsterlist_graveyard1.json
@@ -434,42 +434,6 @@
             ]
         }
     },
-    {
-        "id":"graveyard_corpse3",
-        "name":"Angry graveyard corpse",
-        "iconID":"monsters_zombie2:0",
-        "maxHP":90,
-        "maxAP":10,
-        "moveCost":3,
-        "monsterClass":"undead",
-        "attackDamage":{
-            "min":6,
-            "max":19
-        },
-        "spawnGroup":"graveyard_corpse3",
-        "phraseID":"graveyard_corpse1",
-        "droplistID":"gold200",
-        "attackCost":3,
-        "attackChance":170,
-        "criticalSkill":10,
-        "criticalMultiplier":2.0,
-        "blockChance":165,
-        "damageResistance":11,
-        "hitEffect":{
-            "increaseCurrentHP":{
-                "min":1,
-                "max":3
-            },
-            "conditionsTarget":[
-                {
-                    "condition":"putrefaction",
-                    "magnitude":2,
-                    "duration":3,
-                    "chance":"30"
-                }
-            ]
-        }
-    },
     {
         "id":"graveyard_corpse3",
         "name":"Angry graveyard corpse",
diff --git a/AndorsTrail/res/raw/questlist_brimhaven2.json b/AndorsTrail/res/raw/questlist_brimhaven2.json
index 697710860..b2758b721 100644
--- a/AndorsTrail/res/raw/questlist_brimhaven2.json
+++ b/AndorsTrail/res/raw/questlist_brimhaven2.json
@@ -206,5 +206,24 @@
                 "logText":"60=banned fromtower"
             }
         ]
+    },
+    {
+        "id":"brv_wh_reward_nondisplay",
+        "name":"Gold and Exp reward for Inventory quest completed - nondisplay",
+        "showInLog":0,
+        "stages":[
+            {
+                "progress":1,
+                "logText":"Not yet done."
+            },
+            {
+                "progress":2,
+                "logText":"Done. But haven't received gold and exp reward yet."
+            },
+            {
+                "progress":3,
+                "logText":"Done. I received gold and exp reward. Old scrooge."
+            }
+        ]
     }
 ]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/questlist_delivery.json b/AndorsTrail/res/raw/questlist_delivery.json
new file mode 100644
index 000000000..b881c7e0e
--- /dev/null
+++ b/AndorsTrail/res/raw/questlist_delivery.json
@@ -0,0 +1,140 @@
+[
+    {
+        "id":"brv_wh_delivery",
+        "name":"Delivery",
+        "showInLog":1,
+        "stages":[
+            {
+                "progress":10,
+                "logText":"Facutloni asked me to help him deliver all of the items ordered by his customers a long time ago. He even gave me an old document with the names and items written on it.",
+                "finishesQuest":0
+            },
+            {
+                "progress":20,
+                "logText":"Arcir the Fallhaven book-lover ordered a 'Dusty Old book'."
+            },
+            {
+                "progress":30,
+                "logText":"Edrin the Brimhaven metalsmith ordered a 'Striped Hammer'."
+            },
+            {
+                "progress":40,
+                "logText":"Odirath the Stoutford armorer ordered a 'Pretty Porcelain Figure'."
+            },
+            {
+                "progress":50,
+                "logText":"Venanra the Brimhaven laundress ordered an 'Old, worn cape'."
+            },
+            {
+                "progress":60,
+                "logText":"Tjure the unlucky Brimhaven merchant ordered a 'Mysterious green something'."
+            },
+            {
+                "progress":70,
+                "logText":"Servant the Guynmart servant ordered a 'Chandelier'."
+            },
+            {
+                "progress":80,
+                "logText":"Arghes at Remgard tavern ordered 'Yellow boots'."
+            },
+            {
+                "progress":90,
+                "logText":"Wyre the mournful Vilegard woman ordered a 'Lyre'."
+            },
+            {
+                "progress":100,
+                "logText":"Mikhail ordered a 'Plush Pillow'."
+            },
+            {
+                "progress":110,
+                "logText":"Pangitain the Brimhaven fortune teller ordered a 'Crystal Globe'."
+            },
+            {
+                "progress":120,
+                "logText":"Facutloni wants me to report back after the deliveries are complete."
+            },
+            {
+                "progress":130,
+                "logText":"I reported back to Facutloni. He is very happy.",
+                "rewardExperience":10000,
+                "finishesQuest":1
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_nondisplay",
+        "name":"Delivery - nondisplay",
+        "showInLog":0,
+        "stages":[
+            {
+                "progress":10,
+                "logText":"I delivered 'Dusty Old book'",
+                "rewardExperience":75
+            },
+            {
+                "progress":20,
+                "logText":"I delivered 'Striped Hammer'",
+                "rewardExperience":50
+            },
+            {
+                "progress":30,
+                "logText":"I delivered 'Pretty Porcelain Figure'",
+                "rewardExperience":250
+            },
+            {
+                "progress":40,
+                "logText":"I delivered 'Old, worn cape'",
+                "rewardExperience":50
+            },
+            {
+                "progress":50,
+                "logText":"I delivered 'Mysterious green something'",
+                "rewardExperience":500
+            },
+            {
+                "progress":60,
+                "logText":"I delivered 'Chandelier'",
+                "rewardExperience":250
+            },
+            {
+                "progress":70,
+                "logText":"I delivered 'Yellow boots'",
+                "rewardExperience":500
+            },
+            {
+                "progress":80,
+                "logText":"I delivered 'Lyre'",
+                "rewardExperience":150
+            },
+            {
+                "progress":90,
+                "logText":"I delivered 'Plush Pillow'",
+                "rewardExperience":100
+            },
+            {
+                "progress":100,
+                "logText":"I delivered 'Crystal Globe'",
+                "rewardExperience":50
+            }
+        ]
+    },
+    {
+        "id":"brv_wh_delivery_reward_nondisplay",
+        "name":"Gold and Exp reward for Delivery quest completed - nondisplay",
+        "showInLog":0,
+        "stages":[
+            {
+                "progress":1,
+                "logText":"Not yet done."
+            },
+            {
+                "progress":2,
+                "logText":"Done. But haven't received gold and exp reward yet."
+            },
+            {
+                "progress":3,
+                "logText":"Done. I received gold and exp reward. Old scrooge again."
+            }
+        ]
+    }
+]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/questlist_graveyard1.json b/AndorsTrail/res/raw/questlist_graveyard1.json
index 8b3e76520..bba4109a7 100644
--- a/AndorsTrail/res/raw/questlist_graveyard1.json
+++ b/AndorsTrail/res/raw/questlist_graveyard1.json
@@ -97,7 +97,7 @@
             },
             {
                 "progress":35,
-                "logText":"I promised Cithurn I would investigate the source of the monster invasion in the forest. I will have to pass through the forest to access an entrance to a cave northeast of Cithurn's home."
+                "logText":"I promised Cithurn I would investigate the source of the monster invasion in the forest. I will have to pass through the forest to access an entrance to a cave east of Cithurn's home."
             },
             {
                 "progress":40,
diff --git a/AndorsTrail/res/values/arrays.xml b/AndorsTrail/res/values/arrays.xml
index 64ca6b09c..bf5a753d4 100644
--- a/AndorsTrail/res/values/arrays.xml
+++ b/AndorsTrail/res/values/arrays.xml
@@ -140,19 +140,19 @@
 	<string-array name="preferences_language">
 		<item>@string/preferences_language_default</item>
 		<item>English</item>
-		<item>čeština (62%)</item>
+		<item>čeština (62->77%)</item>
 		<item>Deutsch (91%)</item>
 		<item>Español (90%)</item>
-		<item>Française (86%)</item>
+		<item>Française (86->89%)</item>
 		<item>Italiano (90%)</item>
 		<item>Magyar (32%)</item>
 		<item>Polski (97%)</item>
 		<item>Português (83%)</item>
-		<item>Português Brasil (93%)</item>
-		<item>Русский язык (90%)</item>
-		<item>Türkçe (39%)</item>
-		<item>日本人 (91%)</item>
-		<item>中文 (68%)</item>
+		<item>Português Brasil (93->95%)</item>
+		<item>Русский язык (90->91%)</item>
+		<item>Türkçe (39->41%)</item>
+		<item>日本人 (91->100%)</item>
+		<item>中文 (68->100%)</item>
 	</string-array>
 
 	<!-- see AndorsTrailApplication.localeForLanguageTag for allowed formats -->
diff --git a/AndorsTrail/res/values/authors.xml b/AndorsTrail/res/values/authors.xml
index 4a809987e..3097549e4 100644
--- a/AndorsTrail/res/values/authors.xml
+++ b/AndorsTrail/res/values/authors.xml
@@ -4,7 +4,7 @@
 
 	<!-- Do not translate this. -->
 	<string name="about_copyright">Copyright © 2010–2013 Oskar Wiksten&lt;br /&gt;
-	    Copyright © 2013–2021 The Andor\'s Trail development team&lt;br /&gt;
+	    Copyright © 2013–2022 The Andor\'s Trail development team&lt;br /&gt;
 	    &lt;br /&gt;</string>
 	<string name="about_authors"><![CDATA[
 		<h4>Created &amp; originally programmed by Oskar Wiksten</h4>
@@ -19,6 +19,7 @@
 		• Christian Zink <b>*</b><br/>
 		• Daniel-Ømicrón Rodríguez García (Omicronrg9) <b>*</b><br/>
 		• Nathan Watson <b>*</b><br/>
+		• Draze <b>*</b><br/>
 		<b>*</b> Currently active on team<br/>
 		<br/>
 		<b>Development tools (Andor\'s Trail Content Studio) by</b><br/>
@@ -50,6 +51,7 @@
 		• Daniel-Ømicrón Rodríguez García (Omicronrg9)<br/>
 		• Moritz Arendt-Roth (Moerit)<br/>
 		• Antison<br/>
+		• Draze<br/>
 		<br/>
 		<b>Translations</b><br/>
 		• Russian translation by Dreamer..., e.solodookhin, shell.andor, konstmih, istasman, Aleksey Kabanov, Alexander Zubok, Paul Sulemenkov, dromoz, avatar232 and Mingun<br/>
@@ -75,6 +77,8 @@
 		• Catalan translation by David García Garzón (vokimon)<br/>
 		• Filipino translation by Elytra<br/>
 		<br/>
+		(If you miss your name here, please contact us)<br/>
+		<br/>
 		<b>Graphics</b><br/>
 		• <a href="http://pixeljoint.com/p/101133.htm">Original hero sprites by Maksiu</a><br/>
 		• <a href="http://redknight91.deviantart.com/art/Arena-Game-Sprites-154661559">Hero graphics by RedKnight91</a><br/>
diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index 8c8bd7a0a..438ec9c11 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -89,6 +89,8 @@
         <!--Added by ATCS v0.6.16 for project ATOmiRep-->
         <item>@raw/itemlist_gorwath</item>
         <item>@raw/itemlist_omi2</item>
+        <!--Added by ATCS v0.6.17 for project Delivery-->
+        <item>@raw/itemlist_delivery</item>
     </array>
         
     <array name="loadresource_droplists">
@@ -155,7 +157,8 @@
         <item>@raw/questlist_shortcut_lodar</item>
         <item>@raw/questlist_pathway_fallhaven</item>
         <item>@raw/questlist_halvor_surprise</item>
-                                                                                -		
+                                                                                        -		
+        
         
         
         
@@ -188,6 +191,8 @@
         <!--Added by ATCS v0.6.16 for project ATOmiRep-->
         <item>@raw/questlist_gorwath</item>
         <item>@raw/questlist_omi2</item>
+        <!--Added by ATCS v0.6.17 for project Delivery-->
+        <item>@raw/questlist_delivery</item>
     </array>
         
     <array name="loadresource_conversationlists">
@@ -381,6 +386,8 @@
         <!--Added by ATCS v0.6.16 for project ATOmiRep-->
         <item>@raw/conversationlist_gorwath</item>
         <item>@raw/conversationlist_omi2</item>
+        <!--Added by ATCS v0.6.17 for project Delivery-->
+        <item>@raw/conversationlist_delivery</item>
     </array>
         
     <array name="loadresource_monsters">
diff --git a/AndorsTrail/res/xml/blackwater_mountain70.tmx b/AndorsTrail/res/xml/blackwater_mountain70.tmx
index 981e58c45..879fc1ff7 100644
--- a/AndorsTrail/res/xml/blackwater_mountain70.tmx
+++ b/AndorsTrail/res/xml/blackwater_mountain70.tmx
@@ -212,17 +212,17 @@
  </layer>
  <layer id="7" name="Walkable" width="10" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsJGGGAaorZZabkIGuNRiY5OjDhcgpJaQ+cSYR2z4YrOXkBuJCRtsbsZnLy69+NQRYx6x4UaK+8iNB1zq8ZkJk8OlB586fPYS6w9S1OGyl5hwxhV2AAQAkuw=
+   eJy1kcsJACAMQ53C/Vfohp4KIs2nQguejMkzjb1WDJ6cjn6S52W6R/EwNkeHRmmVv+Pn7qLKVYxONxUzy0Vvmc7xc3vr8P3uAemZZ96hN0zHct1/dHQo1+kZdXcAPBOTsw==
   </data>
  </layer>
  <layer id="8" name="Walkable_2" width="10" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsJGGGAaorZZabkIGuNRiY5OjDhcgpJaQ+cSYR2z4YrOXkBuJCRtsbsZnLy69+NQRYx6x4UaK+8iNB1zq8ZkJk8OlB586fPYS6w9S1OGyl5hwxhV2AAQAkuw=
+   eJy1kcsJACAMQ53C/Vfohp4KIs2nQguejMkzjb1WDJ6cjn6S52W6R/EwNkeHRmmVv+Pn7qLKVYxONxUzy0Vvmc7xc3vr8P3uAemZZ96hN0zHct1/dHQo1+kZdXcAPBOTsw==
   </data>
  </layer>
  <layer id="9" name="Walkable_1" width="10" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsJFEjAyorQ6fWnLVUcNMmFpkmhJ1yPYRMg+bHnIwsl5c9qOLE+NOYsOb2urwxR8ufcSqIyVeqIkpdTeyODHhR0q6IlYdPneg68fGx2cHACgUobE=
+   eJzbKMbAsJFEjAyoqQ7GJsY8UtRRw0xkt1FDHbF+xqWHHIysF5f96OLEuJPY8Ka2Onzxh0sfsepIiRdqYkrdjSxOTPiRkq6IVYfPHej6sfHx2QEAYCeieA==
   </data>
  </layer>
  <objectgroup id="10" name="Mapevents" visible="0">
diff --git a/AndorsTrail/res/xml/elm5f_1.tmx b/AndorsTrail/res/xml/elm5f_1.tmx
index e5ec8b007..0c47f3b48 100644
--- a/AndorsTrail/res/xml/elm5f_1.tmx
+++ b/AndorsTrail/res/xml/elm5f_1.tmx
@@ -1,301 +1,297 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="18" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="15">
- <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+<!DOCTYPE map SYSTEM "http://mapeditor.org/dtd/1.0/map.dtd">
+<map version="1.0" orientation="orthogonal" width="18" height="20" tilewidth="32" tileheight="32">
+ <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="129" name="map_border_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_border_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="257" name="map_bridge_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="385" name="map_bridge_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_bridge_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="513" name="map_broken_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_broken_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="641" name="map_cavewall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_1.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="749" name="map_cavewall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_2.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="857" name="map_cavewall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_3.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32" tilecount="108" columns="18">
+ <tileset firstgid="965" name="map_cavewall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_4.png" width="576" height="192"/>
  </tileset>
- <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1073" name="map_chair_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1201" name="map_chair_table_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_chair_table_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1329" name="map_crate_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_crate_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1457" name="map_cupboard_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cupboard_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1585" name="map_curtain_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_curtain_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1713" name="map_entrance_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1841" name="map_entrance_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_entrance_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="1969" name="map_fence_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2097" name="map_fence_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_transition_6" tilewidth="32" tileheight="32" tilecount="144" columns="18">
+ <tileset firstgid="6449" name="map_transition_6" tilewidth="32" tileheight="32">
   <image source="../drawable/map_transition_6.png" width="576" height="256"/>
  </tileset>
- <tileset firstgid="6593" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6593" name="map_tree_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6721" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6721" name="map_tree_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6849" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6849" name="map_wall_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6977" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6977" name="map_wall_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7097" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7097" name="map_wall_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7217" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7217" name="map_wall_4" tilewidth="32" tileheight="32">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7337" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7337" name="map_window_1" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7465" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7465" name="map_window_2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7593" name="map_cavewall_5" tilewidth="32" tileheight="32" tilecount="36" columns="6">
+ <tileset firstgid="7593" name="map_cavewall_5" tilewidth="32" tileheight="32">
   <image source="../drawable/map_cavewall_5.png" width="192" height="192"/>
  </tileset>
- <tileset firstgid="7629" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32" tilecount="32" columns="8">
+ <tileset firstgid="7629" name="map_sign_ladder_omi2" tilewidth="32" tileheight="32">
   <image source="../drawable/map_sign_ladder_omi2.png" width="256" height="128"/>
  </tileset>
- <tileset firstgid="7661" name="map_rock_3" tilewidth="32" tileheight="32" tilecount="30" columns="6">
+ <tileset firstgid="7661" name="map_rock_3" tilewidth="32" tileheight="32">
   <image source="../drawable/map_rock_3.png" width="192" height="160"/>
  </tileset>
- <layer id="10" name="Base" width="18" height="20">
+ <layer name="Base" width="18" height="20">
   <data encoding="base64" compression="zlib">
    eJxjYBgFo4B48Il5oF0wCkbByAEAT/oA9g==
   </data>
  </layer>
- <layer id="1" name="Ground" width="18" height="20">
+ <layer name="Ground" width="18" height="20">
   <data encoding="base64" compression="zlib">
    eJyNVMGNwkAMjMIPKW9ekfLlOjgkGoAKgAq4u1aumfvcBikEKcmHcqgAW3iUidkEHiOt7d0Zr2eTTZYkG8NWEPIeZ4LGlaAW7GTfIXvEml/Me4611cBRClqCnmkEHfE2lteYOVhfda8EPfNv+dbW4NJ4bxy101fd22yIk+Wv1EewGPfonD6f/8sfKCmPPqp8OAuvDRyl1y/Bd/a8j+/reaDt/cLMYlrgQV3jYtbn2nx8Zr+LIU9J9Yp0/bz8zHw/3GsT0X0HIXJmzCvA15Zpknykz7XY/MBxIk+09iMefgrHKp32IZin7Bfz8Lfo58G++++sc97CJ/92/D3gP/yqSfMVD7xn/8+O4x0eeM/3iL2FMMGDmVzsHnij/i3wfEta81z9npiHYzxTYA79fyrgR0G8d78CLVg=
   </data>
  </layer>
- <layer id="2" name="Objects" width="18" height="20">
+ <layer name="Objects" width="18" height="20">
   <data encoding="base64" compression="zlib">
    eJyNU81KA0EMHhZkUQplZnUXxbH4d/MZ9QmkT7D1AaSWtZ70WBS0vagn0Yse9OBJj8WDEydhMj9b/GBoJ5t8yZdkhPBxrYS4Ue7+o0SEdynEs3T3uyr2mZjvbxhb5EKsmrOWx36L0Ej/vmvi98zZR55bLcTUnOOuvR9hHR+s5hn+72XO9ln5h1Ajz9DYztB+kNAP/JD3r0ZtddbG/6Sy9iHyrLCcVAfFeTqZDXKPWE2gcSOLYyhugHnPkeMrqBfqIh/iC0F967O8oHGZ5YW6DitrB67XRF+ob6NgH9aRh7S3+fHe9IKYVD6OJqGLtPJZAS7M74uyv2OdjgeNk7I931y7mY8TuQGdItaoCpfvGzWFM+eagHuz8HOEtfK7/Mcbm7ZwUW2A7Tze1ZrtEccp+j0smBFxQU9g3/oJHpoXf78Ql5Vx3dAT6lsH637sOj18zylOlbGmJuBMYabt+73Hd78T7EWj43cGINuAfZOYA3brSdrYS2O/wjjozdKW7Q/M/BeybG9i
   </data>
  </layer>
- <layer id="3" name="Above" width="18" height="20">
+ <layer name="Above" width="18" height="20">
   <data encoding="base64" compression="zlib">
    eJxjYCANfJFlYDgsiOCnSDIwpEmSaAgWUAY0o4KAOYTsOilLul249BBr1kYkddeFiNODzwyS9cmRpxcdsBFhDpMwdewSopI5tAabZRFpDt3vpMYZMekbF5Blwi9PrXgZKgAU9rAw+UJJ3kED+MKZEUsYo5vxH4uZX3Dk0c1EuhsAoQoXig==
   </data>
  </layer>
- <layer id="4" name="Top" width="18" height="20">
+ <layer name="Top" width="18" height="20">
   <data encoding="base64" compression="zlib">
    eJxjYCAdHBajjvpLVDLnMgFz0PVhsxdkBj73EJLHZRep8qSYM1ecNu7BJkZq2BAbXpTYS4o5tAYg/+JLh4TSKAyA3I7P/fjCA1kfPnNIyS+H8cQjPndeRrKfUFrAZw6yPwilBWzmPBZDyJGTloixg5YAAIa2LzU=
   </data>
  </layer>
- <layer id="5" name="Walkable" width="18" height="20">
+ <layer name="Walkable" width="18" height="20">
   <data encoding="base64" compression="zlib">
    eJylkssNwCAMQ5mC/Vfohj30klr+IZA4REQvtsla//Ps786avc/rDutnMxIr6VCcpNfpU+w0o/XNdKBXxW78sVmM0+h2mhXPZZk47X4pRsO99c1qlensTXpPtap+nOd0ubwUBz0hK+Wj+pw/5N/sXtpdpQt9uixU3f7vC56Koz8=
   </data>
  </layer>
- <objectgroup id="6" name="Mapevents">
-  <object id="1" name="up" type="mapchange" x="320" y="448" width="32" height="32">
+ <objectgroup name="Mapevents">
+  <object name="up" type="mapchange" x="320" y="448" width="32" height="32">
    <properties>
     <property name="map" value="elm_4f_1"/>
     <property name="place" value="down"/>
    </properties>
   </object>
-  <object id="2" name="north" type="mapchange" x="224" y="64" width="96" height="32">
+  <object name="north" type="mapchange" x="224" y="64" width="96" height="32">
    <properties>
     <property name="map" value="elm5f_2"/>
     <property name="place" value="south"/>
    </properties>
   </object>
-  <object id="3" name="elm2f_trap" type="script" x="384" y="192" width="96" height="64">
+  <object name="elm2f_trap" type="script" x="384" y="192" width="96" height="64">
    <properties>
     <property name="when" value="round"/>
    </properties>
   </object>
-  <object id="4" name="elm2f_trap" type="script" x="448" y="256" width="64" height="32">
+  <object name="elm2f_trap" type="script" x="448" y="256" width="64" height="32">
    <properties>
     <property name="when" value="round"/>
    </properties>
   </object>
-  <object id="5" name="elm5f_potion" type="container" x="32" y="544" width="32" height="32"/>
+  <object name="elm5f_potion" type="container" x="32" y="544" width="32" height="32"/>
  </objectgroup>
- <objectgroup id="7" name="Spawn" visible="0">
-  <object id="6" name="elm5f_monster1" type="spawn" x="416" y="320" width="32" height="160">
+ <objectgroup name="Spawn">
+  <object name="elm5f_monster1" type="spawn" x="416" y="320" width="32" height="160">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="elm_mine5"/>
    </properties>
   </object>
-  <object id="7" name="elm5f_monster2" type="spawn" x="224" y="96" width="96" height="32">
+  <object name="elm5f_monster2" type="spawn" x="224" y="128" width="64" height="32">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="elm_mine5"/>
    </properties>
   </object>
-  <object id="8" name="elm5f_monster3" type="spawn" x="224" y="96" width="96" height="32">
-   <properties>
-    <property name="spawngroup" value="elm_mine6"/>
-   </properties>
-  </object>
-  <object id="9" name="elm5f_monster4" type="spawn" x="32" y="416" width="64" height="128">
+  <object name="elm5f_monster4" type="spawn" x="32" y="416" width="64" height="128">
    <properties>
     <property name="quantity" value="3"/>
     <property name="spawngroup" value="elm_mine4"/>
    </properties>
   </object>
-  <object id="10" name="elm5f_monster5" type="spawn" x="32" y="32" width="160" height="128">
+  <object name="elm5f_monster5" type="spawn" x="32" y="32" width="160" height="128">
    <properties>
     <property name="spawngroup" value="bwm_olm"/>
    </properties>
   </object>
-  <object id="11" name="elm5f_monster6" type="spawn" x="128" y="160" width="96" height="32">
+  <object name="elm5f_monster6" type="spawn" x="128" y="160" width="96" height="32">
    <properties>
     <property name="spawngroup" value="elm_mine5"/>
    </properties>
   </object>
-  <object id="12" name="elm5f_monster7" type="spawn" x="224" y="288" width="160" height="32">
+  <object name="elm5f_monster7" type="spawn" x="224" y="288" width="160" height="32">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="elm_mine5"/>
    </properties>
   </object>
-  <object id="13" name="elm5f_monster8" type="spawn" x="64" y="224" width="32" height="96">
+  <object name="elm5f_monster8" type="spawn" x="64" y="224" width="32" height="96">
    <properties>
     <property name="spawngroup" value="elm_mine5"/>
    </properties>
   </object>
-  <object id="14" name="elm5f_monster9" type="spawn" x="64" y="352" width="160" height="64">
+  <object name="elm5f_monster9" type="spawn" x="64" y="352" width="160" height="64">
    <properties>
     <property name="quantity" value="2"/>
     <property name="spawngroup" value="elm_mine3"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="8" name="Keys"/>
- <objectgroup id="9" name="Replace"/>
+ <objectgroup name="Keys"/>
+ <objectgroup name="Replace"/>
 </map>
diff --git a/AndorsTrail/res/xml/elm5f_2.tmx b/AndorsTrail/res/xml/elm5f_2.tmx
index 31b3c16d5..e57118f6b 100644
--- a/AndorsTrail/res/xml/elm5f_2.tmx
+++ b/AndorsTrail/res/xml/elm5f_2.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="24" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="35">
+<map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="24" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="37">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
@@ -271,6 +271,16 @@
     <property name="when" value="enter"/>
    </properties>
   </object>
+  <object id="35" name="ortholion_c3_fix2" type="script" x="448" y="320" width="64" height="32">
+   <properties>
+    <property name="when" value="always"/>
+   </properties>
+  </object>
+  <object id="36" name="ortholion_c3_fix2" type="script" x="416" y="256" width="96" height="32">
+   <properties>
+    <property name="when" value="always"/>
+   </properties>
+  </object>
  </objectgroup>
  <objectgroup id="7" name="Spawn" visible="0">
   <object id="8" name="elm5f2_monster1" type="spawn" x="96" y="160" width="192" height="416">
diff --git a/AndorsTrail/res/xml/waterwayacave4.tmx b/AndorsTrail/res/xml/waterwayacave4.tmx
index 5437a7326..3c5b61c3e 100644
--- a/AndorsTrail/res/xml/waterwayacave4.tmx
+++ b/AndorsTrail/res/xml/waterwayacave4.tmx
@@ -191,15 +191,15 @@
  </layer>
  <layer name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzFlr9OAkEQxs9LaM5ERZJ7JZ9DpfRFtKSFSksCtnYoDbQcnXRqiEpnQbhKd8JOmP2Y3VtIiF8yAe6W+83s/NlLkv9TP3Xt+UAW4j4aKw5gzWzN6qUul316MfZxANO4Msapsh+o+9r6s1Vzf4fk47Jfw3x97aRh/DjfrHkT31m0RhOvLc627zGXcyp1E+G/VNv6O83d67+KrxpXi4n1Y++dNjasO2OdVPfdp1C8vD8hP3rpdh+wb23rj2asGF9vRWwdEaPsg75yLyTmXpp6uzJ2nbnfqQ4nttZxvsg+GMC9Ksl1XE9Yp++21rW95T6Y7MiW6+Q+avU5SN25RzPmwfraBXZsvNoeNjPXeL99M0ayq2Z0iIvi/ZYzBmue2aFZjfmq4pJoFhRKf0l+Nw3P6iquNu/mJsZPa182/zhTpOR6tiourr84SpKF+Xw1NjP2rTwTjdevhCEXa3UF64lLn6Wxpb1G/Cfl2dJK6IsexBeqVRJxUUvPs0NCrsz9DHLo44ak5RbzK+uI4yD2eE/uXOQWzwkS9k1WT5Lj+uZ/sVyMbWHzPs7ddwwUxjuyvpYRXBmbVlNVXBL1Is2Gke2TqvxKZqnsqTwXtblN3JZ4v+H8yh6V3Hnu9mdpZ2ZoJmh84uJ74VLs18xytXlAzKGdaTFcjBdnfAH1reWOzmz6H53ZdCbuGi+ev/taDDPmfPYp9vk+3h+j07Gi
+   eJzFlr9OAkEQxs9LaM5ERZJ7JZ9DpfRFtKSFSksCtnYoDbQcnXRqiEpnQbhKd8JOmP2Y3VtIiF8yAe6W+83s/NlLkv9TP3Xt+UAW4j4aKw5gzWzN6qUul316MfZxANO4Msapsh+o+9r6s1Vzf4fk47Jfw3x97aRh/DjfrHkT31m0RhOvLc627zGXcyp1E+G/VNv6O83d67+KrxpXi4n1Y++dNjasO2OdVPfdp1C8vD8hP3rpdh+wb23rj2asGF9vRWwdEaPsg75yLyTmXpp6uzJ2nbnfqQ4nttZxvsg+GMC9Ksl1XE9Yp++21rW95T6Y7MiW6+Q+avU5SN25RzPmwfraBXZsvNoeNjPXeL99M0ayq2Z0iIvi/ZYzBmue2aFZjfmq4pJoFhRKf0l+Nw3P6iquNu/mJsZPa182/zhTWFSfcj1bFRfXXxwlycJ8vhqbGftWnonG61fCkIu1uoL1xKXP0tjSXiP+k/JsaSX0RQ/iC9UqibiopefZISFX5n4GOfRxQ9Jyi/mVdcRxEHu8J3cucovnBAn7JqsnyXF9879YLsa2sHkf5+47BgrjHVlfywiujE2rqSouiXqRZsPI9klVfiWzVPZUnova3CZuS7zfcH5lj0ruPHf7s7QzMzQTND5x8b1wKfZrZrnaPCDm0M60GC7GizO+gPrWckdnNv2PZiKdibvGi+fvvhbDjDmffYp9vo/3B3CDscM=
   </data>
  </layer>
  <layer name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJxjYCAeCDORoHgAzSQVHBZjYPDD4Q52HOJa/BA6D00eWT3IXEL2xkHVi0NpTiLDow5NH7q52MRgbiPkLnLBJRz2gsAaJuzytAKU+nEumemSGmFLjhlD2V5yACF7ceVbYtyLr0wayHRBjjvoGT+klH3kAHQzL4qhlpf4yhiY23zxhBss3tHjnxp+iUUq37GV2dgApfbyCUPoHFbS9FFi7yUB8vXSK62C7IHV3yBAr3oJZC8o7kFpYA0d2z0ge38B4+U3BXFDrr0DAehhL7Y6Yij6d9MQyK8DbS8t+yiEzKZ3/wgACIMsHQ==
+   eJxjYCAeCDORoHgAzSQVHBZjYPDD4Q52HOJa/BA6D00eWT3IXEL2xkHVi0NpTiLDow5NH7q52MRgbiPkLnLBJRz2gsAaJuzytAKU+nEumemSGmFLjhlD2V5yACF7ceVbYtyLr0wayHRBjjvoGT+klH3kAHQzL4qhlpf4yhiY23zxhBss3tHjnxp+iUUq37GV2dgAtcIwh5U09ZTYe0mAfL30Sqsge2D1NwjQq14C2QuKe1AaWEPHdg/I3l/AePlNQdyQa+9AAHrYi62OGIr+3TQE8utA20vLPgohs+ndPwIAO9Mr/A==
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer name="Walkable" width="30" height="30" visible="0">
   <data encoding="base64" compression="zlib">
    eJztklEKgDAMQ3cK73+F3VD824dN0xiroIUijK0vqZnbGPNvex/1Vm5W65z1yxTDrcxD+hA3u5/NZ9+ou43eO7isDkduFYYr509wEb+DizS4/qmDe8deqlwXG+UMlYvLcJw6sjmsFof/jjx3z+/mZplQM1K54+CyuUJeGS7KNuNX4bIMxXM0t+KtuqtIx3qucs8YjI6rXr/QO0Rr+h0=
   </data>
diff --git a/AndorsTrail/res/xml/wild17.tmx b/AndorsTrail/res/xml/wild17.tmx
index 3079e26ae..487947e7b 100644
--- a/AndorsTrail/res/xml/wild17.tmx
+++ b/AndorsTrail/res/xml/wild17.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="2017.05.26" orientation="orthogonal" renderorder="right-down" width="20" height="30" tilewidth="32" tileheight="32" nextobjectid="16">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="20" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="16">
  <properties>
   <property name="outdoors" value="1"/>
  </properties>
@@ -60,150 +60,150 @@
  <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="0" columns="0">
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="0" columns="0">
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="6825" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="6945" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7065" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7193" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="30">
+ <layer id="1" name="Ground" width="20" height="30">
   <data encoding="base64" compression="zlib">
-   eJwz5GRgMBzFo3gUj+JRPIpH8SgexVTDAF6Kh/E=
+   eJzbyMnAsHEUj+JRPIpH8SgexaN4FFMNAwBJGbQA
   </data>
  </layer>
- <layer name="Objects" width="20" height="30">
+ <layer id="2" name="Objects" width="20" height="30">
   <data encoding="base64" compression="zlib">
-   eJx9VdFqg0AQ9AdaLg+Cf9Gf67fFp0JpQWOTvvRB2ypIX1JU6DfUJQ43TtYMiLnL3tze7Ow5ZEkyzs8wP9P8tMvY0KVJcg5JkqdxzHHTEmfAuAiX8RguscZVh7jeYHw/uzhWzpZy2s8xX2lyhT6s+Zi/pL0HOs8hxPXN/LtOI3+18Fn+FfFNNk/rDFi339DjY7fOB8CY9wWmZY/vbFtjrB9Jz4py4/gqrM/eih4d6VdIPQyq38mpNc8hnz5c18NQiobgaTO/9lhveeVUHz4/YpsQNVP/jKJf4eTXhetY8GP+PURvG443/Gfol9hziHpabk/p9vPn8GF/9i50b6UGXfD7uJL8zJ81acjxU7bmQe72n9XgM8S91N/K9SU18DQGGuI7O/17XOag1fMNHVVPBuqCHkSufBb0L8d7qKmH4W9oBr67met+5/vb1rSiSSP7DZSf1pZrNFHNzBOF9DLWHeUuZo7Txr1ue+XkReTNuYCPObz7HGfN0/UeXu9r7szxmsU702AePzj+f6Pz1tSLXAMPxg0fePedep9RyLelpj20dp7/tu5XBdeuJy8V1EuqLXxRSY8bXkQ/e/ek3627pRdt7X4oaU6/Z5wfuH43vmUPSx0el7d6TPuDUTpnUqhfvfygG+5hz+Pe+x/soH41
+   eJx9VdFqg0AQ9AdauDwIfkV/rt8WnwqlBY1N+tIHbasgfUlRod9QlzjcOFkzIOYue3N7s7PnkCXJOD/D/Ezz0y5jQ5cmyTkkSZ7GMcdNS5wB4yJcxmO4xBpXHeJ6g/H97OJYOVvKaT/HfKXJFfqw5mP+kvYe6DyHENc38+86jfzVwmf5V8Q32TytM2DdfkOPj906HwBj3heYlj2+s22NsX4kPSvKjeOrsD57K3p0pF8h9TCofien1jyHfPpwXQ9DKRqCp8382mO95ZVTffj8iG1C1Ez9M4p+hZNfF65jwY/59xC9bTje8J+hX2LPIeppuT2l28+fw4f92bvQvZUadMHv40ryM3/WpCHHT9maB7nbf1aDzxD3Un8r15fUwNMYaIjv7PTvcZmDVs83dFQ9GagLehC58lnQvxzvoaYehr+hGfjuZq77ne9vW9OKJo3sN1B+Wluu0UQ1M08U0stYd5S7mDlOG/e67ZWTF5E35wI+5vDuc5w1T9d7eL2vuTPHaxbvTIN5/OD4/43OW1Mvcg08GDd84N136n1GId+WmvbQ2nn+27pfFVy7nrxUUC+ptvBFJT1ueBH97N2Tfrfull60tfuhpDn9nnF+4Prd+JY9LHV4XN7qMe0PRumcSaF+9fKDbriHPY97739ogX/M
   </data>
  </layer>
- <layer name="Above" width="20" height="30">
+ <layer id="3" name="Above" width="20" height="30">
   <data encoding="base64" compression="zlib">
-   eJy9VdsRwCAIcwz3X6G/LmKn6fHhHZfylNN8VkkggG2thre3NnuR5CIo15XzeyDvDCfmoPkY4eSxdH8IvKNY7+x/nYyP/G51Zk7P3C6/5Af3HXuQnUd+n8D9zM6zVCPyZHp7A6f2VtORdtTTx55o3mh76cUtDJgBTd+qh3NIu23lnTl7NriqqL53hMh7t755epFaUU/SQWi9inprzfPO245AX7x/gOWBFWfF4Lm1Y5n8PHxxFWo6
+   eJy9VdsRwCAIcw33H6G/LmKn6fHhHZfylNN8VkkggG2thre3NnuR5CIo15XzeyDvDCfmoPkY4eSxdH8IvKNY7+x/nYyP/G51Zk7P3C6/5Af3HXuQnUd+n8D9zM6zVCPyZHp7A6f2VtORdtTTx55o3mh76cUtDJgBTd+qh3NIu23lnTl7NriqqL53hMh7t755epFaUU/SQWi9inprzfPO245AX7x/gOWBFWfF4Lm1Y5n8PHxQ0Wqs
   </data>
  </layer>
- <layer name="Walkable" width="20" height="30">
+ <layer id="4" name="Walkable" width="20" height="30">
   <data encoding="base64" compression="zlib">
-   eJytlMsNwDAIQ7NE958hG+aOwD+KlEubmOfg9n7n3GZN1e2dzjEtRROdcTQ35dyHwsZ6pex1vzMrhUPRSHhTz/XOUy2W3+kd05xYnUK9lXkzNmW+qv9Eh/n+8zvuuJk3tyfL0DQzpMcy3vVCDCkfYmF67J/h8qFsq/1YdV63pXhR+7laavbV2dZzE7vLgJ4jxiRfWz62HrbKzoM=
+   eJytlMsNwDAIQzNF918hG+aOwD+KlEubmOfg9n7n3GZN1e2dzjEtRROdcTQ35dyHwsZ6pex1vzMrhUPRSHhTz/XOUy2W3+kd05xYnUK9lXkzNmW+qv9Eh/n+8zvuuJk3tyfL0DQzpMcy3vVCDCkfYmF67J/h8qFsq/1YdV63pXhR+7laavbV2dZzE7vLgJ4jxiRfWz62HkZGz44=
   </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
+ <objectgroup id="5" name="Mapevents" visible="0">
   <object id="1" name="north" type="mapchange" x="192" y="0" width="192" height="32">
    <properties>
     <property name="map" value="blackwater_mountain1"/>
@@ -270,7 +270,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
+ <objectgroup id="6" name="Spawn" visible="0">
   <object id="12" name="forestboar4" type="spawn" x="352" y="384" width="224" height="192">
    <properties>
     <property name="quantity" value="2"/>
@@ -295,5 +295,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
+ <objectgroup id="7" name="Keys"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild18.tmx b/AndorsTrail/res/xml/wild18.tmx
index 4249db39a..2e34a4916 100644
--- a/AndorsTrail/res/xml/wild18.tmx
+++ b/AndorsTrail/res/xml/wild18.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="20" height="30" tilewidth="32" tileheight="32" infinite="0" nextobjectid="23">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="20" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="23">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
@@ -180,32 +180,32 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="30">
+ <layer id="1" 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=
   </data>
  </layer>
- <layer name="Objects" width="20" height="30">
+ <layer id="2" name="Objects" width="20" height="30">
   <data encoding="base64" compression="zlib">
    eJyVVl8rREEUP02hK1pzsWzxCfgW8gnkzZN45EFePFglefW0eVS+gPKg5Anl324kxQphC+1uHnwA5ZxmTvfc2ZmLX53OnT/nN785c2Z2mwWAB7QmWgXtXrTJN9AIZ9p4OfZfz1wflqsemFMX3u2X8yVIX1n75xxb/yjGqY/a7tqTsdVmNc7Gfj3MXfH0y73yHF5f6q1kxLi5IJzb+Dudbn/q1hhf3g7Rjpy8vWPsidDlnhvrZy7ei9tm3BfCXH+pDdYypABm+sx3qEay+mVentGvItci2npf6/qcF5+egkr202+/p9CPDAOMDhsf0iO59vMArzEEkVeGfwFtOjJ9oXtwHSc1QNgdAqjFxhO6rb7vduNddKt0e7w3rCsV1wEQ2dhaxl4IVatvDuePqWSPi9Hv69C8ebSSMnkjXFq+ZeybsHwD6NeidJzLU8wBrKAVnTECc/swEyV+qcfYdhtA1yDARs6Yi1vnXp6JM+J9u/snvq2cMcIL6nwSWvdQ44FHp4+P7nIn8u3kjEkwJ93Xi7zhZSvnk/OUfLfaz5GFU53moVp7FLXCueHfAOJUKvnmezfr1Fcofz6UY8NV1en3U4JrhflC9cxvdsnOl2+e5OY6ZN/Q6XgG7X/BWcu93yWV5jv2nD/pberWfoq/8bzXVc/cLMizlm+qBNcH3U3S+P7LGsRJ7+yVOJeSWIfuI9mbyM+mHZd59J2V5Kk746wz674zGoXk/wJhLVAXX6KfeSnHm/bd4rf+B4IuFGg=
   </data>
  </layer>
- <layer name="Above" width="20" height="30">
+ <layer id="3" name="Above" width="20" height="30">
   <data encoding="base64" compression="zlib">
    eJytlrENwjAQRS06KpookvdgAgoGQIgBMgM9G9AhOkZAAloq2CCpYAWWwCdx4mJ923eBL52iOMnz9519inNfPb3L6lF4/i9dwDxorOSX3yHf/O7V98eRrspxzfw5xfO/fN/XKVzPiprEa5FrlJ7l/axybhpiXqX98Dc8HvuTWgTOMsSqyuc2ZmvU1f17TV5y7HvEQ353I503xItFrL2R14zTIXWrcVj8STUeh1T74ZX8dcbzgXxa6pDjbSbD2bz/iLcFnHh/an3R9QB4reClehHi0XdHwNNoLepm2S+lM0xcC0/26pSs/jiHkj10vZKT8vpL/lC9Lb2D/ZXEe7Z0RmWfzdXF6hHJ2idJ5An9GyAx23pepVC+cp7fOzJokg==
   </data>
  </layer>
- <layer name="Top" width="20" height="30">
+ <layer id="4" name="Top" width="20" height="30">
   <data encoding="base64" compression="zlib">
    eJxjYBgFo2AUDFUwkRM7TS5YCNSfxImgJ1No3igYBaNgFIxUAADI8ASV
   </data>
  </layer>
- <layer name="Walkable" width="20" height="30" visible="0">
+ <layer id="5" name="Walkable" width="20" height="30" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzNk0EOACEIA32Ft334PsMf7pUYwVJqVhMuBsZCcfTWxibs2eX+xVLwVswK19ZXuchRsBSesizFzE+wbg7Ex8zeRDmzvwiP1ayeAVo791nVsuKpZsXwPCbiL8t7nxyT1ZdhojxvD+xdxIv6QXxi/jDaO6vPy2U0Im8izEwPal4UH6KXGvM=
+   eJzNk8ENACAIA53C/VdwQ7/ECJZSoyZ8DJyF4uitjUPYc8p9xVLwdswK19ZXuchRsBSesizFzG+wfg7Ex8zeRDmrvwiP1ayeAVq79lnVsuOpZsXwPCbiL8vLMll9GSbK8/bA3kW8qB/EJ+YPo72z+rxcRiPyJsLM9KDmRTEB1VobBA==
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup id="6" name="Mapevents">
   <object id="8" name="west2" type="mapchange" x="0" y="512" width="32" height="96">
    <properties>
     <property name="map" value="wild19"/>
@@ -248,7 +248,7 @@
   <object id="21" name="stn_gyra_m18_1" type="script" x="64" y="896" width="160" height="32"/>
   <object id="22" name="stn_castle_cleared" type="script" x="160" y="544" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup id="7" name="Spawn">
   <object id="1" name="stoutford_guard1" type="spawn" x="288" y="480" width="64" height="32">
    <properties>
     <property name="spawngroup" value="stoutford_guard1"/>
@@ -305,6 +305,6 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
- <objectgroup name="Replace"/>
+ <objectgroup id="8" name="Keys"/>
+ <objectgroup id="9" name="Replace"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild19.tmx b/AndorsTrail/res/xml/wild19.tmx
index b156edf51..65ee5f71a 100644
--- a/AndorsTrail/res/xml/wild19.tmx
+++ b/AndorsTrail/res/xml/wild19.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="20" tilewidth="32" tileheight="32" nextobjectid="20">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="20">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
@@ -180,32 +180,32 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="20">
+ <layer id="1" name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
    eJzbyMnAsHEUj+JRjBVvF2Zg2MyJinGpIwYfx2IeNnxcmDi8lBOCm3hwmwWSg6kjhEFqYfi7MHaMrIYQZpdBwiI4sAzxWAwNo8cDujwhPNDpa6hjAABzDvo=
   </data>
  </layer>
- <layer name="Objects" width="20" height="20">
+ <layer id="2" name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
    eJytU71KxEAQXkIsrlDMioHA+SDWYiHYWWohgmLh3RvoC/gOdr6AhYqtcMlp6lMwlYVcLr7DOXM7w85OcoVwA0Pm55tvZ2cnTWYWMkmM+QJ7Rv4I/Brshvwyc/km8zjEoNQizjlZmxMORXLI7+IMwJ3bENd1fpU4bK36qTs4PxROY+SdczGDKmn3i/FCxLmuFudzTNaWVKe5pnQP2S/KD50xT/xclvUdvFEHbkRncN/jxM1E980cr+IeeccMWCrxpoWw54q7Ebmu95d3Yew67MCGbXMXHf3oL9vT1Gudtt+mXPK+eqfkXVhmaciPquUwct/tyMeyKPRR9rdC/1PNi/Enqk5LCvlnmtlEcBz0XQ7lAexv63PoS2H/rOdrlp31H0H8EPTFhvEn63ruRSHnQPHvRZ7Hkn1DNWOof7NuV3PrYjjnHcFxTTbXHoncr/V7zly3m87fjY05jd0X53a5ZswF6D3oFcQGoMPY/d+VDWdb0r6MiZt39y5uz4cxx/0Qi309pqvVVco79PcHAwDQMQ==
   </data>
  </layer>
- <layer name="Above" width="20" height="20">
+ <layer id="3" name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
    eJxjYGBguCXJwHATiHEBQvLYwB5JhF4YIGQHLnXo9t8i0i3EqkO3F+Z2XO4lJizQ3UuMWaS6FwQ2YwlncgE2M3DFBSn2wdSTkoZw2UGsGcS4j1izHrHjl39IQB4dMHHgl2ckII8MDokxMCRD/bFTiIFhlxCq/E4hhDpicBKRYQJSRwxGBhEymG70kiHer+gA3SwPIs3ag8WP2MRwgYtixKsdbABfvsKWt9HFkeVBbABBVElL
   </data>
  </layer>
- <layer name="Top" width="20" height="20">
+ <layer id="4" name="Top" width="20" height="20">
   <data encoding="base64" compression="zlib">
    eJxjYBgFo2AUDFUwkZM0dYTohUSaB1KXxEmYHgXDGwAAdp8JsA==
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer id="5" name="Walkable" width="20" height="20" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsBENwwC6ODnq0AGl6pDVU8N9lPoZmx5Kwg8XINf9+AAl7iPWbFLsJKSXWHfjs5ccs6gRlqSYRY678JlLrJ3UDA9yw4VcTIld2NyKLIZPHiY+UxZTbLgDkB8Blmmsgg==
+   eJzbKMbAsBENwwC6ODnq0AGl6pDVU8N9lPoZmx5Kwg8XINf9+AAl7iPWbFLsJKSXWHfjs5ccs6gRlqSYRY678JlLrJ3UDA9yw4VcTIld2NyKLIZPHlf4Ehs+QxmA/AgApuiskw==
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup id="6" name="Mapevents">
   <object id="4" name="east1" type="mapchange" x="608" y="384" width="32" height="64">
    <properties>
     <property name="map" value="wild18"/>
@@ -252,7 +252,7 @@
   <object id="23" name="stn_gyra_100" type="script" x="224" y="512" width="32" height="128"/>
   <object id="24" name="stn_gyra_60" type="script" x="192" y="480" width="32" height="160"/>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup id="7" name="Spawn">
   <object id="9" name="forestwolf1" type="spawn" x="32" y="32" width="544" height="320">
    <properties>
     <property name="quantity" value="4"/>
@@ -294,7 +294,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys" visible="0">
+ <objectgroup id="8" name="Keys">
   <object id="25" name="base_nondisplay:2" type="key" x="256" y="544" width="32" height="96">
    <properties>
     <property name="phrase" value="stn_gyra_52"/>
@@ -305,5 +305,5 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Replace"/>
+ <objectgroup id="9" name="Replace"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild20.tmx b/AndorsTrail/res/xml/wild20.tmx
index 711e72df3..d0001fbd9 100644
--- a/AndorsTrail/res/xml/wild20.tmx
+++ b/AndorsTrail/res/xml/wild20.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="20" tilewidth="32" tileheight="32" nextobjectid="23">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="23">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
@@ -180,32 +180,32 @@
  <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="20" height="20">
+ <layer id="1" name="Ground" width="20" height="20">
   <data encoding="base64" compression="zlib">
    eJzbyMnAsHEUj2Iq4xAR6plVBDWrjFwzuRgYNgHxZi4IX1SGgUEMiMVlCOvdLszAIMQF0SME1X8QSB8C4sNQPhtQjh2IOWQg6vHh48IIs0B4tzCqebuFUd13XBg/Xopm/2k080B8ZHmQeny4iQfV/pPsqOadZUeVB6nHh9llUPFNNPPusmOqaeLCFINhMTT8Fs08EB9dTSMXphgMY4tzmHlHoelmE1r6aeQiLf3BzEPHsPSzGYqJNe8iUN8lLPgymeYRwvjMAwC/pQai
   </data>
  </layer>
- <layer name="Objects" width="20" height="20">
+ <layer id="2" name="Objects" width="20" height="20">
   <data encoding="base64" compression="zlib">
    eJyNVL1KA0EQHg7JVQH3SE4CyRPoO1jY2tmKIFoJvoA/jYiFD+FDWCjWgnfRlKJCDkSL/JzPEHAmN8vOTjZ6HwyzM7v77Td7czvsAJRoRQow5THhHuO+qcaU/0EbBjyt1/OEEB8hZ85lHISB4JoKfYQX4/NZfaVY+/mH7oHUZxwH8WUYj9GejNMhMTM+pz3rzTh9dk9f6MvFORMcD4zLFca/J8tBfHIfwerKVL7g+N3qZl8ax2v1jdReqqlQubl+kRubxTqKFGpB1zDX13F5/X11ba9tgHYEcNhyuVC/EYY8fkiW66O6LpArRs6rlr93WT9ergI8J5UPYb0HsNGrvMYRnrMTVWOqg+wALUO+HG078te3OU5Vfovjk2gxtx+583fVvpC+Jq+57frrvhPHu9cAOOV1j4G7pPm6oPq7seMj2ProLNI1a1Re130cuVzM/ozqVXzyLEIT5xM1v4bxOed6zFtyL1K/bK78X8uI72JC70fq97J8L4jvBvmuAz0ja8zkO6HfEOYdm/r/G/F98Xf8wPGdMv2/1eHT+iR+AXn8m6E=
   </data>
  </layer>
- <layer name="Above" width="20" height="20">
+ <layer id="3" name="Above" width="20" height="20">
   <data encoding="base64" compression="zlib">
    eJxjYECAm5IMDLckGUgGe9D0EDLjJh55kF5keXSzSXEHrfTQwgwYICf8KQXGIgwMJkBsKoJdHtl/xKSRIKg5YSKoetD1wuI5XIZ4t14WwxRDTjMwt+4SYmCIxGNuCdRth8Xwp0cQOAk0azsQ7xDCbj8yOExAHgZOQd0HUr9bGIFJNe8Qknw2E0T9aWEExqYeH07CEhan2IFmAfEZdkw5kHp8GARymEjzEwjgCmdsae8SEebB7NxDZtmCz05q5n90QG6ZTI7Z6PkUm7/2oOVjACjvSuA=
   </data>
  </layer>
- <layer name="Top" width="20" height="20">
+ <layer id="4" name="Top" width="20" height="20">
   <data encoding="base64" compression="zlib">
    eJxjYBgFo2AUEALNAgPtAuxgIid56nHRC0k0bzFU/SIgncQJ0Y9Mj4LhDQDVBggs
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer id="5" name="Walkable" width="20" height="20" visible="0">
   <data encoding="base64" compression="zlib">
-   eJzbKMbAsBGIQWAjEhsZwMSJxej6sAFKzCTGLHx2EAtIsQufHkJ2YHMzqWaQI0eKGlIBsW4ixr+E4hWbOkL2E9JLStohNS0TSj+0NI/YcB4o8wjlXUJ5BZc8MeFFTj4gpH+mLGVmUhuQU77gAwCNZYTd
+   eJzbKMbAsBGIQWAjEhsZwMSJxej6sAFKzCTGLHx2EAtIsQufHkJ2YHMzqWaQI0eKGlIBsW4ixr+E4hWbOkL2E9JLStohNS0TSj+0NI/YcB4o8wjlXUJ5BZc8MeFFTj4gpJ9SM6kNyClf8AEAnEyE7g==
   </data>
  </layer>
- <objectgroup name="Mapevents" visible="0">
+ <objectgroup id="6" name="Mapevents" visible="0">
   <object id="3" name="sign_stoutford_gate" type="sign" x="256" y="256" width="32" height="32"/>
   <object id="4" name="entrance3" type="mapchange" x="320" y="480" width="32" height="32">
    <properties>
@@ -280,7 +280,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Spawn" visible="0">
+ <objectgroup id="7" name="Spawn" visible="0">
   <object id="14" name="stoutford_commoner5" type="spawn" x="128" y="512" width="32" height="32">
    <properties>
     <property name="spawngroup" value="stoutford_commoner5"/>
@@ -318,6 +318,6 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
- <objectgroup name="Replace"/>
+ <objectgroup id="8" name="Keys"/>
+ <objectgroup id="9" name="Replace"/>
 </map>
diff --git a/AndorsTrail/res/xml/wild23.tmx b/AndorsTrail/res/xml/wild23.tmx
index 07b392eb1..7432b2727 100644
--- a/AndorsTrail/res/xml/wild23.tmx
+++ b/AndorsTrail/res/xml/wild23.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="2017.05.26" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" nextobjectid="11">
+<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="11">
  <tileset firstgid="1" name="map_bed_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_bed_1.png" width="512" height="256"/>
  </tileset>
@@ -57,150 +57,150 @@
  <tileset firstgid="2225" name="map_fence_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="0" columns="0">
+ <tileset firstgid="2353" name="map_fence_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_fence_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2353" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2481" name="map_ground_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2481" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2609" name="map_ground_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2609" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2737" name="map_ground_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2737" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2865" name="map_ground_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2865" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="2993" name="map_ground_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="2993" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3121" name="map_ground_6" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_6.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3121" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3249" name="map_ground_7" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_7.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3249" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3377" name="map_ground_8" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_ground_8.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3377" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3505" name="map_house_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3505" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3633" name="map_house_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_house_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="0" columns="0">
+ <tileset firstgid="3761" name="map_indoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3633" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="3889" name="map_indoor_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_indoor_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3761" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4017" name="map_kitchen_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_kitchen_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="3889" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4145" name="map_outdoor_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_outdoor_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4017" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4273" name="map_pillar_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4145" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4401" name="map_pillar_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_pillar_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4273" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4529" name="map_plant_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4401" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4657" name="map_plant_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_plant_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4529" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4785" name="map_rock_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4657" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="4913" name="map_rock_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_rock_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4785" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5041" name="map_roof_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="4913" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5169" name="map_roof_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5041" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5297" name="map_roof_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_roof_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5169" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5425" name="map_shop_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_shop_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5297" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5553" name="map_sign_ladder_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_sign_ladder_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5425" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5681" name="map_table_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_table_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5553" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5809" name="map_trail_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_trail_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5681" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="5937" name="map_transition_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5809" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6065" name="map_transition_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="5937" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6193" name="map_transition_3" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_3.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6065" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6321" name="map_transition_4" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_4.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6193" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6449" name="map_transition_5" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_transition_5.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6321" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6577" name="map_tree_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6449" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6705" name="map_tree_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_tree_2.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6577" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="6833" name="map_wall_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_wall_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="6705" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="6961" name="map_wall_2" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_2.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="6825" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7081" name="map_wall_3" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_3.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="6945" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
+ <tileset firstgid="7201" name="map_wall_4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../drawable/map_wall_4.png" width="480" height="256"/>
  </tileset>
- <tileset firstgid="7065" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7321" name="map_window_1" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_1.png" width="512" height="256"/>
  </tileset>
- <tileset firstgid="7193" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <tileset firstgid="7449" name="map_window_2" tilewidth="32" tileheight="32" tilecount="128" columns="16">
   <image source="../drawable/map_window_2.png" width="512" height="256"/>
  </tileset>
- <layer name="Ground" width="30" height="30">
+ <layer id="1" name="Ground" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJztlL0OgjAQgLt0sG8DjE5GRycHHwF9BTC6o9Fd8QX8eUiPeA1NLS09i4sdvtCUhq93x10yYiyJRP6cQjBWAhtgj2yBHe4fxDDeSnM16yNwwvUQ3gw4G1wq33gzC433YqEW73NU75IztuLt03YXlado11Rvjk4fr46vV3VK7w1iuXfwEGG8kjXG7RMjNdfSJ8l/EG9zVs6G0vHNkPVVe6XWfAXOKdP3Te8otR1DbueI3rumPJvu6eud8JYpMCP0EaV3U/AskJR//qOh54VrRvatNcXb118Z6hnC6/JfLXkP4bX5u2oe0qu7TfuhfZFIX16gV/JC
+   eJztlL0OgjAQgLt0gEZ3xRfwZ2J1Mjo6OfgI6OsRng6Nxmu4hqaUQuvhYocvNKXh691xVyaMlZHIn1OnjD2AJ5CKhhes37gvxDTexHDJ9QyY4/4U3gpYiK5L5xtv5UB6lw4y0ZwL9V45YzfePl130dmJdh3qLdDp4zXx9epO5V1DLJsetoLGq7hj3D4xhuZa+RTFD+KVZ9VskLi+SVlfvVcyw1fjnLJ93/YupLZ7yO0ZMXvXlmfbPX29B95yBE4BfRTSuzl4LkjOu/8o9bwYmpFjax3iHetPLPWk8A75V468U3hd/r6aU3pNt22f2heJjOUDsr9jog==
   </data>
  </layer>
- <layer name="Objects" width="30" height="30">
+ <layer id="2" name="Objects" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJylV7FuE0EQvSKRUnHn4iR/CnR0QOsOKpSIEppIiJqChs9BoiIFRMI2OSkKRQzYwlTBZ0spKCLTsePsY9+NZ/cO8qTRntd38+bN7sztTftZtnI2vcG4dFareUHt/6v64RrjTTnBYfm+KJr8gqGfS8WvdVi6puRz7H0ywHNeZtlbslT87519UPPiR+sSzA3/X8tmDCuKS/uI6WEOYFE0NTF+0tznXvM/iXFJz97dC7HoHAJPnI8Lp2PRweoy5F7nlPPxeG87D8g5Y6jyxxi7uD55faPS1lGTP73uem2QS9G6cvZi1+arvDHvsmjW1OZ+729BeYZ/K3criudhnmWPch+X4xr1wrjh87kGqiJoZyDPsu7I5Rdjz8QAzor2EbhlL4+pnjdx+LFRL5E1PCuvY3nnxiPDvqvn5N4RzdVKh66bFG+MU+zU2VzN6d9Hkb4x9Hk+N3J8ltjLwIzuEb38u63P/69esR/07Jt+4G3rtaiVGG9XvSOn9djz6n5g9fdUXxDE9GId9RqftqyvYOzX1nq3CLiuNP8lxctriv2Mnn1S2L24TW8XgHdCdcS5FXAPqRJ7SiDrO0nUr9b+zY2/y219wjPodesZr3a35/6+1411ASeg3+N6b125e6e+L4m/p47vmbPnzgZ5MA3dU5Hfk1t27fD4y/dWcAvAK9jPgx3mzbo6yJtxgfd1HvTG6pdH4V4TP3wfGJoHfp7jEt6XO1l2bydw3na67vTSfQs9U/Mfkm9g3/PiGnkWzpp83XecD3r/dl7l3E+KsHfWah5z2FO6P3U9v1q5XyvfV8Yc0KZHeqm8HyW+eRG/DxqAj+X1WWJRtO+ZlM+ZUVvJ8zrymfgWaPu2iX3rHBvPS3wV1ewwotfyOVMxov90Pc8DfE7XXDPyiWf/ACZzOoU=
+   eJylV7FuE0EQvSKR0nHn4iT/CXR0QOsOKpSIEppIiJqChs9BoiIFRMI2OSkKRQzYwlTBZ0spKCLTsePsY9+NZ/cO8qTRntd38+bN7sztTftZtnI2vcG4dFareUHt/6v64RrjTTnBYfm+KJr8gqGfS8WvdVi6puRz7H0ywHNeZtlbslT87519UPPiR+sSzA3/X8tmDCuKS/uI6WEOYFE0NTF+0tznXvM/iXFJz97dC7HoHAJPnI8Lp2PRweoy5F7nlPPxeG87D8g5Y6jyxxi7uD55faPS1lGTP73uem2QS9G6cvZi1+arvDHvsmjW1OZ+729BeYZ/K3criudhnmWPch+X4xr1wrjh87kGqiJoZyDPsu7I5Rdjz8QAzor2EbhlL4+pnjdx+LFRL5E1PCuvY3nnxiPDvqvn5N4RzdVKh66bFG+MU+zU2VzN6d9Hkb4x9Hk+N3J8ltjLwIzuEb38u63P/69esR/07Jt+4G3rtaiVGG9XvSOn9djz6n5g9fdUXxDE9GId9RqftqyvYOzX1nq3CLiuNP8lxctriv2Mnn1S2L24TW8XgHdCdcS5FXAPqRJ7SiDrO0nUr9b+zY2/y219wjPodesZr3a35/6+1411ASeg3+N6b125e6e+L4m/p47vmbPnzgZ5MA3dU5Hfk1t27fD4y/dWcAvAK9jPgx3mzbo6yJtxgfd1HvTG6pdH4V4TP3wfGJoHfp7jEt6XO1l2bydw3na67vTSfQs9U/Mfkm9g3/PiGnkWzpp83XecD3r/dl7l3E+KsHfWah5z2FO6P3U9v1q5XyvfV8Yc0KZHeqm8HyW+eRG/DxqAj+X1WWJRtO+ZlM+ZUVvJ8zrymfgWaPu2iX3rHBvPS3wV1ewwotfyOVMxov90Pc8DfE7XXDPyiWf/AI63PO0=
   </data>
  </layer>
- <layer name="Above" width="30" height="30">
+ <layer id="3" name="Above" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzVVjsOwjAM9dK5ZEDqKVhggRvAyF7uCB34iEswtgtXIZUakQbbTVu7ok+KqqRR3ntWHBtABs+sPa+8eZm151KQPLPWf7bjoqCTQq3fxabM2utzg+8jVn94ZzjcDcDD/HJKYpsC7FKaD0MfDxT2lvPQ8F4t5818vxQ0cgrjfC/o/c67Vn5zmDpfwhzVBhdTLb9T+sM4JXJpztC+x1itcaBiv04ANsk4Torn396M3Po82fFaynHE5JTj1URsbV4RNYeKSZ83g+Omzq/Xj+lwTp8b88/xhrFwd7dvn+NrGIIuv0Xzn3s/q449Yf8WE+Owx+f2SfcIlMYikkOy1lFaxvod0+OEccDqLHbmB0gkZRA=
+   eJzVVjsOwjAM9dK9ZEDqJVhggRvAyF7uCB34iEswtgtXIZUakQbbTVu7ok+KqqRR3ntWHBtABs+sPa+8eZm151KQPLPWf7bjoqCTQq3fxabM2utzg+8jVn94ZzjcDcDD/HJKYpsC7FKaD0MfDxT2lvPQ8F4t5818vxQ0cgrjfC/o/c67Vn5zmDpfwhzVBhdTLb9T+sM4JXJpztC+x1itcaBiv04ANsk4Torn396M3Po82fFaynHE5JTj1URsbV4RNYeKSZ83g+Omzq/Xj+lwTp8b88/xhrFwd7dvn+NrGIIuv0Xzn3s/q449Yf8WE+Owx+f2SfcIlMYikkOy1lFaxvod0+OEccDqLHbmBybTZYI=
   </data>
  </layer>
- <layer name="Walkable" width="30" height="30">
+ <layer id="4" name="Walkable" width="30" height="30">
   <data encoding="base64" compression="zlib">
-   eJzVlF0OgCAMg7mE9z8DNzS+EbKybnagS3wQDd9+uvartf7T5wl0Pn4bQ8mOROZuVG8VN1OXlRN6V7AsNroTaSHCZjWUDe9ulI9XL8v2ZoPys7hv9MP0ceYws1FHZFcreNX1Rv1BwY0wFT48563c50w+J5mMz1TwLM9Q+2pWUzv1vPpfyfR2N7Nzq/1h62H9dNYLy2TZqCeoX6s8FfPMMpRsBRf1Us1QaG8H9+v13hjUV3g=
+   eJzVlF0OgCAMgzmF978CNzS+EbKybnagS3wQDd9+uvartf7T5wl0Pn4bQ8mOROZuVG8VN1OXlRN6V7AsNroTaSHCZjWUDe9ulI9XL8v2ZoPys7hv9MP0ceYws1FHZFcreNX1Rv1BwY0wFT48563c50w+J5mMz1TwLM9Q+2pWUzv1vPpfyfR2N7Nzq/1h62H9dNYLy2TZqCeoX6s8FfPMMpRsBRf1Us1QaG8H9+v13nHRWTQ=
   </data>
  </layer>
- <objectgroup name="Mapevents">
+ <objectgroup id="5" name="Mapevents">
   <object id="1" name="east1" type="mapchange" x="928" y="32" width="32" height="96">
    <properties>
     <property name="map" value="wild17"/>
@@ -234,7 +234,7 @@
   <object id="6" name="strawberry" type="container" x="864" y="736" width="32" height="32"/>
   <object id="7" name="mead" type="container" x="800" y="640" width="32" height="32"/>
  </objectgroup>
- <objectgroup name="Spawn">
+ <objectgroup id="6" name="Spawn">
   <object id="8" name="stoutford_guard1" type="spawn" x="192" y="384" width="64" height="64">
    <properties>
     <property name="spawngroup" value="stoutford_guard1"/>
@@ -251,6 +251,6 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="Keys"/>
- <objectgroup name="Replace"/>
+ <objectgroup id="7" name="Keys"/>
+ <objectgroup id="8" name="Replace"/>
 </map>
diff --git a/AndorsTrail/res/xml/worldmap.xml b/AndorsTrail/res/xml/worldmap.xml
index 72fc3ef91..4dfc96558 100644
--- a/AndorsTrail/res/xml/worldmap.xml
+++ b/AndorsTrail/res/xml/worldmap.xml
@@ -333,9 +333,9 @@
     <map area="charwoodh" id="waytolostmine2" x="426" y="301"/>
     <map area="charwoodh" id="waytolostmine3" x="426" y="330"/>
     <map id="waytominingtown0" x="314" y="404"/>
-    <map id="waytominingtown1" x="344" y="389"/>
-    <map id="waytominingtown1a" x="375" y="407"/>
-    <map id="waytominingtown2" x="375" y="386"/>
+    <map id="waytominingtown1" x="343" y="389"/>
+    <map id="waytominingtown1a" x="374" y="407"/>
+    <map id="waytominingtown2" x="374" y="386"/>
     <map id="waytominingtown3" x="395" y="378"/>
     <map id="waytomountaincave0" x="627" y="255"/>
     <map id="waytomountaincave1" x="621" y="285"/>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index 044de26e5..611125004 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -24,15 +24,15 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_DEBUGRESOURCES = false;
 	public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
 	public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
-	public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
+	public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
-	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
-	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
-	public static final String CURRENT_VERSION_DISPLAY = "0.7.15";
+	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
+	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
+	public static final String CURRENT_VERSION_DISPLAY = "0.7.16beta";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
 	public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
-	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 62;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 63;
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
 	private WorldContext world = new WorldContext();