From 64a1e37844bdcd514037bf599c7bc7f864372c9e Mon Sep 17 00:00:00 2001
From: Ledmitz <smoothshifter@tuta.io>
Date: Sat, 14 Nov 2020 00:01:11 +0000
Subject: Changed music track names in maps to correspond to recently changed
 music names.

Other minor corrections.
Feel free to reassign music in maps in a separate MR.
---
 maps/000-0-0.tmx  |  2 +-
 maps/000-0-1.tmx  |  2 +-
 maps/000-0.tmx    |  2 +-
 maps/000-1.tmx    |  2 +-
 maps/000-2-0.tmx  |  2 +-
 maps/000-2-1.tmx  |  2 +-
 maps/000-2-2.tmx  |  2 +-
 maps/000-2-3.tmx  |  1 -
 maps/000-2-4.tmx  |  1 -
 maps/001-1.tmx    |  2 +-
 maps/001-2-0.tmx  |  2 +-
 maps/001-2-1.tmx  |  2 +-
 maps/001-2-10.tmx |  2 +-
 maps/001-2-11.tmx |  2 +-
 maps/001-2-12.tmx |  2 +-
 maps/001-2-13.tmx |  2 +-
 maps/001-2-14.tmx |  4 ++--
 maps/001-2-15.tmx |  2 +-
 maps/001-2-16.tmx |  2 +-
 maps/001-2-17.tmx |  2 +-
 maps/001-2-18.tmx |  2 +-
 maps/001-2-19.tmx |  2 +-
 maps/001-2-2.tmx  |  2 +-
 maps/001-2-20.tmx |  2 +-
 maps/001-2-21.tmx |  2 +-
 maps/001-2-22.tmx |  2 +-
 maps/001-2-23.tmx |  2 +-
 maps/001-2-24.tmx |  1 -
 maps/001-2-25.tmx |  2 +-
 maps/001-2-26.tmx |  2 +-
 maps/001-2-27.tmx |  2 +-
 maps/001-2-28.tmx |  2 +-
 maps/001-2-29.tmx |  2 +-
 maps/001-2-3.tmx  |  2 +-
 maps/001-2-30.tmx |  2 +-
 maps/001-2-31.tmx |  2 +-
 maps/001-2-32.tmx |  2 +-
 maps/001-2-33.tmx |  2 +-
 maps/001-2-34.tmx |  2 +-
 maps/001-2-35.tmx |  2 +-
 maps/001-2-36.tmx |  2 +-
 maps/001-2-37.tmx |  2 +-
 maps/001-2-38.tmx |  2 +-
 maps/001-2-39.tmx |  2 +-
 maps/001-2-4.tmx  |  1 -
 maps/001-2-40.tmx |  4 ++--
 maps/001-2-41.tmx |  2 +-
 maps/001-2-42.tmx |  2 +-
 maps/001-2-43.tmx |  1 -
 maps/001-2-5.tmx  |  1 -
 maps/001-2-6.tmx  |  1 -
 maps/001-2-7.tmx  |  1 -
 maps/001-2-8.tmx  |  1 -
 maps/001-2-9.tmx  |  1 -
 maps/001-3-0.tmx  |  4 ++--
 maps/001-3-1.tmx  |  4 ++--
 maps/001-3-2.tmx  |  3 +--
 maps/008-1-1.tmx  |  1 +
 maps/008-1.tmx    |  6 ++++--
 maps/008-2-0.tmx  |  1 +
 maps/008-2-2.tmx  |  1 +
 maps/008-2-20.tmx |  1 +
 maps/008-2-21.tmx |  3 ++-
 maps/008-2-22.tmx |  1 +
 maps/008-2-24.tmx | 23 +++++++++++------------
 maps/008-2-25.tmx |  2 +-
 maps/008-2-26.tmx |  2 +-
 maps/008-2-27.tmx |  4 ++--
 maps/008-2-32.tmx |  1 +
 maps/008-2-7.tmx  |  2 +-
 maps/008-2-9.tmx  |  1 +
 maps/008-3-0.tmx  |  2 +-
 maps/008-3-1.tmx  |  2 +-
 maps/008-3-2.tmx  |  2 +-
 maps/008-3-3.tmx  |  4 ++--
 maps/008-3-4.tmx  |  2 +-
 maps/008-3-5.tmx  |  2 +-
 maps/008-3-6.tmx  |  2 +-
 maps/009-1.tmx    |  2 +-
 maps/009-2-0.tmx  |  1 +
 maps/009-2-10.tmx |  1 +
 maps/009-2-11.tmx |  1 +
 maps/009-2-12.tmx |  1 +
 maps/009-2-13.tmx |  1 +
 maps/009-2-14.tmx |  1 +
 maps/009-2-15.tmx |  1 +
 maps/009-2-16.tmx |  1 +
 maps/009-2-17.tmx |  1 +
 maps/009-2-18.tmx |  1 +
 maps/009-2-2.tmx  |  1 +
 maps/009-2-3.tmx  |  1 +
 maps/009-2-4.tmx  |  1 +
 maps/009-2-5.tmx  |  1 +
 maps/009-2-6.tmx  |  1 +
 maps/009-2-7.tmx  |  1 +
 maps/009-2-8.tmx  |  1 +
 maps/009-2-9.tmx  |  1 +
 maps/012-1.tmx    |  4 ++--
 maps/012-2-1.tmx  |  1 +
 maps/012-2-2.tmx  |  1 +
 maps/012-2-4.tmx  |  1 +
 maps/012-2-5.tmx  |  1 +
 maps/012-2-6.tmx  |  1 +
 maps/012-2-7.tmx  |  1 +
 maps/012-3-1.tmx  |  2 +-
 maps/012-3-2.tmx  |  4 ++--
 maps/012-3-3.tmx  |  2 +-
 maps/020-1.tmx    |  5 +++--
 maps/020-2-0.tmx  |  1 +
 maps/020-2-1.tmx  |  1 +
 maps/020-2-10.tmx |  1 +
 maps/020-2-11.tmx |  1 +
 maps/020-2-12.tmx |  1 +
 maps/020-2-13.tmx |  1 +
 maps/020-2-14.tmx |  1 +
 maps/020-2-15.tmx |  1 +
 maps/020-2-16.tmx |  1 +
 maps/020-2-17.tmx |  1 +
 maps/020-2-18.tmx |  1 +
 maps/020-2-19.tmx |  1 +
 maps/020-2-2.tmx  |  1 +
 maps/020-2-20.tmx |  1 +
 maps/020-2-21.tmx |  1 +
 maps/020-2-22.tmx |  1 +
 maps/020-2-23.tmx |  1 +
 maps/020-2-24.tmx |  1 +
 maps/020-2-25.tmx |  1 +
 maps/020-2-26.tmx |  1 +
 maps/020-2-27.tmx |  1 +
 maps/020-2-28.tmx |  1 +
 maps/020-2-29.tmx |  1 +
 maps/020-2-3.tmx  |  1 +
 maps/020-2-30.tmx |  1 +
 maps/020-2-31.tmx |  1 +
 maps/020-2-32.tmx |  1 +
 maps/020-2-33.tmx |  1 +
 maps/020-2-34.tmx |  1 +
 maps/020-2-4.tmx  |  1 +
 maps/020-2-5.tmx  |  1 +
 maps/020-2-6.tmx  |  1 +
 maps/020-2-7.tmx  |  1 +
 maps/020-2-8.tmx  |  1 +
 maps/020-2-9.tmx  |  1 +
 maps/botcheck.tmx |  1 +
 maps/fermi.tmx    |  1 -
 maps/marine-2.tmx |  2 +-
 maps/marine.tmx   |  2 +-
 maps/sec_pri.tmx  |  1 -
 148 files changed, 160 insertions(+), 103 deletions(-)

diff --git a/maps/000-0-0.tmx b/maps/000-0-0.tmx
index ed3919f4..e6af06fe 100644
--- a/maps/000-0-0.tmx
+++ b/maps/000-0-0.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-0-0.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="johanne.ogg"/>
   <property name="name" value="Sailor's Room"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/000-0-1.tmx b/maps/000-0-1.tmx
index c1193529..469704e4 100644
--- a/maps/000-0-1.tmx
+++ b/maps/000-0-1.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-0-0.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="johanne.ogg"/>
   <property name="name" value="Sailor's Room"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/000-0.tmx b/maps/000-0.tmx
index 6d3d43d3..ca208316 100644
--- a/maps/000-0.tmx
+++ b/maps/000-0.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-0.png"/>
-  <property name="music" value="ezili - ocean sounds.ogg"/>
+  <property name="music" value="ocean.ogg"/>
   <property name="name" value="Oceania"/>
   <property name="overlay0image" value="graphics/images/ambient/fog.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/000-1.tmx b/maps/000-1.tmx
index 726fa09e..bf04c727 100644
--- a/maps/000-1.tmx
+++ b/maps/000-1.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/000-1.png"/>
-  <property name="music" value="bartk - the adventure begins.ogg"/>
+  <property name="music" value="ocean.ogg"/>
   <property name="name" value="Drasil Island"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx
index 352a5226..b039d126 100644
--- a/maps/000-2-0.tmx
+++ b/maps/000-2-0.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-0.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="johanne.ogg"/>
   <property name="name" value="First Deck"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index 1ed006dd..c8629ecc 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-1.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="johanne.ogg"/>
   <property name="name" value="Second Deck"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx
index 2ca42fda..bf440850 100644
--- a/maps/000-2-2.tmx
+++ b/maps/000-2-2.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-2.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="johanne.ogg"/>
   <property name="name" value="Hold"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx
index 4825be37..76d52602 100644
--- a/maps/000-2-3.tmx
+++ b/maps/000-2-3.tmx
@@ -4,7 +4,6 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-3.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Nard's Room"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/000-2-4.tmx b/maps/000-2-4.tmx
index 88dfeda8..ce6a5ec6 100644
--- a/maps/000-2-4.tmx
+++ b/maps/000-2-4.tmx
@@ -5,7 +5,6 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-4.png"/>
-  <property name="music" value="guitarz-halloween-theme.ogg"/>
   <property name="name" value="Alige's Hiding Place"/>
   <property name="overlay0image" value="graphics/images/ambient/fog.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index db3a4eac..4de87a7a 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-1.png"/>
-  <property name="music" value="bartk - the adventure begins.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Artis"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/001-2-0.tmx b/maps/001-2-0.tmx
index fc4549dd..78539508 100644
--- a/maps/001-2-0.tmx
+++ b/maps/001-2-0.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-0.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Light Armor Shop"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-1.tmx b/maps/001-2-1.tmx
index ae26bd84..bcac4053 100644
--- a/maps/001-2-1.tmx
+++ b/maps/001-2-1.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-1.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Noble House"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-10.tmx b/maps/001-2-10.tmx
index f4bf5357..4a79b3d0 100644
--- a/maps/001-2-10.tmx
+++ b/maps/001-2-10.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-10.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Noble House"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-11.tmx b/maps/001-2-11.tmx
index 35bd6df6..39d0d6ba 100644
--- a/maps/001-2-11.tmx
+++ b/maps/001-2-11.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-11.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Noble House"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-12.tmx b/maps/001-2-12.tmx
index c4d168df..84b7c7d4 100644
--- a/maps/001-2-12.tmx
+++ b/maps/001-2-12.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-12.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Noble House"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx
index f18059e7..a76d5077 100644
--- a/maps/001-2-13.tmx
+++ b/maps/001-2-13.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-13.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="First Floor"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-14.tmx b/maps/001-2-14.tmx
index f749536f..b5befd29 100644
--- a/maps/001-2-14.tmx
+++ b/maps/001-2-14.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-14.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Basement"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -505,4 +505,4 @@
    </properties>
   </object>
  </objectgroup>
-</map>
+</map>
\ No newline at end of file
diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx
index 5168f597..01f41f53 100644
--- a/maps/001-2-15.tmx
+++ b/maps/001-2-15.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-15.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Noble House"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-16.tmx b/maps/001-2-16.tmx
index b64523e5..4de92af0 100644
--- a/maps/001-2-16.tmx
+++ b/maps/001-2-16.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-16.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Harbourmaster Lodge"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-17.tmx b/maps/001-2-17.tmx
index fd3ea2fa..c1b1680f 100644
--- a/maps/001-2-17.tmx
+++ b/maps/001-2-17.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-17.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Backroom"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-18.tmx b/maps/001-2-18.tmx
index 0f4d0b5f..50caad34 100644
--- a/maps/001-2-18.tmx
+++ b/maps/001-2-18.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-18.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Docks Warehouse"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-19.tmx b/maps/001-2-19.tmx
index 9548a28f..d35bab41 100644
--- a/maps/001-2-19.tmx
+++ b/maps/001-2-19.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-19.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Merchant Hall"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-2.tmx b/maps/001-2-2.tmx
index 23c7b4eb..3039fa96 100644
--- a/maps/001-2-2.tmx
+++ b/maps/001-2-2.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-2.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Moon's House"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-20.tmx b/maps/001-2-20.tmx
index 03b58a23..5744c347 100644
--- a/maps/001-2-20.tmx
+++ b/maps/001-2-20.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-20.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Backroom"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-21.tmx b/maps/001-2-21.tmx
index 5c82b239..da53334b 100644
--- a/maps/001-2-21.tmx
+++ b/maps/001-2-21.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-0.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="johanne.ogg"/>
   <property name="name" value="First Deck"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/001-2-22.tmx b/maps/001-2-22.tmx
index bad75f64..c931dde7 100644
--- a/maps/001-2-22.tmx
+++ b/maps/001-2-22.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-1.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="johanne.ogg"/>
   <property name="name" value="Second Deck"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/001-2-23.tmx b/maps/001-2-23.tmx
index c08992aa..bed3fcbd 100644
--- a/maps/001-2-23.tmx
+++ b/maps/001-2-23.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-2.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="johanne.ogg"/>
   <property name="name" value="Hold"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/001-2-24.tmx b/maps/001-2-24.tmx
index 045fc2a3..eb248c54 100644
--- a/maps/001-2-24.tmx
+++ b/maps/001-2-24.tmx
@@ -4,7 +4,6 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/000-2-3.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Nard's Room"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/001-2-25.tmx b/maps/001-2-25.tmx
index 4a8fb7ed..c6c1dc23 100644
--- a/maps/001-2-25.tmx
+++ b/maps/001-2-25.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-25.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Storage Room"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-26.tmx b/maps/001-2-26.tmx
index 8cd7a829..f9541254 100644
--- a/maps/001-2-26.tmx
+++ b/maps/001-2-26.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-26.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Alchemy Lab"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-27.tmx b/maps/001-2-27.tmx
index 13018150..5f28b333 100644
--- a/maps/001-2-27.tmx
+++ b/maps/001-2-27.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-27.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Blacksmith Shop"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-28.tmx b/maps/001-2-28.tmx
index ffd3a2ac..d54d5a57 100644
--- a/maps/001-2-28.tmx
+++ b/maps/001-2-28.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-28.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Red Plush Inn"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-29.tmx b/maps/001-2-29.tmx
index cfd7bdf5..934d5fe8 100644
--- a/maps/001-2-29.tmx
+++ b/maps/001-2-29.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-29.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="First Floor"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx
index e25f4e40..ecdb8803 100644
--- a/maps/001-2-3.tmx
+++ b/maps/001-2-3.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-3.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="First Floor"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-30.tmx b/maps/001-2-30.tmx
index 906bd167..4dd34e69 100644
--- a/maps/001-2-30.tmx
+++ b/maps/001-2-30.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-30.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Second Floor"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-31.tmx b/maps/001-2-31.tmx
index 85003df4..75a83706 100644
--- a/maps/001-2-31.tmx
+++ b/maps/001-2-31.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-31.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="West Commercial Building"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-32.tmx b/maps/001-2-32.tmx
index 568ac50a..015212bb 100644
--- a/maps/001-2-32.tmx
+++ b/maps/001-2-32.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-32.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Training Arena Lobby"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-33.tmx b/maps/001-2-33.tmx
index 8dd88970..84aeea10 100644
--- a/maps/001-2-33.tmx
+++ b/maps/001-2-33.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-33.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Legion of Aemil Headquarters"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-34.tmx b/maps/001-2-34.tmx
index 48cf49cb..22107cfe 100644
--- a/maps/001-2-34.tmx
+++ b/maps/001-2-34.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-34.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Training Room Lobby"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-35.tmx b/maps/001-2-35.tmx
index f8b6a8dd..277e5f15 100644
--- a/maps/001-2-35.tmx
+++ b/maps/001-2-35.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-35.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Training Arena"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-36.tmx b/maps/001-2-36.tmx
index 024b543b..440457c5 100644
--- a/maps/001-2-36.tmx
+++ b/maps/001-2-36.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-36.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Training Room"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-37.tmx b/maps/001-2-37.tmx
index 8aff504b..9af111f6 100644
--- a/maps/001-2-37.tmx
+++ b/maps/001-2-37.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-37.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Legion West Wing"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-38.tmx b/maps/001-2-38.tmx
index f4e2d674..783b313d 100644
--- a/maps/001-2-38.tmx
+++ b/maps/001-2-38.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-38.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Legion East Wing"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-39.tmx b/maps/001-2-39.tmx
index 19c15ad7..dc427738 100644
--- a/maps/001-2-39.tmx
+++ b/maps/001-2-39.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-39.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Legion Command Room"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx
index 8b30ae06..8f4e1b99 100644
--- a/maps/001-2-4.tmx
+++ b/maps/001-2-4.tmx
@@ -4,7 +4,6 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-4.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Library"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-40.tmx b/maps/001-2-40.tmx
index 54eaa570..f4c82abb 100644
--- a/maps/001-2-40.tmx
+++ b/maps/001-2-40.tmx
@@ -4,8 +4,8 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-40.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
-  <property name="name" value="unnamed"/>
+  <property name="music" value="artis.ogg"/>
+  <property name="name" value="Legion Basement"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/>
diff --git a/maps/001-2-41.tmx b/maps/001-2-41.tmx
index e7a19b60..14afac81 100644
--- a/maps/001-2-41.tmx
+++ b/maps/001-2-41.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-41.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Barber"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-42.tmx b/maps/001-2-42.tmx
index 7e67ed74..c7d710cc 100644
--- a/maps/001-2-42.tmx
+++ b/maps/001-2-42.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-42.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="artis.ogg"/>
   <property name="name" value="Docks Warehouse Second Level"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-43.tmx b/maps/001-2-43.tmx
index 181a305b..440a7562 100644
--- a/maps/001-2-43.tmx
+++ b/maps/001-2-43.tmx
@@ -4,7 +4,6 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-43.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Archive"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/001-2-5.tmx b/maps/001-2-5.tmx
index bfcd5076..46dda0b4 100644
--- a/maps/001-2-5.tmx
+++ b/maps/001-2-5.tmx
@@ -4,7 +4,6 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-5.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Warehouse"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-6.tmx b/maps/001-2-6.tmx
index 3b61def6..2f3bba8f 100644
--- a/maps/001-2-6.tmx
+++ b/maps/001-2-6.tmx
@@ -4,7 +4,6 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-6.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="First Floor"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-7.tmx b/maps/001-2-7.tmx
index ddcab4ae..ff943256 100644
--- a/maps/001-2-7.tmx
+++ b/maps/001-2-7.tmx
@@ -4,7 +4,6 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-7.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="City Hall"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-8.tmx b/maps/001-2-8.tmx
index f515b858..2ebfe1f2 100644
--- a/maps/001-2-8.tmx
+++ b/maps/001-2-8.tmx
@@ -4,7 +4,6 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-8.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Left Wing"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-2-9.tmx b/maps/001-2-9.tmx
index d55ef732..3909cab6 100644
--- a/maps/001-2-9.tmx
+++ b/maps/001-2-9.tmx
@@ -4,7 +4,6 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-2-9.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Right Wing"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx
index 16237433..51f2a690 100644
--- a/maps/001-3-0.tmx
+++ b/maps/001-3-0.tmx
@@ -3,8 +3,8 @@
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
-  <property name="minimap" value=""/>
-  <property name="music" value=""/>
+  <property name="minimap" value="graphics/minimaps/001-3-0.png"/>
+  <property name="music" value="sewer.ogg"/>
   <property name="name" value="Sewer"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/001-3-1.tmx b/maps/001-3-1.tmx
index b9762ede..c65ad268 100644
--- a/maps/001-3-1.tmx
+++ b/maps/001-3-1.tmx
@@ -3,8 +3,8 @@
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
-  <property name="minimap" value=""/>
-  <property name="music" value=""/>
+  <property name="minimap" value="graphics/minimaps/001-3-1.png"/>
+  <property name="music" value="sewer.ogg"/>
   <property name="name" value="Rivercave"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/001-3-2.tmx b/maps/001-3-2.tmx
index 26696891..f31a6d39 100644
--- a/maps/001-3-2.tmx
+++ b/maps/001-3-2.tmx
@@ -3,8 +3,7 @@
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
-  <property name="minimap" value=""/>
-  <property name="music" value=""/>
+  <property name="minimap" value="graphics/minimaps/001-3-2.png"/>
   <property name="name" value="Hideout"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/008-1-1.tmx b/maps/008-1-1.tmx
index e53b4c1e..93530000 100644
--- a/maps/008-1-1.tmx
+++ b/maps/008-1-1.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-1-1.png"/>
+  <property name="music" value="forest.ogg"/>
   <property name="name" value="Woodland"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/008-1.tmx b/maps/008-1.tmx
index 2d92aec3..74171ee6 100644
--- a/maps/008-1.tmx
+++ b/maps/008-1.tmx
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="350" height="250" tilewidth="32" tileheight="32" infinite="0" nextlayerid="28" nextobjectid="272">
+<map version="1.4" tiledversion="1.4.2" orientation="orthogonal" renderorder="right-down" width="350" height="250" tilewidth="32" tileheight="32" infinite="0" nextlayerid="28" nextobjectid="272">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-1.png"/>
+  <property name="music" value="real.ogg"/>
   <property name="name" value="Hurnscald"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
@@ -3076,7 +3077,7 @@
 </data>
  </layer>
  <objectgroup id="12" name="Object">
-  <object id="18" name="magick-real.ogg" type="MUSIC" x="7168" y="2944" width="2400" height="1664"/>
+  <object id="18" name="hurns.ogg" type="MUSIC" x="6268" y="2946" width="4514" height="1858"/>
   <object id="32" name="To Celestia's house" type="warp" x="8832" y="3904" width="32" height="32">
    <properties>
     <property name="dest_map" value="008-2-0"/>
@@ -4286,5 +4287,6 @@
     <property name="spawn" value="18000"/>
    </properties>
   </object>
+  <object id="251" name="hurns.ogg" type="MUSIC" x="6914" y="776" width="3200" height="2202"/>
  </objectgroup>
 </map>
diff --git a/maps/008-2-0.tmx b/maps/008-2-0.tmx
index 3521f1c6..2db95ff6 100644
--- a/maps/008-2-0.tmx
+++ b/maps/008-2-0.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-2-0.png"/>
+  <property name="music" value="despair.ogg"/>
   <property name="name" value="Chez Celestia"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/008-2-2.tmx b/maps/008-2-2.tmx
index 0feae771..e926d29f 100644
--- a/maps/008-2-2.tmx
+++ b/maps/008-2-2.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-2-2.png"/>
+  <property name="music" value="store.ogg"/>
   <property name="name" value="The Rusty Pick"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/008-2-20.tmx b/maps/008-2-20.tmx
index d04d7026..a80718ef 100644
--- a/maps/008-2-20.tmx
+++ b/maps/008-2-20.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-2-20.png"/>
+  <property name="music" value="ghoulish.ogg"/>
   <property name="name" value="Forsaken Inn"/>
  </properties>
  <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/008-2-21.tmx b/maps/008-2-21.tmx
index 52aec1e5..15b506d5 100644
--- a/maps/008-2-21.tmx
+++ b/maps/008-2-21.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-2-21.png"/>
+  <property name="music" value="ghoulish.ogg"/>
   <property name="name" value="Forsaken Inn Basement"/>
  </properties>
  <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -631,4 +632,4 @@
    </properties>
   </object>
  </objectgroup>
-</map>
+</map>
\ No newline at end of file
diff --git a/maps/008-2-22.tmx b/maps/008-2-22.tmx
index 1cf45f22..a80422fe 100644
--- a/maps/008-2-22.tmx
+++ b/maps/008-2-22.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-2-22.png"/>
+  <property name="music" value="fire.ogg"/>
   <property name="name" value="Mages Hut"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/008-2-24.tmx b/maps/008-2-24.tmx
index bf45669f..993bddff 100644
--- a/maps/008-2-24.tmx
+++ b/maps/008-2-24.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="65" height="65" tilewidth="32" tileheight="32" infinite="0" nextobjectid="11">
+<map version="1.4" tiledversion="1.4.2" orientation="orthogonal" renderorder="right-down" width="65" height="65" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="11">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-2-24.png"/>
-  <property name="music" value="clouds-calling.ogg"/>
+  <property name="music" value="dimond.ogg"/>
   <property name="name" value="Dimond's Cove Ground Floor"/>
  </properties>
  <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -46,7 +46,7 @@
  <tileset firstgid="1375" name="hurns-ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/hurns-ground.png" width="512" height="512"/>
  </tileset>
- <layer name="Ground1" width="65" height="65">
+ <layer id="1" name="Ground1" width="65" height="65">
   <data encoding="csv">
 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
@@ -115,7 +115,7 @@
 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
 </data>
  </layer>
- <layer name="Ground2" width="65" height="65">
+ <layer id="2" name="Ground2" width="65" height="65">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -184,7 +184,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Ground3" width="65" height="65">
+ <layer id="3" name="Ground3" width="65" height="65">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -253,7 +253,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Fringe" width="65" height="65">
+ <layer id="4" name="Fringe" width="65" height="65">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -322,7 +322,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over1" width="65" height="65">
+ <layer id="5" name="Over1" width="65" height="65">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -391,7 +391,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Over2" width="65" height="65">
+ <layer id="6" name="Over2" width="65" height="65">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -460,7 +460,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <layer name="Collision" width="65" height="65">
+ <layer id="7" name="Collision" width="65" height="65">
   <data encoding="csv">
 1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,
 1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,
@@ -529,7 +529,7 @@
 1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367
 </data>
  </layer>
- <layer name="Heights" width="65" height="65">
+ <layer id="8" name="Heights" width="65" height="65">
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -598,7 +598,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
- <objectgroup name="Objects">
+ <objectgroup id="9" name="Objects">
   <object id="1" name="To Cellar" type="warp" x="864" y="768" width="32" height="32">
    <properties>
     <property name="dest_map" value="008-2-27"/>
@@ -613,7 +613,6 @@
     <property name="dest_y" value="27"/>
    </properties>
   </object>
-  <object id="8" name="dimonds-cove.ogg" type="MUSIC" x="992" y="992" width="416" height="416"/>
   <object id="10" name="To Outside" type="warp" x="1024" y="1472" width="32" height="32">
    <properties>
     <property name="dest_map" value="008-1"/>
diff --git a/maps/008-2-25.tmx b/maps/008-2-25.tmx
index 54774c4a..79b4cff7 100644
--- a/maps/008-2-25.tmx
+++ b/maps/008-2-25.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-2-25.png"/>
-  <property name="music" value="clouds-calling.ogg"/>
+  <property name="music" value="dimond.ogg"/>
   <property name="name" value="Dimond's Cove Second Floor"/>
  </properties>
  <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/008-2-26.tmx b/maps/008-2-26.tmx
index 5928f326..6b9f5604 100644
--- a/maps/008-2-26.tmx
+++ b/maps/008-2-26.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-2-26.png"/>
-  <property name="music" value="clouds-calling.ogg"/>
+  <property name="music" value="dimond.ogg"/>
   <property name="name" value="Dimond's Cove Third Floor"/>
  </properties>
  <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/008-2-27.tmx b/maps/008-2-27.tmx
index d6687db3..6191cd3a 100644
--- a/maps/008-2-27.tmx
+++ b/maps/008-2-27.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-2-27.png"/>
-  <property name="music" value="clouds-calling.ogg"/>
+  <property name="music" value="dimond.ogg"/>
   <property name="name" value="Dimond's Cove Cellar"/>
  </properties>
  <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
@@ -586,4 +586,4 @@
    </properties>
   </object>
  </objectgroup>
-</map>
+</map>
\ No newline at end of file
diff --git a/maps/008-2-32.tmx b/maps/008-2-32.tmx
index 45c933aa..42d86a41 100644
--- a/maps/008-2-32.tmx
+++ b/maps/008-2-32.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-3-32.png"/>
+  <property name="music" value="forest.ogg"/>
   <property name="name" value="Merchant House"/>
  </properties>
  <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/008-2-7.tmx b/maps/008-2-7.tmx
index 9680f8a4..95eaa176 100644
--- a/maps/008-2-7.tmx
+++ b/maps/008-2-7.tmx
@@ -481,4 +481,4 @@
    </properties>
   </object>
  </objectgroup>
-</map>
+</map>
\ No newline at end of file
diff --git a/maps/008-2-9.tmx b/maps/008-2-9.tmx
index 9758ba3c..66ca3bda 100644
--- a/maps/008-2-9.tmx
+++ b/maps/008-2-9.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-2-9.png"/>
+  <property name="music" value="fire.ogg"/>
   <property name="name" value="Jack's Abode"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/008-3-0.tmx b/maps/008-3-0.tmx
index f7da741d..9fed6a2d 100644
--- a/maps/008-3-0.tmx
+++ b/maps/008-3-0.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-3-0.png"/>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
+  <property name="music" value="surreal.ogg"/>
   <property name="name" value="Rossy Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/008-3-1.tmx b/maps/008-3-1.tmx
index 7c6a4ded..38d2edf4 100644
--- a/maps/008-3-1.tmx
+++ b/maps/008-3-1.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-3-1.png"/>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
+  <property name="music" value="cavesong.ogg"/>
   <property name="name" value="Bat Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/008-3-2.tmx b/maps/008-3-2.tmx
index 5aed1b85..f80328be 100644
--- a/maps/008-3-2.tmx
+++ b/maps/008-3-2.tmx
@@ -7,7 +7,7 @@
   <property name="license" value="GPL v2+, CC BY SA 3.0+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-3-2.png"/>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
+  <property name="music" value="surreal.ogg"/>
   <property name="name" value="Calamity Dungeon"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/008-3-3.tmx b/maps/008-3-3.tmx
index 8cf79d89..d8421f5c 100644
--- a/maps/008-3-3.tmx
+++ b/maps/008-3-3.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-3-3.png"/>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
+  <property name="music" value="cavesong.ogg"/>
   <property name="name" value="Obelisk Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
@@ -23,7 +23,7 @@
     <property name="license" value="CC BY-SA 3.0"/>
     <property name="manaplus version" value="2"/>
     <property name="minimap" value="graphics/minimaps/008-3-1.png"/>
-    <property name="music" value="eric matyas - surreal place.ogg"/>
+    <property name="music" value="surreal.ogg"/>
     <property name="name" value="Bat Cave"/>
     <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
     <property name="overlay0keepratio" value="true"/>
diff --git a/maps/008-3-4.tmx b/maps/008-3-4.tmx
index 5d29620a..4e6187de 100644
--- a/maps/008-3-4.tmx
+++ b/maps/008-3-4.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-3-4.png"/>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
+  <property name="music" value="cavesong.ogg"/>
   <property name="name" value="North Mine"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/008-3-5.tmx b/maps/008-3-5.tmx
index fbe6b84f..b8d1f21d 100644
--- a/maps/008-3-5.tmx
+++ b/maps/008-3-5.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-3-5.png"/>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
+  <property name="music" value="bandit.ogg"/>
   <property name="name" value="Bandit Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/008-3-6.tmx b/maps/008-3-6.tmx
index 42ecb3a8..338b255a 100644
--- a/maps/008-3-6.tmx
+++ b/maps/008-3-6.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-3-6.png"/>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
+  <property name="music" value="chilling.ogg"/>
   <property name="name" value="Hurnscald Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/009-1.tmx b/maps/009-1.tmx
index b349371a..2a118837 100644
--- a/maps/009-1.tmx
+++ b/maps/009-1.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-1.png"/>
-  <property name="music" value="graveyard.ogg"/>
+  <property name="music" value="swamp.ogg"/>
   <property name="name" value="Swamp"/>
   <property name="overlay0image" value="graphics/images/ambient/rain.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/009-2-0.tmx b/maps/009-2-0.tmx
index e1fd8a77..0ac103cd 100644
--- a/maps/009-2-0.tmx
+++ b/maps/009-2-0.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-0.png"/>
+  <property name="music" value="swamp.ogg"/>
   <property name="name" value="Soren's Home"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/009-2-10.tmx b/maps/009-2-10.tmx
index 09246be9..e8638b53 100644
--- a/maps/009-2-10.tmx
+++ b/maps/009-2-10.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-10.png"/>
+  <property name="music" value="crypt.ogg"/>
   <property name="name" value="Migglemire Crypt Level 2"/>
  </properties>
  <tileset firstgid="1" name="crypt-accessory-x1x3" tilewidth="32" tileheight="96" tilecount="80" columns="16">
diff --git a/maps/009-2-11.tmx b/maps/009-2-11.tmx
index f8120af3..08ff681c 100644
--- a/maps/009-2-11.tmx
+++ b/maps/009-2-11.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-11.png"/>
+  <property name="music" value="crypt.ogg"/>
   <property name="name" value="Migglemire Crypt Boss Chamber"/>
  </properties>
  <tileset firstgid="1" name="crypt-accessory-x1x3" tilewidth="32" tileheight="96" tilecount="80" columns="16">
diff --git a/maps/009-2-12.tmx b/maps/009-2-12.tmx
index efd7c553..887a97bc 100644
--- a/maps/009-2-12.tmx
+++ b/maps/009-2-12.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-12.png"/>
+  <property name="music" value="crypt.ogg"/>
   <property name="name" value="Asphodel Moor Crypt Ground Level"/>
  </properties>
  <tileset firstgid="1" name="crypt-ground" tilewidth="32" tileheight="32" tilecount="384" columns="16">
diff --git a/maps/009-2-13.tmx b/maps/009-2-13.tmx
index 8380d468..8c2b5103 100644
--- a/maps/009-2-13.tmx
+++ b/maps/009-2-13.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-13.png"/>
+  <property name="music" value="crypt.ogg"/>
   <property name="name" value="Asphodel Moor Crypt Level 2"/>
  </properties>
  <tileset firstgid="1" name="crypt-accessory-x1x3" tilewidth="32" tileheight="96" tilecount="80" columns="16">
diff --git a/maps/009-2-14.tmx b/maps/009-2-14.tmx
index 01dad93a..be218793 100644
--- a/maps/009-2-14.tmx
+++ b/maps/009-2-14.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-14.png"/>
+  <property name="music" value="crypt.ogg"/>
   <property name="name" value="Asphodel Moor Crypt Boss Chamber"/>
  </properties>
  <tileset firstgid="1" name="crypt-accessory-x1x3" tilewidth="32" tileheight="96" tilecount="80" columns="16">
diff --git a/maps/009-2-15.tmx b/maps/009-2-15.tmx
index a2f82993..c1849119 100644
--- a/maps/009-2-15.tmx
+++ b/maps/009-2-15.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-15.png"/>
+  <property name="music" value="swamp.ogg"/>
   <property name="name" value="Chapel"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/009-2-16.tmx b/maps/009-2-16.tmx
index b84e67a4..1277df7c 100644
--- a/maps/009-2-16.tmx
+++ b/maps/009-2-16.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-16.png"/>
+  <property name="music" value="swamp.ogg"/>
   <property name="name" value="Chapel Tower 1st Floor"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/009-2-17.tmx b/maps/009-2-17.tmx
index 37ab11fb..65daff1e 100644
--- a/maps/009-2-17.tmx
+++ b/maps/009-2-17.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-17.png"/>
+  <property name="music" value="swamp.ogg"/>
   <property name="name" value="Chapel Tower 2nd Floor"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/009-2-18.tmx b/maps/009-2-18.tmx
index b9a137c7..005da5d3 100644
--- a/maps/009-2-18.tmx
+++ b/maps/009-2-18.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-18.png"/>
+  <property name="music" value="swamp.ogg"/>
   <property name="name" value="Chapel Tower Top"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/009-2-2.tmx b/maps/009-2-2.tmx
index 2f18b411..384eb2f3 100644
--- a/maps/009-2-2.tmx
+++ b/maps/009-2-2.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-2.png"/>
+  <property name="music" value="swamp.ogg"/>
   <property name="name" value="Gardenhouse"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/009-2-3.tmx b/maps/009-2-3.tmx
index 5261f83a..d4b81bce 100644
--- a/maps/009-2-3.tmx
+++ b/maps/009-2-3.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-3.png"/>
+  <property name="music" value="reid.ogg"/>
   <property name="name" value="Reid's Inn"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/009-2-4.tmx b/maps/009-2-4.tmx
index 37fe476c..c8c8c276 100644
--- a/maps/009-2-4.tmx
+++ b/maps/009-2-4.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-4.png"/>
+  <property name="music" value="reid.ogg"/>
   <property name="name" value="Reid's Inn Basement"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/009-2-5.tmx b/maps/009-2-5.tmx
index df07946b..b149f29d 100644
--- a/maps/009-2-5.tmx
+++ b/maps/009-2-5.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-5.png"/>
+  <property name="music" value="reid.ogg"/>
   <property name="name" value="Reid's Inn First Floor"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/009-2-6.tmx b/maps/009-2-6.tmx
index 696110e6..58458ec4 100644
--- a/maps/009-2-6.tmx
+++ b/maps/009-2-6.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-6.png"/>
+  <property name="music" value="swamp.ogg"/>
   <property name="name" value="Small House"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/009-2-7.tmx b/maps/009-2-7.tmx
index 4a19db76..09372bb0 100644
--- a/maps/009-2-7.tmx
+++ b/maps/009-2-7.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-7.png"/>
+  <property name="music" value="swamp.ogg"/>
   <property name="name" value="Shop"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/009-2-8.tmx b/maps/009-2-8.tmx
index d246c450..0dfaf89c 100644
--- a/maps/009-2-8.tmx
+++ b/maps/009-2-8.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-8.png"/>
+  <property name="music" value="swamp.ogg"/>
   <property name="name" value="Blacksmith"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/009-2-9.tmx b/maps/009-2-9.tmx
index 9e031fa7..e87d7484 100644
--- a/maps/009-2-9.tmx
+++ b/maps/009-2-9.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2-9.png"/>
+  <property name="music" value="crypt.ogg"/>
   <property name="name" value="Migglemire Crypt Ground Level"/>
  </properties>
  <tileset firstgid="1" name="crypt-ground" tilewidth="32" tileheight="32" tilecount="384" columns="16">
diff --git a/maps/012-1.tmx b/maps/012-1.tmx
index 9ed26941..53bbd787 100644
--- a/maps/012-1.tmx
+++ b/maps/012-1.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/012-1.png"/>
-  <property name="music" value="bartk - the adventure begins.ogg"/>
+  <property name="music" value="candor.ogg"/>
   <property name="name" value="Candor Island"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
@@ -1642,7 +1642,7 @@
    <property name="license" value="CC BY-SA 3.0"/>
    <property name="manaplus version" value="2"/>
    <property name="minimap" value="graphics/minimaps/000-1.png"/>
-   <property name="music" value="bartk - the adventure begins.ogg"/>
+   <property name="music" value="artis.ogg"/>
    <property name="name" value="Candor Island"/>
    <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
    <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/012-2-1.tmx b/maps/012-2-1.tmx
index c288b3b9..f170a075 100644
--- a/maps/012-2-1.tmx
+++ b/maps/012-2-1.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/012-2-1.png"/>
+  <property name="music" value="candor.ogg"/>
   <property name="name" value="Sorfina's Home"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/012-2-2.tmx b/maps/012-2-2.tmx
index 54c7f33c..e06f0a49 100644
--- a/maps/012-2-2.tmx
+++ b/maps/012-2-2.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/012-2-2.png"/>
+  <property name="music" value="candor.ogg"/>
   <property name="name" value="Sleeping Room"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/012-2-4.tmx b/maps/012-2-4.tmx
index 428c2d30..0e324df5 100644
--- a/maps/012-2-4.tmx
+++ b/maps/012-2-4.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/012-2-4.png"/>
+  <property name="music" value="candor.ogg"/>
   <property name="name" value="Alchemy Hut"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/012-2-5.tmx b/maps/012-2-5.tmx
index d41d9973..7e56b942 100644
--- a/maps/012-2-5.tmx
+++ b/maps/012-2-5.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/012-2-5.png"/>
+  <property name="music" value="candor.ogg"/>
   <property name="name" value="Candor Smith"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/012-2-6.tmx b/maps/012-2-6.tmx
index c346d3c9..06fbfb1b 100644
--- a/maps/012-2-6.tmx
+++ b/maps/012-2-6.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/012-2-6.png"/>
+  <property name="music" value="candor.ogg"/>
   <property name="name" value="Storage Room"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/012-2-7.tmx b/maps/012-2-7.tmx
index 1a9dda16..cc0d4245 100644
--- a/maps/012-2-7.tmx
+++ b/maps/012-2-7.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/012-2-7.png"/>
+  <property name="music" value="fire.ogg"/>
   <property name="name" value="Small House"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/012-3-1.tmx b/maps/012-3-1.tmx
index 2eef33f4..c56008d4 100644
--- a/maps/012-3-1.tmx
+++ b/maps/012-3-1.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/012-3-1.png"/>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
+  <property name="music" value="surreal.ogg"/>
   <property name="name" value="Cador Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/012-3-2.tmx b/maps/012-3-2.tmx
index a1e6761f..5429e13c 100644
--- a/maps/012-3-2.tmx
+++ b/maps/012-3-2.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/012-3-2.png"/>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
+  <property name="music" value="surreal.ogg"/>
   <property name="name" value="Parua Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
@@ -23,7 +23,7 @@
     <property name="license" value="CC BY-SA 3.0"/>
     <property name="manaplus version" value="2"/>
     <property name="minimap" value="graphics/minimaps/008-3-1.png"/>
-    <property name="music" value="eric matyas - surreal place.ogg"/>
+    <property name="music" value="surreal.ogg"/>
     <property name="name" value="Candor Cave"/>
     <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
     <property name="overlay0keepratio" value="true"/>
diff --git a/maps/012-3-3.tmx b/maps/012-3-3.tmx
index 541da21b..32591e1c 100644
--- a/maps/012-3-3.tmx
+++ b/maps/012-3-3.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/012-3-3.png"/>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
+  <property name="music" value="surreal.ogg"/>
   <property name="name" value="Mana Tree Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/020-1.tmx b/maps/020-1.tmx
index 617c5848..4824b5cc 100644
--- a/maps/020-1.tmx
+++ b/maps/020-1.tmx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="320" height="280" tilewidth="32" tileheight="32" infinite="0" nextlayerid="14" nextobjectid="204">
+<map version="1.4" tiledversion="1.4.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="320" height="280" tilewidth="32" tileheight="32" infinite="0" nextlayerid="14" nextobjectid="205">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-1.png"/>
-  <property name="music" value="bartk - the adventure begins.ogg"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Tulimshar"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
@@ -3263,6 +3263,7 @@
     <property name="dest_y" value="22"/>
    </properties>
   </object>
+  <object id="204" name="academy.ogg" type="MUSIC" x="1088" y="1280" width="2404" height="2876"/>
  </objectgroup>
  <objectgroup id="13" name="Spawns" visible="0">
   <object id="28" name="Maggot" type="spawn" x="4832" y="2080" width="928" height="800">
diff --git a/maps/020-2-0.tmx b/maps/020-2-0.tmx
index 22622135..a419a612 100644
--- a/maps/020-2-0.tmx
+++ b/maps/020-2-0.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-0.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Ratto Hut"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-1.tmx b/maps/020-2-1.tmx
index 40361f37..fa09df99 100644
--- a/maps/020-2-1.tmx
+++ b/maps/020-2-1.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-1.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Brotherhood Castle"/>
  </properties>
  <tileset firstgid="1" name="desert-castle-indoor" tilewidth="32" tileheight="32" tilecount="512" columns="16">
diff --git a/maps/020-2-10.tmx b/maps/020-2-10.tmx
index edb65871..3cb57f23 100644
--- a/maps/020-2-10.tmx
+++ b/maps/020-2-10.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-10.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Tailor"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-11.tmx b/maps/020-2-11.tmx
index 4319dfbf..4b94fd0a 100644
--- a/maps/020-2-11.tmx
+++ b/maps/020-2-11.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-11.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Ramshackle Hut"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-12.tmx b/maps/020-2-12.tmx
index 421ac0df..90aaccd7 100644
--- a/maps/020-2-12.tmx
+++ b/maps/020-2-12.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-12.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Small Garden Hut"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-13.tmx b/maps/020-2-13.tmx
index 04de906a..7e1ddf2b 100644
--- a/maps/020-2-13.tmx
+++ b/maps/020-2-13.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-13.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Large Garden Hut"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-14.tmx b/maps/020-2-14.tmx
index 564a4027..78da7c21 100644
--- a/maps/020-2-14.tmx
+++ b/maps/020-2-14.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-14.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Small Slum Hut"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-15.tmx b/maps/020-2-15.tmx
index d6552d4d..196f9371 100644
--- a/maps/020-2-15.tmx
+++ b/maps/020-2-15.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-15.png"/>
+  <property name="music" value="peace.ogg"/>
   <property name="name" value="Large Slum Hut"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-16.tmx b/maps/020-2-16.tmx
index c5bcd9e1..47330579 100644
--- a/maps/020-2-16.tmx
+++ b/maps/020-2-16.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-16.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Slum Laundry"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-17.tmx b/maps/020-2-17.tmx
index 47320f88..238ebb91 100644
--- a/maps/020-2-17.tmx
+++ b/maps/020-2-17.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-17.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Fisherman's Hut"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-18.tmx b/maps/020-2-18.tmx
index 997fba0b..0abefb62 100644
--- a/maps/020-2-18.tmx
+++ b/maps/020-2-18.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-18.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Market Administration"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-19.tmx b/maps/020-2-19.tmx
index ac2058ca..d976b268 100644
--- a/maps/020-2-19.tmx
+++ b/maps/020-2-19.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-19.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Farmer's Home"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-2.tmx b/maps/020-2-2.tmx
index 316a5fe8..b48891f3 100644
--- a/maps/020-2-2.tmx
+++ b/maps/020-2-2.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-2.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Brotherhood Tower"/>
  </properties>
  <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32">
diff --git a/maps/020-2-20.tmx b/maps/020-2-20.tmx
index 6ac1152f..b7754df9 100644
--- a/maps/020-2-20.tmx
+++ b/maps/020-2-20.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-20.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Tulimshar Inn"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-21.tmx b/maps/020-2-21.tmx
index d9c532f3..e498c4ef 100644
--- a/maps/020-2-21.tmx
+++ b/maps/020-2-21.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-21.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Queer Hut"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-22.tmx b/maps/020-2-22.tmx
index 8c782baf..74638f0b 100644
--- a/maps/020-2-22.tmx
+++ b/maps/020-2-22.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-22.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Residence"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-23.tmx b/maps/020-2-23.tmx
index c33af6da..da05ccc7 100644
--- a/maps/020-2-23.tmx
+++ b/maps/020-2-23.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-23.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Brotherhood Inn First Floor"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-24.tmx b/maps/020-2-24.tmx
index 34bcc294..3bc501e2 100644
--- a/maps/020-2-24.tmx
+++ b/maps/020-2-24.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-24.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Tulimshar Inn First Floor"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-25.tmx b/maps/020-2-25.tmx
index 50d137c8..951a0742 100644
--- a/maps/020-2-25.tmx
+++ b/maps/020-2-25.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-25.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Residence First Floor"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-26.tmx b/maps/020-2-26.tmx
index 1515b5ee..a0af9e92 100644
--- a/maps/020-2-26.tmx
+++ b/maps/020-2-26.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-26.png"/>
+  <property name="music" value="academy.ogg"/>
   <property name="name" value="Magic Academy Ground Floor"/>
  </properties>
  <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32">
diff --git a/maps/020-2-27.tmx b/maps/020-2-27.tmx
index 6de1cb6c..b4644b6d 100644
--- a/maps/020-2-27.tmx
+++ b/maps/020-2-27.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-27.png"/>
+  <property name="music" value="academy.ogg"/>
   <property name="name" value="Magic Acedemy Central, First Floor"/>
  </properties>
  <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32">
diff --git a/maps/020-2-28.tmx b/maps/020-2-28.tmx
index 6727acc7..b213dc0d 100644
--- a/maps/020-2-28.tmx
+++ b/maps/020-2-28.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-28.png"/>
+  <property name="music" value="academy.ogg"/>
   <property name="name" value="Magic Acedemy Central, Second Floor"/>
  </properties>
  <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32">
diff --git a/maps/020-2-29.tmx b/maps/020-2-29.tmx
index e31e9ec2..4bb5129c 100644
--- a/maps/020-2-29.tmx
+++ b/maps/020-2-29.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-29.png"/>
+  <property name="music" value="academy.ogg"/>
   <property name="name" value="Magic Acedemy East, First Floor"/>
  </properties>
  <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32">
diff --git a/maps/020-2-3.tmx b/maps/020-2-3.tmx
index 8b280412..dc1b5d6f 100644
--- a/maps/020-2-3.tmx
+++ b/maps/020-2-3.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-3.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Brotherhood Inn"/>
  </properties>
  <tileset firstgid="1" name="hurns-indoor-accessory" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/020-2-30.tmx b/maps/020-2-30.tmx
index cef27b71..fce870a7 100644
--- a/maps/020-2-30.tmx
+++ b/maps/020-2-30.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-30.png"/>
+  <property name="music" value="academy.ogg"/>
   <property name="name" value="Magic Acedemy West, First Floor"/>
  </properties>
  <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32">
diff --git a/maps/020-2-31.tmx b/maps/020-2-31.tmx
index cd49bd1b..3c42c0e5 100644
--- a/maps/020-2-31.tmx
+++ b/maps/020-2-31.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-31.png"/>
+  <property name="music" value="academy.ogg"/>
   <property name="name" value="Lighthouse Ground Floor"/>
  </properties>
  <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32">
diff --git a/maps/020-2-32.tmx b/maps/020-2-32.tmx
index bb8e9797..1333ab45 100644
--- a/maps/020-2-32.tmx
+++ b/maps/020-2-32.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-32.png"/>
+  <property name="music" value="academy.ogg"/>
   <property name="name" value="Lighthouse First Floor"/>
  </properties>
  <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32">
diff --git a/maps/020-2-33.tmx b/maps/020-2-33.tmx
index bb183377..fb837667 100644
--- a/maps/020-2-33.tmx
+++ b/maps/020-2-33.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-33.png"/>
+  <property name="music" value="academy.ogg"/>
   <property name="name" value="Lighthouse Second Floor"/>
  </properties>
  <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32">
diff --git a/maps/020-2-34.tmx b/maps/020-2-34.tmx
index 5390d7f6..4f079a58 100644
--- a/maps/020-2-34.tmx
+++ b/maps/020-2-34.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-20.png"/>
+  <property name="music" value="academy.ogg"/>
   <property name="name" value="Tulimshar Casino"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-2-4.tmx b/maps/020-2-4.tmx
index 332cc711..af2d6e10 100644
--- a/maps/020-2-4.tmx
+++ b/maps/020-2-4.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-4.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Brotherhood Hut"/>
  </properties>
  <tileset firstgid="1" name="hurns-indoor-accessory" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/020-2-5.tmx b/maps/020-2-5.tmx
index 82c143af..3eaec0f8 100644
--- a/maps/020-2-5.tmx
+++ b/maps/020-2-5.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-5.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Legion Castle"/>
  </properties>
  <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32">
diff --git a/maps/020-2-6.tmx b/maps/020-2-6.tmx
index 5386efd5..8ae0f390 100644
--- a/maps/020-2-6.tmx
+++ b/maps/020-2-6.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-6.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Legion Tower"/>
  </properties>
  <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32">
diff --git a/maps/020-2-7.tmx b/maps/020-2-7.tmx
index 2b111a18..e74a7322 100644
--- a/maps/020-2-7.tmx
+++ b/maps/020-2-7.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-7.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Legion Guardhouse"/>
  </properties>
  <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32">
diff --git a/maps/020-2-8.tmx b/maps/020-2-8.tmx
index 52093fb0..3ea16578 100644
--- a/maps/020-2-8.tmx
+++ b/maps/020-2-8.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-8.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Tulimshar Blacksmith"/>
  </properties>
  <tileset firstgid="1" name="desert-castle-indoor" tilewidth="32" tileheight="32" tilecount="512" columns="16">
diff --git a/maps/020-2-9.tmx b/maps/020-2-9.tmx
index 30427adf..7b0dfedd 100644
--- a/maps/020-2-9.tmx
+++ b/maps/020-2-9.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2-9.png"/>
+  <property name="music" value="faith.ogg"/>
   <property name="name" value="Tulimshar Townhall"/>
  </properties>
  <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/botcheck.tmx b/maps/botcheck.tmx
index 6b099753..2bbe7af4 100644
--- a/maps/botcheck.tmx
+++ b/maps/botcheck.tmx
@@ -4,6 +4,7 @@
   <property name="license" value="Apache 2"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/botcheck.png"/>
+  <property name="music" value="botcheck.ogg"/>
   <property name="name" value="Botcheck Area"/>
  </properties>
  <tileset firstgid="1" name="Artis Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/fermi.tmx b/maps/fermi.tmx
index acb432d0..446a7059 100644
--- a/maps/fermi.tmx
+++ b/maps/fermi.tmx
@@ -4,7 +4,6 @@
   <property name="license" value="Apache 2"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/fermi.png"/>
-  <property name="music" value="ezili - ocean sounds.ogg"/>
   <property name="name" value="Three Fermi Land"/>
  </properties>
  <tileset firstgid="1" name="Artis Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/marine-2.tmx b/maps/marine-2.tmx
index 7583b671..09da227f 100644
--- a/maps/marine-2.tmx
+++ b/maps/marine-2.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="CC BY-SA 4.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/marine-2.png"/>
-  <property name="music" value="water_prelude.ogg"/>
+  <property name="music" value="marine.ogg"/>
   <property name="name" value="Ocean"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/water-raging.tsx"/>
diff --git a/maps/marine.tmx b/maps/marine.tmx
index e000fcc6..022399b5 100644
--- a/maps/marine.tmx
+++ b/maps/marine.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="CC BY-SA 4.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/marine.png"/>
-  <property name="music" value="sail_away.ogg"/>
+  <property name="music" value="waterlude.ogg"/>
   <property name="name" value="La Marine"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/sec_pri.tmx b/maps/sec_pri.tmx
index f0e58e67..c64ced59 100644
--- a/maps/sec_pri.tmx
+++ b/maps/sec_pri.tmx
@@ -5,7 +5,6 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/jail.png"/>
-  <property name="music" value=""/>
   <property name="name" value="Jail"/>
  </properties>
  <tileset firstgid="1" name="dark-tileset-accessory" tilewidth="32" tileheight="32" tilecount="60" columns="15">
-- 
cgit v1.2.3-60-g2f50