[skip ci] Fix EVERY SINGLE MAP music, no exceptions. Xanthem says thanks.

This depends on latest commit at music repo.

52 files changed, 53 insertions, 49 deletions

diff --git a/maps/001-9.tmx b/maps/001-9.tmx
index 8e84072fb..97a2b39b6 100644
--- a/maps/001-9.tmx
+++ b/maps/001-9.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+ ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/001-9.png"/>
-  <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
+  <property name="music" value="mythica.ogg"/>
   <property name="name" value="Eternity Maze"/>
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/002-1.tmx b/maps/002-1.tmx
index dc0dc5764..d5da59143 100644
--- a/maps/002-1.tmx
+++ b/maps/002-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/002-1.png"/>
-  <property name="music" value="bartk_forest_of_birches.ogg"/>
+  <property name="music" value="sail_away.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/002-2.tmx b/maps/002-2.tmx
index 37509bb8c..936b7f3b1 100644
--- a/maps/002-2.tmx
+++ b/maps/002-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/002-2.png"/>
-  <property name="music" value="bartk_forest_of_birches.ogg"/>
+  <property name="music" value="dance_monster.ogg"/>
   <property name="name" value="Hold"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/002-3.tmx b/maps/002-3.tmx
index 5b8a003d1..3b6c1f425 100644
--- a/maps/002-3.tmx
+++ b/maps/002-3.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/002-3.png"/>
-  <property name="music" value="bartk_forest_of_birches.ogg"/>
+  <property name="music" value="sail_away.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/003-1.tmx b/maps/003-1.tmx
index fcc8159dd..9c526f535 100644
--- a/maps/003-1.tmx
+++ b/maps/003-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/003-1.png"/>
-  <property name="music" value="bartk_adventure.ogg"/>
+  <property name="music" value="mvrasseli_nochains.ogg"/>
   <property name="name" value="Tulimshar"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/004-1.tmx b/maps/004-1.tmx
index f55b1018f..4f8fb1940 100644
--- a/maps/004-1.tmx
+++ b/maps/004-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/004-1.png"/>
-  <property name="music" value="bartk_adventure.ogg"/>
+  <property name="music" value="3b5.ogg"/>
   <property name="name" value="Tulimshar"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/004-2-1.tmx b/maps/004-2-1.tmx
index 2ced81772..facad4337 100644
--- a/maps/004-2-1.tmx
+++ b/maps/004-2-1.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/004-2-1.png"/>
-  <property name="music" value="eric_matyas_surreal.ogg"/>
+  <property name="music" value="Arabesque.ogg"/>
   <property name="name" value="Canyon Caves"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/004-2.tmx b/maps/004-2.tmx
index c2886f75a..0d345926b 100644
--- a/maps/004-2.tmx
+++ b/maps/004-2.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/004-2.png"/>
-  <property name="music" value="3b5.ogg"/>
+  <property name="music" value="Arabesque.ogg"/>
   <property name="name" value="Desert Mountains"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/008-0.tmx b/maps/008-0.tmx
index 5ee9eb758..42c7ad4cf 100644
--- a/maps/008-0.tmx
+++ b/maps/008-0.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="CC BY-SA 3.0 ; GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/008-0.png"/>
-  <property name="music" value="dragon_and_toast.ogg"/>
+  <property name="music" value="dance_monster.ogg"/>
   <property name="name" value="Party Dungeon Waiting Hall"/>
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/009-2.tmx b/maps/009-2.tmx
index 98ff367d0..613084e60 100644
--- a/maps/009-2.tmx
+++ b/maps/009-2.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-2.png"/>
-  <property name="music" value="peace.ogg"/>
+  <property name="music" value="peace2.ogg"/>
   <property name="name" value="Halinarzo Library &amp; Bar"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/inn.tsx"/>
diff --git a/maps/009-3.tmx b/maps/009-3.tmx
index b09d315cd..c6a222a8b 100644
--- a/maps/009-3.tmx
+++ b/maps/009-3.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-3.png"/>
-  <property name="music" value="peace.ogg"/>
+  <property name="music" value="peace2.ogg"/>
   <property name="name" value="Halinarzo General Store"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/inn.tsx"/>
diff --git a/maps/009-4.tmx b/maps/009-4.tmx
index 20c927e36..a4d444a1d 100644
--- a/maps/009-4.tmx
+++ b/maps/009-4.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-4.png"/>
-  <property name="music" value="peace.ogg"/>
+  <property name="music" value="peace2.ogg"/>
   <property name="name" value="Halinarzo Hospital"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/inn.tsx"/>
diff --git a/maps/009-5.tmx b/maps/009-5.tmx
index 81d3d28af..2892ea856 100644
--- a/maps/009-5.tmx
+++ b/maps/009-5.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/009-5.png"/>
-  <property name="music" value="peace.ogg"/>
+  <property name="music" value="peace2.ogg"/>
   <property name="name" value="Halinarzo Church"/>
  </properties>
  <tileset firstgid="1" name="blockWalls" tilewidth="32" tileheight="32" tilecount="256" columns="16">
diff --git a/maps/010-1-1.tmx b/maps/010-1-1.tmx
index bec501f9d..1025b6f7e 100644
--- a/maps/010-1-1.tmx
+++ b/maps/010-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/010-1-1.png"/>
-  <property name="music" value="eric_matyas_surreal.ogg"/>
+  <property name="music" value="Arabesque.ogg"/>
   <property name="name" value="Canyon Great Caves"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/010-1.tmx b/maps/010-1.tmx
index d1170b2a9..2c8c68709 100644
--- a/maps/010-1.tmx
+++ b/maps/010-1.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="GPL 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/010-1.png"/>
-  <property name="music" value="3b5.ogg"/>
+  <property name="music" value="Arabesque.ogg"/>
   <property name="name" value="Desert Mountains"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/010-2.tmx b/maps/010-2.tmx
index 62e1a74d7..dee941023 100644
--- a/maps/010-2.tmx
+++ b/maps/010-2.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL 3.0"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/010-2.png"/>
-  <property name="music" value="3b5.ogg"/>
+  <property name="music" value="Arabesque.ogg"/>
   <property name="name" value="Desert Mountains"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/011-1.tmx b/maps/011-1.tmx
index c93df5dc1..faeaa4ef3 100644
--- a/maps/011-1.tmx
+++ b/maps/011-1.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/011.png"/>
-  <property name="music" value="water_prelude.ogg"/>
+  <property name="music" value="Unforgiving_Lands.ogg"/>
   <property name="name" value="Depleted Mana Stones Mine"/>
  </properties>
  <tileset firstgid="1" name="cave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
diff --git a/maps/011-2.tmx b/maps/011-2.tmx
index 67a0a07b8..48cbd73b8 100644
--- a/maps/011-2.tmx
+++ b/maps/011-2.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/004-2-1.png"/>
-  <property name="music" value="eric_matyas_surreal.ogg"/>
-  <property name="name" value="Canyon Caves"/>
+  <property name="music" value="tws_green_island.ogg"/>
+  <property name="name" value="Supreme Mana Cave"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
diff --git a/maps/014-5.tmx b/maps/014-5.tmx
index b84361528..c9a9d52f8 100644
--- a/maps/014-5.tmx
+++ b/maps/014-5.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/014-5.png"/>
-  <property name="music" value="the-forest.ogg"/>
+  <property name="music" value="dariunas_forest.ogg"/>
   <property name="name" value="North Woodlands"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/015-5.tmx b/maps/015-5.tmx
index bcc56ec26..99db17dfe 100644
--- a/maps/015-5.tmx
+++ b/maps/015-5.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="GPL"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/015-5.png"/>
-  <property name="music" value="cavesong.ogg"/>
+  <property name="music" value="eric_matyas_ghouls.ogg"/>
   <property name="name" value="Abandoned Mines"/>
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/015-6.tmx b/maps/015-6.tmx
index 1821a278b..26ceba1b3 100644
--- a/maps/015-6.tmx
+++ b/maps/015-6.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="GPL"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/015-6.png"/>
-  <property name="music" value="cavesong.ogg"/>
+  <property name="music" value="dragon_and_toast.ogg"/>
   <property name="name" value="Terranite Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/015-7.tmx b/maps/015-7.tmx
index c488e5936..167ce64b6 100644
--- a/maps/015-7.tmx
+++ b/maps/015-7.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+, CC BY SA 3.0+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/015-7.png"/>
-  <property name="music" value="Unforgiving_Lands.ogg"/>
+  <property name="music" value="Deep_Cave.ogg"/>
   <property name="name" value="Small Cave"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
diff --git a/maps/016-1.tmx b/maps/016-1.tmx
index 9f68ed12a..fd6a7e8e9 100644
--- a/maps/016-1.tmx
+++ b/maps/016-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/002-3.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="sail_away.ogg"/>
   <property name="name" value="La Marine First Deck"/>
  </properties>
  <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8">
diff --git a/maps/016-7.tmx b/maps/016-7.tmx
index f2f77ab45..ffd00b212 100644
--- a/maps/016-7.tmx
+++ b/maps/016-7.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/016-7.png"/>
-  <property name="music" value="water_prelude.ogg"/>
+  <property name="music" value="Arabesque.ogg"/>
   <property name="name" value="Pirate Attack"/>
   <property name="overlay0image" value="graphics/images/ambient/light_fog.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/017-1.tmx b/maps/017-1.tmx
index ca86eb04d..9d42ca5af 100644
--- a/maps/017-1.tmx
+++ b/maps/017-1.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/017-1.png"/>
-  <property name="music" value="Unforgiving_Lands.ogg"/>
+  <property name="music" value="school_of_quirks.ogg"/>
   <property name="name" value="Land Of Fire Village"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/017-2-2.tmx b/maps/017-2-2.tmx
index 7397a2f6b..051800483 100644
--- a/maps/017-2-2.tmx
+++ b/maps/017-2-2.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/017-2-2.png"/>
-  <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
+  <property name="music" value="Deep_Cave.ogg"/>
   <property name="name" value="Skull Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/017-2.tmx b/maps/017-2.tmx
index 57596c47a..48def518e 100644
--- a/maps/017-2.tmx
+++ b/maps/017-2.tmx
@@ -5,6 +5,7 @@
   <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/017-2.png"/>
+  <property name="music" value="peace2.ogg"/>
   <property name="name" value="Jack's House"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
diff --git a/maps/017-3.tmx b/maps/017-3.tmx
index 6af616f11..fdfb8a9fb 100644
--- a/maps/017-3.tmx
+++ b/maps/017-3.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/017-3.png"/>
-  <property name="music" value="Clouds Calling.ogg"/>
+  <property name="music" value="peace2.ogg"/>
   <property name="name" value="Dimond's Cove"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
diff --git a/maps/017-4.tmx b/maps/017-4.tmx
index 35a7565a9..920b64458 100644
--- a/maps/017-4.tmx
+++ b/maps/017-4.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/017-4.png"/>
-  <property name="music" value="InquisitiveInn.ogg"/>
+  <property name="music" value="peace2.ogg"/>
   <property name="name" value="Tech-User Forge"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
diff --git a/maps/017-5.tmx b/maps/017-5.tmx
index f882a832f..6891c91a8 100644
--- a/maps/017-5.tmx
+++ b/maps/017-5.tmx
@@ -4,7 +4,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/017-5.png"/>
-  <property name="music" value="mystique-forest.ogg"/>
+  <property name="music" value="peace2.ogg"/>
   <property name="name" value="LoF Weapon Smith &amp; Shop"/>
  </properties>
  <tileset firstgid="1" name="colision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/017-6.tmx b/maps/017-6.tmx
index 3e87c1bd3..a88c3af22 100644
--- a/maps/017-6.tmx
+++ b/maps/017-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/017-6.png"/>
-  <property name="music" value="peace.ogg"/>
+  <property name="music" value="peace2.ogg"/>
   <property name="name" value="LoF Alchemy Shop"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/018-1-1.tmx b/maps/018-1-1.tmx
index 63b252c6b..32c27f404 100644
--- a/maps/018-1-1.tmx
+++ b/maps/018-1-1.tmx
@@ -5,6 +5,7 @@
   <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/018-1-1.png"/>
+  <property name="music" value="Deep_Cave.ogg"/>
   <property name="name" value="Sincerity Island Cave"/>
   <property name="overlay1image" value="graphics/images/ambient/darkness2.png"/>
   <property name="overlay1mask" value="2"/>
diff --git a/maps/018-2-1.tmx b/maps/018-2-1.tmx
index 02c9069e4..e721281e7 100644
--- a/maps/018-2-1.tmx
+++ b/maps/018-2-1.tmx
@@ -5,6 +5,7 @@
   <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/018-2-1.png"/>
+  <property name="music" value="Arabesque.ogg"/>
   <property name="name" value="Heroes' Hold - Castle"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/018-2-4.tmx b/maps/018-2-4.tmx
index 5b2c13d23..81084d2f2 100644
--- a/maps/018-2-4.tmx
+++ b/maps/018-2-4.tmx
@@ -5,6 +5,7 @@
   <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/018-2-4.png"/>
+  <property name="music" value="peace2.ogg"/>
   <property name="name" value="Heroes' Hold - Exchange Hall"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
diff --git a/maps/018-2.tmx b/maps/018-2.tmx
index 50e1d2079..d01eaa59d 100644
--- a/maps/018-2.tmx
+++ b/maps/018-2.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/018-2.png"/>
-  <property name="music" value="Richard_Wagner_-_Ride_of_the_Valkyries.ogg"/>
+  <property name="music" value="tmw_adventure.ogg"/>
   <property name="name" value="Heroes' Hold - Outside"/>
   <property name="overlay0image" value="graphics/images/ambient/fog.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/018-3.tmx b/maps/018-3.tmx
index 1679578f6..a4614d4d0 100644
--- a/maps/018-3.tmx
+++ b/maps/018-3.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/018-3.png"/>
-  <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
+  <property name="music" value="misuse.ogg"/>
   <property name="name" value="Somber Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
   <property name="overlay0keepratio" value="true"/>
diff --git a/maps/018-4-1.tmx b/maps/018-4-1.tmx
index 6879346bf..3d38a1e10 100644
--- a/maps/018-4-1.tmx
+++ b/maps/018-4-1.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/018-4-1.png"/>
-  <property name="music" value="finalman_and_yakslem-cavesong.ogg"/>
+  <property name="music" value="eric_matyas_surreal.ogg"/>
   <property name="name" value="Secret Island Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/018-4.tmx b/maps/018-4.tmx
index 8e8bce429..6875d4ce2 100644
--- a/maps/018-4.tmx
+++ b/maps/018-4.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2 ; CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/018-4.png"/>
-  <property name="music" value="mystique-forest.ogg"/>
+  <property name="music" value="peace2.ogg"/>
   <property name="name" value="Secret Island"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/018-5.tmx b/maps/018-5.tmx
index 670d5df17..000d90222 100644
--- a/maps/018-5.tmx
+++ b/maps/018-5.tmx
@@ -5,7 +5,7 @@
   <property name="manaplus version" value="2"/>
   <property name="background0image" value="graphics/images/panorams/spotlight.png"/>
   <property name="minimap" value="graphics/minimaps/018-5.png"/>
-  <property name="music" value="explorers-melody.ogg"/>
+  <property name="music" value="tmw_adventure.ogg"/>
   <property name="name" value="Lilit Island"/>
   <property name="overlay0image" value="graphics/images/ambient/fog.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/019-1-1.tmx b/maps/019-1-1.tmx
index a0db47359..ff7f1db61 100644
--- a/maps/019-1-1.tmx
+++ b/maps/019-1-1.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v3+, CC-BY-SA"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/019-1-1.png"/>
-  <property name="music" value="InquisitiveInn.ogg"/>
+  <property name="music" value="8bit_the_hero.ogg"/>
   <property name="name" value="Miller's House"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
diff --git a/maps/019-3.tmx b/maps/019-3.tmx
index f49985c9e..049e7cfc8 100644
--- a/maps/019-3.tmx
+++ b/maps/019-3.tmx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.0" tiledversion="2018.02.14" orientation="orthogonal" renderorder="right-down" width="178" height="128" tilewidth="32" tileheight="32" infinite="0" nextobjectid="17">
  <properties>
-  <property name="music" value="Explorers-melody.ogg"/>
+  <property name="music" value="water_prelude.ogg"/>
   <property name="name" value="Snow Forest"/>
   <property name="overlay0image" value="graphics/images/ambient/snow.png"/>
   <property name="overlay0parallax" value="2.4"/>
diff --git a/maps/019-4-1.tmx b/maps/019-4-1.tmx
index d23fce067..007b70ffc 100644
--- a/maps/019-4-1.tmx
+++ b/maps/019-4-1.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/019-4-1.png"/>
-  <property name="music" value="peace.ogg"/>
+  <property name="music" value="8bit_the_hero.ogg"/>
   <property name="name" value="Christmas Workshop"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-1.tmx b/maps/020-1.tmx
index 9b620fe24..2ad71fd67 100644
--- a/maps/020-1.tmx
+++ b/maps/020-1.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-1.png"/>
-  <property name="music" value="water_prelude.ogg"/>
+  <property name="music" value="tws_birds_in_the_sunrise.ogg"/>
   <property name="name" value="Nivalis"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/020-2.tmx b/maps/020-2.tmx
index b94b48575..8380ddf15 100644
--- a/maps/020-2.tmx
+++ b/maps/020-2.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2.png"/>
-  <property name="music" value="peace.ogg"/>
+  <property name="music" value="8bit_the_hero.ogg"/>
   <property name="name" value="Nivalis Indoors"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-3.tmx b/maps/020-3.tmx
index fb3d66449..d09d8165d 100644
--- a/maps/020-3.tmx
+++ b/maps/020-3.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2.png"/>
-  <property name="music" value="peace.ogg"/>
+  <property name="music" value="8bit_the_hero.ogg"/>
   <property name="name" value="Nivalis Indoors"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/020-5.tmx b/maps/020-5.tmx
index 10862c35f..680ce7616 100644
--- a/maps/020-5.tmx
+++ b/maps/020-5.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/020-2.png"/>
-  <property name="music" value="peace.ogg"/>
+  <property name="music" value="8bit_the_hero.ogg"/>
   <property name="name" value="Nivalis Indoors"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/021-1.tmx b/maps/021-1.tmx
index 91db80ce8..9de99eeed 100644
--- a/maps/021-1.tmx
+++ b/maps/021-1.tmx
@@ -4,7 +4,7 @@
   <property name="author" value="The Mana World Team, Jesusalva"/>
   <property name="license" value="GPL v2+"/>
   <property name="minimap" value="graphics/minimaps/021-1.png"/>
-  <property name="music" value="snow-village.ogg"/>
+  <property name="music" value="icecave.ogg"/>
   <property name="name" value="Ice Labyrinth"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
diff --git a/maps/021-2.tmx b/maps/021-2.tmx
index 920b159b7..3e751a545 100644
--- a/maps/021-2.tmx
+++ b/maps/021-2.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/021-2.png"/>
-  <property name="music" value="water_prelude.ogg"/>
+  <property name="music" value="icecave.ogg"/>
   <property name="name" value="Snow Cave"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
diff --git a/maps/021-3.tmx b/maps/021-3.tmx
index 3bba747b5..b612dd61c 100644
--- a/maps/021-3.tmx
+++ b/maps/021-3.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/021-3.png"/>
-  <property name="music" value="water_prelude.ogg"/>
+  <property name="music" value="icecave.ogg"/>
   <property name="name" value="Deeper Snow Cave"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
diff --git a/maps/023-1.tmx b/maps/023-1.tmx
index 936100385..9b629be27 100644
--- a/maps/023-1.tmx
+++ b/maps/023-1.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/023-1.png"/>
-  <property name="music" value="water_prelude.ogg"/>
+  <property name="music" value="icecave.ogg"/>
   <property name="name" value="Frozen Cave"/>
  </properties>
  <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/023-2.tmx b/maps/023-2.tmx
index 696447234..c6aca2b35 100644
--- a/maps/023-2.tmx
+++ b/maps/023-2.tmx
@@ -5,7 +5,7 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/023-2.png"/>
-  <property name="music" value="water_prelude.ogg"/>
+  <property name="music" value="sail_away.ogg"/>
   <property name="name" value="Magic Cave"/>
  </properties>
  <tileset firstgid="1" name="icecave" tilewidth="32" tileheight="32" tilecount="128" columns="16">
diff --git a/maps/sec_pri.tmx b/maps/sec_pri.tmx
index 335c680e2..b89dcdd0a 100644
--- a/maps/sec_pri.tmx
+++ b/maps/sec_pri.tmx
@@ -2,7 +2,7 @@
 <map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="60" height="51" tilewidth="32" tileheight="32" nextobjectid="2">
  <properties>
   <property name="minimap" value="graphics/minimaps/jail.png"/>
-  <property name="music" value="water_prelude.ogg"/>
+  <property name="music" value="3b5.ogg"/>
   <property name="name" value="Jesusalva's Jail"/>
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
  </properties>