24 files changed, 51 insertions, 25 deletions
diff --git a/maps/000-0-0.tmx b/maps/000-0-0.tmx
index bf48419f..a11b782d 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="bartk_forest_of_birches.orgg.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/001-4.tmx b/maps/001-4.tmx
index 58c40c06..acc4b3e0 100644
--- a/maps/001-4.tmx
+++ b/maps/001-4.tmx
@@ -2,7 +2,7 @@
 <map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="299" height="299" tilewidth="32" tileheight="32" infinite="0" nextobjectid="104">
  <properties>
   <property name="minimap" value="graphics/minimaps/001-4.png"/>
-  <property name="music" value="dariunas - the forest.ogg"/>
+  <property name="music" value="dariunas_forest.ogg"/>
   <property name="name" value="Enchanted Forest"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
diff --git a/maps/002-1.tmx b/maps/002-1.tmx
index 7f675499..10c435bc 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 - in the forest of the birches.ogg"/>
+  <property name="music" value="bartk_forest_of_birches.orgg.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 3c881136..a8266532 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 - in the forest of the birches.ogg"/>
+  <property name="music" value="bartk_forest_of_birches.orgg.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 8f9a3551..654af749 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 - in the forest of the birches.ogg"/>
+  <property name="music" value="bartk_forest_of_birches.orgg.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/002-4.tmx b/maps/002-4.tmx
index 84b51d32..6c8de1e9 100644
--- a/maps/002-4.tmx
+++ b/maps/002-4.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-4.png"/>
-  <property name="music" value="bartk - in the forest of the birches.ogg"/>
+  <property name="music" value="bartk_forest_of_birches.orgg.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/003-1-3.tmx b/maps/003-1-3.tmx
index 0b62278c..b3ee8e88 100644
--- a/maps/003-1-3.tmx
+++ b/maps/003-1-3.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/003-1-3.png"/>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
-  <property name="name" value="magic school cave"/>
+  <property name="music" value="eric_matyas_surreal.ogg"/>
+  <property name="name" value="Magic School's 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/003-1.tmx b/maps/003-1.tmx
index 0ff34c5b..a4dd8da1 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 - the adventure begins.ogg"/>
+  <property name="music" value="bartk_adventure.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 48cef596..31e03eb3 100644
--- a/maps/004-1.tmx
+++ b/maps/004-1.tmx
@@ -4,12 +4,17 @@
   <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 - the adventure begins.ogg"/>
+  <property name="music" value="bartk_adventure.ogg"/>
   <property name="name" value="Tulimshar"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
+  <property name="overlay1image" value="graphics/images/ambient/darkness2.png"/>
+  <property name="overlay1mask" value="2"/>
+  <property name="overlay1parallax" value="1.0"/>
+  <property name="overlay1scrollX" value="0.2"/>
+  <property name="overlay1scrollY" value="0.1"/>
  </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/004-2-1.tmx b/maps/004-2-1.tmx
index 4aa4ff2a..e96d94a5 100644
--- a/maps/004-2-1.tmx
+++ b/maps/004-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/004-2-1.png"/>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
+  <property name="music" value="eric_matyas_surreal.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/005-1.tmx b/maps/005-1.tmx
index 4491dd0d..e0cd22a8 100644
--- a/maps/005-1.tmx
+++ b/maps/005-1.tmx
@@ -4,12 +4,17 @@
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value="graphics/minimaps/005-1.png"/>
-  <property name="music" value="bartk - the adventure begins.ogg"/>
+  <property name="music" value="bartk_adventure.ogg"/>
   <property name="name" value="Candor Island"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
+  <property name="overlay1image" value="graphics/images/ambient/darkness2.png"/>
+  <property name="overlay1mask" value="2"/>
+  <property name="overlay1parallax" value="1.0"/>
+  <property name="overlay1scrollX" value="0.2"/>
+  <property name="overlay1scrollY" value="0.1"/>
  </properties>
  <tileset firstgid="1" name="Base" tilewidth="32" tileheight="32" tilecount="220" columns="22">
   <image source="../graphics/tilesets/ship-base.png" width="704" height="320"/>
diff --git a/maps/005-2-1.tmx b/maps/005-2-1.tmx
index 548814af..dc1137aa 100644
--- a/maps/005-2-1.tmx
+++ b/maps/005-2-1.tmx
@@ -2,9 +2,10 @@
 <map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
+  <property name="author" value="Saulc"/>
   <property name="manaplus version" value="2"/>
   <property name="minimap" value=""/>
-  <property name="music" value="magick - real.ogg"/>
+  <property name="music" value="magick_real.ogg"/>
   <property name="name" value="Saxso's Basement"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/005-2.tmx b/maps/005-2.tmx
index 9dfae8c9..71cb2d99 100644
--- a/maps/005-2.tmx
+++ b/maps/005-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/005-2.png"/>
-  <property name="music" value="magick - real.ogg"/>
+  <property name="music" value="magick_real.ogg"/>
   <property name="name" value="Saxso's House"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/005-3.tmx b/maps/005-3.tmx
index 16439adc..640488db 100644
--- a/maps/005-3.tmx
+++ b/maps/005-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/005-3.png"/>
-  <property name="music" value="magick - real.ogg"/>
+  <property name="music" value="magick_real.ogg"/>
   <property name="name" value="Storage House"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/005-4.tmx b/maps/005-4.tmx
index 80f49cdf..a62ca1ca 100644
--- a/maps/005-4.tmx
+++ b/maps/005-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/005-4.png"/>
-  <property name="music" value="magick - real.ogg"/>
+  <property name="music" value="magick_real.ogg"/>
   <property name="name" value="Armor Shop"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/005-5.tmx b/maps/005-5.tmx
index feac4961..924b4e77 100644
--- a/maps/005-5.tmx
+++ b/maps/005-5.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/005-5.png"/>
-  <property name="music" value="magick - real.ogg"/>
-  <property name="name" value="Merchant Guild"/>
+  <property name="music" value="magick_real.ogg"/>
+  <property name="name" value="Candor Bank"/>
  </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/005-6.tmx b/maps/005-6.tmx
index 46d0e4e9..bf6f02e0 100644
--- a/maps/005-6.tmx
+++ b/maps/005-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/005-6.png"/>
-  <property name="music" value="magick - real.ogg"/>
+  <property name="music" value="magick_real.ogg"/>
   <property name="name" value="Candor Magic House"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/005-7.tmx b/maps/005-7.tmx
index 9b12684f..dcbbb263 100644
--- a/maps/005-7.tmx
+++ b/maps/005-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/005-7.png"/>
-  <property name="music" value="magick - real.ogg"/>
+  <property name="music" value="magick_real.ogg"/>
   <property name="name" value="Training House"/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/009-1.tmx b/maps/009-1.tmx
index 6a07c270..1101fc8b 100644
--- a/maps/009-1.tmx
+++ b/maps/009-1.tmx
@@ -10,6 +10,11 @@
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
+  <property name="overlay1image" value="graphics/images/ambient/darkness2.png"/>
+  <property name="overlay1mask" value="2"/>
+  <property name="overlay1parallax" value="1.0"/>
+  <property name="overlay1scrollX" value="0.2"/>
+  <property name="overlay1scrollY" value="0.1"/>
  </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/010-1-1.tmx b/maps/010-1-1.tmx
index 6f0323e5..45bfc746 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 place.ogg"/>
+  <property name="music" value="eric_matyas_surreal.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/011-2.tmx b/maps/011-2.tmx
index 953b793e..00057ca7 100644
--- a/maps/011-2.tmx
+++ b/maps/011-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/004-2-1.png"/>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
+  <property name="music" value="eric_matyas_surreal.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/012-1.tmx b/maps/012-1.tmx
index 6969ae2d..c6f0e9c6 100644
--- a/maps/012-1.tmx
+++ b/maps/012-1.tmx
@@ -4,12 +4,17 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/012-1.png"/>
-  <property name="music" value="magick - real.ogg"/>
+  <property name="music" value="magick_real.ogg"/>
   <property name="name" value="Hurnscald"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
+  <property name="overlay1image" value="graphics/images/ambient/darkness2.png"/>
+  <property name="overlay1mask" value="2"/>
+  <property name="overlay1parallax" value="1.0"/>
+  <property name="overlay1scrollX" value="0.2"/>
+  <property name="overlay1scrollY" value="0.1"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
  <tileset firstgid="10" source="../graphics/tilesets/woodland_ground.tsx"/>
diff --git a/maps/014-1.tmx b/maps/014-1.tmx
index 368955eb..4c5bba78 100644
--- a/maps/014-1.tmx
+++ b/maps/014-1.tmx
@@ -4,12 +4,17 @@
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="1"/>
   <property name="minimap" value="graphics/minimaps/014-1.png"/>
-  <property name="music" value="dariunas - the forest.ogg"/>
+  <property name="music" value="dariunas_forest.ogg"/>
   <property name="name" value="Woodland Mining Camp"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
+  <property name="overlay1image" value="graphics/images/ambient/darkness2.png"/>
+  <property name="overlay1mask" value="2"/>
+  <property name="overlay1parallax" value="1.0"/>
+  <property name="overlay1scrollX" value="0.2"/>
+  <property name="overlay1scrollY" value="0.1"/>
  </properties>
  <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
  <tileset firstgid="10" source="../graphics/tilesets/woodland_ground.tsx"/>
diff --git a/maps/botcheck.tmx b/maps/botcheck.tmx
index c7f3b5a1..55dbcd9e 100644
--- a/maps/botcheck.tmx
+++ b/maps/botcheck.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="80" height="80" tilewidth="32" tileheight="32" infinite="0" nextobjectid="1">
  <properties>
-  <property name="music" value="eric matyas - surreal place.ogg"/>
+  <property name="music" value="eric_matyas_surreal.ogg"/>
   <property name="name" value="Botcheck Area"/>
  </properties>
  <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">