Changed music track names in maps to correspond to recently changed music names. Other minor corrections. Comments removed from tmx map files.

123 files changed, 138 insertions, 128 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 348a9c80..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="OceanAmbience.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 18e1d8b4..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="OceanAmbience.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-4.tmx b/maps/000-2-4.tmx
index 92d997e4..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 1352962b..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 - the adventure begins.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 69025551..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 - the adventure begins.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 7bf8d41f..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 - the adventure begins.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 dc0faf8d..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 - the adventure begins.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 9a8473bb..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 - the adventure begins.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 b27b7c0b..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 - the adventure begins.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 23033709..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 - the adventure begins.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">
diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx
index 66c4e04f..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 - the adventure begins.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 b34f98bb..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 - the adventure begins.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 d6f488ce..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 - the adventure begins.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 83ec54ea..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 - the adventure begins.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 fa1f219f..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 - the adventure begins.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 4e821979..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 - the adventure begins.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 1f59e687..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 - the adventure begins.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 182a7e2e..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 6af0fe42..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 - the adventure begins.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 69f0623b..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 - the adventure begins.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 12aae995..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 - the adventure begins.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 18bc7313..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 - the adventure begins.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 7264b217..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 - the adventure begins.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 e05c0edf..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 - the adventure begins.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 cc7f5054..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 - the adventure begins.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 0b807261..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 - the adventure begins.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 6c908f68..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 - the adventure begins.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 0d65173b..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 - the adventure begins.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 336b5c60..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 - the adventure begins.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 1ac54fa1..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 - the adventure begins.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 f34db7d4..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 - the adventure begins.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 f5a3da03..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 - the adventure begins.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 b5847766..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 - the adventure begins.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 36ebe9aa..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 - the adventure begins.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 e0da12f9..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 09d43d95..f4c82abb 100644
--- a/maps/001-2-40.tmx
+++ b/maps/001-2-40.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-40.png"/>
-  <property name="music" value="bartk - the adventure begins.ogg"/>
+  <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">
diff --git a/maps/001-2-41.tmx b/maps/001-2-41.tmx
index b42784d1..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 - the adventure begins.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 6ed32c2e..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 - the adventure begins.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 edace031..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 - the adventure begins.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 00eb577f..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 9ede2796..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 cf6712b7..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 f34dc287..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 8dea927c..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 37f926a6..51f2a690 100644
--- a/maps/001-3-0.tmx
+++ b/maps/001-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/001-3-0.png"/>
-  <property name="music" value="Ledmitz - SewerAmbience.ogg"/>
+  <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 40bffcf3..c65ad268 100644
--- a/maps/001-3-1.tmx
+++ b/maps/001-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/001-3-1.png"/>
-  <property name="music" value="Ledmitz - SewerAmbience.ogg"/>
+  <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 f99670ab..f31a6d39 100644
--- a/maps/001-3-2.tmx
+++ b/maps/001-3-2.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-3-2.png"/>
-  <property name="music" value=""/>
   <property name="name" value="Hideout"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
@@ -1388,4 +1387,4 @@
   <object id="2" name="graphics/particles/sewer-pipe.xml" type="particle_effect" x="1024" y="3168" width="32" height="32"/>
   <object id="3" name="graphics/particles/sewer-pipe.xml" type="particle_effect" x="1312" y="2272" width="32" height="32"/>
  </objectgroup>
-</map>
\ No newline at end of file
+</map>
diff --git a/maps/008-1-1.tmx b/maps/008-1-1.tmx
index c97f1211..93530000 100644
--- a/maps/008-1-1.tmx
+++ b/maps/008-1-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-1-1.png"/>
-  <property name="music" value="dariunas - the forest.ogg"/>
+  <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 74bf118e..74171ee6 100644
--- a/maps/008-1.tmx
+++ b/maps/008-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-1.png"/>
-  <property name="music" value="Aasif Chaudry - magick-real.ogg"/>
+  <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"/>
@@ -3077,7 +3077,7 @@
 </data>
  </layer>
  <objectgroup id="12" name="Object">
-  <object id="18" name="Ledmitz - Hurnscald.ogg" type="MUSIC" x="6268" y="2946" width="4514" height="1858"/>
+  <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"/>
@@ -4287,6 +4287,6 @@
     <property name="spawn" value="18000"/>
    </properties>
   </object>
-  <object id="251" name="Ledmitz - Hurnscald.ogg" type="MUSIC" x="6914" y="776" width="3200" height="2202"/>
+  <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 093dae8c..2db95ff6 100644
--- a/maps/008-2-0.tmx
+++ b/maps/008-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/008-2-0.png"/>
-  <property name="music" value="Chicka-Maria - despair(Loop edit).ogg"/>
+  <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-1.tmx b/maps/008-2-1.tmx
index cd59ab7d..8b8f2d77 100644
--- a/maps/008-2-1.tmx
+++ b/maps/008-2-1.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/008-2-1.png"/>
-  <!-- <property name="music" value="Ledmitz - StoreAmbience.ogg"/> -->
   <property name="name" value="Merchant Guild"/>
  </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 6feca4d3..e926d29f 100644
--- a/maps/008-2-2.tmx
+++ b/maps/008-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/008-2-2.png"/>
-  <property name="music" value="Ledmitz - StoreAmbience.ogg"/>
+  <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 02bc64ff..a80718ef 100644
--- a/maps/008-2-20.tmx
+++ b/maps/008-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/008-2-20.png"/>
-  <property name="music" value="eric matyas - ghoulish-fun(loop edit).ogg"/>
+  <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 825d0ea6..15b506d5 100644
--- a/maps/008-2-21.tmx
+++ b/maps/008-2-21.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-21.png"/>
-  <property name="music" value="eric matyas - ghoulish-fun(loop edit).ogg"/>
+  <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">
diff --git a/maps/008-2-22.tmx b/maps/008-2-22.tmx
index 8dafe623..a80422fe 100644
--- a/maps/008-2-22.tmx
+++ b/maps/008-2-22.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-22.png"/>
-  <property name="music" value="Fireplace.ogg"/>
+  <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 858627c5..993bddff 100644
--- a/maps/008-2-24.tmx
+++ b/maps/008-2-24.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-24.png"/>
-  <property name="music" value="Aasif Chaudry - dimonds-cove(Loop edit).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">
diff --git a/maps/008-2-25.tmx b/maps/008-2-25.tmx
index 6af2c16b..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="Aasif Chaudry - dimonds-cove(Loop edit).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 3c0b902c..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="Aasif Chaudry - dimonds-cove(Loop edit).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 cdf4a616..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="Aasif Chaudry - dimonds-cove(Loop edit).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">
diff --git a/maps/008-2-32.tmx b/maps/008-2-32.tmx
index cce5788e..42d86a41 100644
--- a/maps/008-2-32.tmx
+++ b/maps/008-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/008-3-32.png"/>
-  <property name="music" value="dariunas - the forest.ogg"/>
+  <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-9.tmx b/maps/008-2-9.tmx
index 76dd5d78..66ca3bda 100644
--- a/maps/008-2-9.tmx
+++ b/maps/008-2-9.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-9.png"/>
-  <property name="music" value="Fireplace.ogg"/>
+  <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 72721002..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="finalman and yakslem - cavesong(Loop edit).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 bebd8389..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="finalman and yakslem - cavesong(Loop edit).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 0af671f9..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="finalman and yakslem - cavesong(Loop edit).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 f0d06bb5..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="Elite - candr2.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 02b6f98d..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="Yubaba - Chilling_Environment.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 c6673b8b..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="Ledmitz - DrearyDay.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 381f4ded..0ac103cd 100644
--- a/maps/009-2-0.tmx
+++ b/maps/009-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/009-2-0.png"/>
-  <property name="music" value="Ledmitz - DrearyDay.ogg"/>
+  <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 d4e0a0c6..e8638b53 100644
--- a/maps/009-2-10.tmx
+++ b/maps/009-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/009-2-10.png"/>
-  <property name="music" value="Ledmitz - OverwhelmedUnderground.ogg"/>
+  <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 8cf04467..08ff681c 100644
--- a/maps/009-2-11.tmx
+++ b/maps/009-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/009-2-11.png"/>
-  <property name="music" value="Ledmitz - OverwhelmedUnderground.ogg"/>
+  <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 3d6474f6..887a97bc 100644
--- a/maps/009-2-12.tmx
+++ b/maps/009-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/009-2-12.png"/>
-  <property name="music" value="Ledmitz - OverwhelmedUnderground.ogg"/>
+  <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 375b0f70..8c2b5103 100644
--- a/maps/009-2-13.tmx
+++ b/maps/009-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/009-2-13.png"/>
-  <property name="music" value="Ledmitz - OverwhelmedUnderground.ogg"/>
+  <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 60d17250..be218793 100644
--- a/maps/009-2-14.tmx
+++ b/maps/009-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/009-2-14.png"/>
-  <property name="music" value="Ledmitz - OverwhelmedUnderground.ogg"/>
+  <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 ededd5af..c1849119 100644
--- a/maps/009-2-15.tmx
+++ b/maps/009-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/009-2-15.png"/>
-  <property name="music" value="Ledmitz - DrearyDay.ogg"/>
+  <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 77698e7d..1277df7c 100644
--- a/maps/009-2-16.tmx
+++ b/maps/009-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/009-2-16.png"/>
-  <property name="music" value="Ledmitz - DrearyDay.ogg"/>
+  <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 e20201bc..65daff1e 100644
--- a/maps/009-2-17.tmx
+++ b/maps/009-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/009-2-17.png"/>
-  <property name="music" value="Ledmitz - DrearyDay.ogg"/>
+  <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 5304151e..005da5d3 100644
--- a/maps/009-2-18.tmx
+++ b/maps/009-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/009-2-18.png"/>
-  <property name="music" value="Ledmitz - DrearyDay.ogg"/>
+  <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 84ba0f3a..384eb2f3 100644
--- a/maps/009-2-2.tmx
+++ b/maps/009-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/009-2-2.png"/>
-  <property name="music" value="Ledmitz - DrearyDay.ogg"/>
+  <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 29660865..d4b81bce 100644
--- a/maps/009-2-3.tmx
+++ b/maps/009-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/009-2-3.png"/>
-  <property name="music" value="Chicka-Maria - inquisitive-inn.ogg"/>
+  <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 0471d7ce..c8c8c276 100644
--- a/maps/009-2-4.tmx
+++ b/maps/009-2-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/009-2-4.png"/>
-  <property name="music" value="Chicka-Maria - inquisitive-inn.ogg"/>
+  <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 fd7d3c1d..b149f29d 100644
--- a/maps/009-2-5.tmx
+++ b/maps/009-2-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/009-2-5.png"/>
-  <property name="music" value="Chicka-Maria - inquisitive-inn.ogg"/>
+  <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 69e90951..58458ec4 100644
--- a/maps/009-2-6.tmx
+++ b/maps/009-2-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/009-2-6.png"/>
-  <property name="music" value="Ledmitz - DrearyDay.ogg"/>
+  <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 88b8c8d3..09372bb0 100644
--- a/maps/009-2-7.tmx
+++ b/maps/009-2-7.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-2-7.png"/>
-  <property name="music" value="Ledmitz - DrearyDay.ogg"/>
+  <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 a70b2d59..0dfaf89c 100644
--- a/maps/009-2-8.tmx
+++ b/maps/009-2-8.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-2-8.png"/>
-  <property name="music" value="Ledmitz - DrearyDay.ogg"/>
+  <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 eba52ef1..e87d7484 100644
--- a/maps/009-2-9.tmx
+++ b/maps/009-2-9.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-2-9.png"/>
-  <property name="music" value="Ledmitz - OverwhelmedUnderground.ogg"/>
+  <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 6de1c10c..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="Chicka-Maria - in my heart2(edit).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 673231c5..f170a075 100644
--- a/maps/012-2-1.tmx
+++ b/maps/012-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/012-2-1.png"/>
-  <property name="music" value="Chicka-Maria - in my heart2(edit).ogg"/>
+  <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 c4152ecf..e06f0a49 100644
--- a/maps/012-2-2.tmx
+++ b/maps/012-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/012-2-2.png"/>
-  <property name="music" value="Chicka-Maria - in my heart2(edit).ogg"/>
+  <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 5eb15722..0e324df5 100644
--- a/maps/012-2-4.tmx
+++ b/maps/012-2-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/012-2-4.png"/>
-  <property name="music" value="Chicka-Maria - in my heart2(edit).ogg"/>
+  <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 87686075..7e56b942 100644
--- a/maps/012-2-5.tmx
+++ b/maps/012-2-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/012-2-5.png"/>
-  <property name="music" value="Chicka-Maria - in my heart2(edit).ogg"/>
+  <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 f77f409d..06fbfb1b 100644
--- a/maps/012-2-6.tmx
+++ b/maps/012-2-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/012-2-6.png"/>
-  <property name="music" value="Chicka-Maria - in my heart2(edit).ogg"/>
+  <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 82cb8dd9..cc0d4245 100644
--- a/maps/012-2-7.tmx
+++ b/maps/012-2-7.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-2-7.png"/>
-  <property name="music" value="Fireplace.ogg"/>
+  <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 4709c14f..4824b5cc 100644
--- a/maps/020-1.tmx
+++ b/maps/020-1.tmx
@@ -3263,7 +3263,7 @@
     <property name="dest_y" value="22"/>
    </properties>
   </object>
-  <object id="204" name="Saturn - Peace3.ogg" type="MUSIC" x="1088" y="1280" width="2404" height="2876"/>
+  <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-15.tmx b/maps/020-2-15.tmx
index 0058bbb5..196f9371 100644
--- a/maps/020-2-15.tmx
+++ b/maps/020-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/020-2-15.png"/>
-  <property name="music" value="faith.ogg"/>
+  <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-26.tmx b/maps/020-2-26.tmx
index 77d30b7f..a0af9e92 100644
--- a/maps/020-2-26.tmx
+++ b/maps/020-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/020-2-26.png"/>
-  <property name="music" value="Saturn - Peace3.ogg"/>
+  <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 b3767580..b4644b6d 100644
--- a/maps/020-2-27.tmx
+++ b/maps/020-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/020-2-27.png"/>
-  <property name="music" value="Saturn - Peace3.ogg"/>
+  <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 1c770a56..b213dc0d 100644
--- a/maps/020-2-28.tmx
+++ b/maps/020-2-28.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/020-2-28.png"/>
-  <property name="music" value="Saturn - Peace3.ogg"/>
+  <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 d3d3e538..4bb5129c 100644
--- a/maps/020-2-29.tmx
+++ b/maps/020-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/020-2-29.png"/>
-  <property name="music" value="Saturn - Peace3.ogg"/>
+  <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-30.tmx b/maps/020-2-30.tmx
index a678d81e..fce870a7 100644
--- a/maps/020-2-30.tmx
+++ b/maps/020-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/020-2-30.png"/>
-  <property name="music" value="Saturn - Peace3.ogg"/>
+  <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 9c9a6938..3c42c0e5 100644
--- a/maps/020-2-31.tmx
+++ b/maps/020-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/020-2-31.png"/>
-  <property name="music" value="Saturn - Peace3.ogg"/>
+  <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 3cf12df1..1333ab45 100644
--- a/maps/020-2-32.tmx
+++ b/maps/020-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/020-2-32.png"/>
-  <property name="music" value="Saturn - Peace3.ogg"/>
+  <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 2325aad7..fb837667 100644
--- a/maps/020-2-33.tmx
+++ b/maps/020-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/020-2-33.png"/>
-  <property name="music" value="Saturn - Peace3.ogg"/>
+  <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 a8e34926..4f079a58 100644
--- a/maps/020-2-34.tmx
+++ b/maps/020-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/020-2-20.png"/>
-  <property name="music" value="Saturn - Peace3.ogg"/>
+  <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/botcheck.tmx b/maps/botcheck.tmx
index 9c1dca1d..2bbe7af4 100644
--- a/maps/botcheck.tmx
+++ b/maps/botcheck.tmx
@@ -4,7 +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="Ledmitz - Botcheck.ogg"/>
+  <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 549e577b..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 56cb33cf..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="Chicka-Maria - sail-away.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 51fcf761..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="Kevin MacLeod - water_prelude.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">
diff --git a/witch q b/witch q
new file mode 100644
index 00000000..c70b5450
--- /dev/null
+++ b/witch q
@@ -0,0 +1,23 @@
+  Bat_sfx
+  Bow-Banshee
+  Candor_not_Cador
+  Halberd_sfx
+* Ledmitz/clientdata-fireball-sfx
+  Ledmitz/clientdata-magic-heal
+  Loghead_sfx
+  Maggot_sfx
+  Mob_Bow_sfx
+  Pinkie_sfx
+  RockKnife_sfx
+  Setzer_sfx
+  Snake_sfx
+  bee-sfx
+  bows-wooden_short_forest
+  fireball-sfx
+  ghost-sfx
+  init_map_music_clientdata
+  knife-swap
+  magic-heal
+  master
+  spider-sfx
+  typo_fix-sqirrel