diff --git a/Makefile.am b/Makefile.am
index 6da553f0..50bad936 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,20 @@
 # Hyperrogue binairy rules
 bin_PROGRAMS = hyperrogue
 hyperroguedir = $(datadir)/hyperrogue
-dist_hyperrogue_DATA = music/hyperrogue-music.txt DejaVuSans-Bold.ttf
+dist_hyperrogue_DATA = hyperrogue-music.txt DejaVuSans-Bold.ttf
 dist_doc_DATA = README.md
 hyperrogue_SOURCES = hyper.cpp savepng.c
 
 # Some definitions used in graph.cpp
-hyperrogue_CPPFLAGS = -DFONTDESTDIR=\"$(pkgdatadir)/DejaVuSans-Bold.ttf\" -DMUSICDESTDIR=\"$(pkgdatadir)/hyperrogue-music.txt\" -DSOUNDDESTDIR=\"$(pkgdatadir)/sound/\" -O2
+hyperrogue_CPPFLAGS = -DFONTDESTDIR=\"$(pkgdatadir)/DejaVuSans-Bold.ttf\" -DMUSICDESTDIR=\"$(pkgdatadir)/hyperrogue-music.txt\" -DSOUNDDESTDIR=\"$(pkgdatadir)/sounds/\" -O2
 
 # Musicdir
 musicdir=$(datadir)/hyperrogue/music
 dist_music_DATA = music/hr3-caves.ogg music/hr3-desert.ogg music/hr3-hell.ogg music/hr3-jungle.ogg music/hr3-mirror.ogg music/hr3-rlyeh.ogg music/hr3-crossroads.ogg music/hr3-graveyard.ogg music/hr3-icyland.ogg music/hr3-laboratory.ogg music/hr3-motion.ogg
 
-music/hyperrogue-music.txt: hyperrogue
-	sed 's+music+$(pkgdatadir)/music+g' <hyperrogue-music.txt >music/hyperrogue-music.txt
+# Soundsdir
+soundsdir=$(datadir)/hyperrogue/sounds
+dist_sounds_DATA = sounds/*
 
 # Langen binary rules
 noinst_PROGRAMS = langen
@@ -32,7 +33,6 @@ language-data.cpp: langen
 # Local clean rules
 clean-local:
 	rm -rf language-data.cpp
-	rm -rf music/hyperrogue-music.txt
 
 # First target made
 BUILT_SOURCES = language-data.cpp graph.cpp
diff --git a/hyperrogue-music.txt b/hyperrogue-music.txt
index faf3fef2..9953ce74 100644
--- a/hyperrogue-music.txt
+++ b/hyperrogue-music.txt
@@ -1,123 +1,123 @@
 # Crossroads [02]
-[02] music/hr3-crossroads.ogg
+[02] */music/hr3-crossroads.ogg
 # Desert [03]
-[03] music/hr3-desert.ogg
+[03] */music/hr3-desert.ogg
 # Icy Lands [04]
-[04] music/hr3-icyland.ogg
+[04] */music/hr3-icyland.ogg
 # Living Caves [05]
-[05] music/hr3-caves.ogg
+[05] */music/hr3-caves.ogg
 # Jungle [06]
-[06] music/hr3-jungle.ogg
+[06] */music/hr3-jungle.ogg
 # Alchemist's Lab [07]
-[07] music/hr3-laboratory.ogg
+[07] */music/hr3-laboratory.ogg
 # Mirror [08]
-[08] music/hr3-mirror.ogg
+[08] */music/hr3-mirror.ogg
 # Graveyard [09]
-[09] music/hr3-graveyard.ogg
+[09] */music/hr3-graveyard.ogg
 # R'Lyeh [10]
-[10] music/hr3-rlyeh.ogg
+[10] */music/hr3-rlyeh.ogg
 # Hell [11]
-[11] music/hr3-hell.ogg
+[11] */music/hr3-hell.ogg
 # Cocytus [12]
-[12] music/hr3-icyland.ogg
+[12] */music/hr3-icyland.ogg
 # Motion [13]
-[13] music/hr3-motion.ogg
+[13] */music/hr3-motion.ogg
 # Dry Forest [14]
-[14] music/hr3-jungle.ogg
+[14] */music/hr3-jungle.ogg
 # Emerald Mines [15]
-[15] music/hr3-caves.ogg
+[15] */music/hr3-caves.ogg
 # Vineyard [16]
-[16] music/hr3-laboratory.ogg
+[16] */music/hr3-laboratory.ogg
 # Dead Caves [17]
-[17] music/hr3-graveyard.ogg
+[17] */music/hr3-graveyard.ogg
 # Hive [18]
-[18] music/hr3-motion.ogg
+[18] */music/hr3-motion.ogg
 # Land of Power [19]
-[19] music/hr3-mirror.ogg
+[19] */music/hr3-mirror.ogg
 # Camelot [20]
-[20] music/hr3-hell.ogg
+[20] */music/hr3-hell.ogg
 # Temple [21]
-[21] music/hr3-rlyeh.ogg
+[21] */music/hr3-rlyeh.ogg
 # CR2 [22]
-[22] music/hr3-crossroads.ogg
+[22] */music/hr3-crossroads.ogg
 # Caribbean [23]
-[23] music/hr3-crossroads.ogg
+[23] */music/hr3-crossroads.ogg
 # Red Rock Valley [24]
-[24] music/hr3-desert.ogg
+[24] */music/hr3-desert.ogg
 # Minefield [25]
-[25] music/hr3-hell.ogg
+[25] */music/hr3-hell.ogg
 # Ocean [26]
-[26] music/hr3-caves.ogg
+[26] */music/hr3-caves.ogg
 # Whirlpool [27]
-[27] music/hr3-rlyeh.ogg
+[27] */music/hr3-rlyeh.ogg
 # Palace [28]
-[28] music/hr3-crossroads.ogg
+[28] */music/hr3-crossroads.ogg
 # Living Fjord [39]
-[29] music/hr3-caves.ogg
+[29] */music/hr3-caves.ogg
 # Ivory Tower [30]
-[30] music/hr3-laboratory.ogg
+[30] */music/hr3-laboratory.ogg
 # Zebra [31]
-[31] music/hr3-motion.ogg
+[31] */music/hr3-motion.ogg
 # Elemental Fire [32]
-[32] music/hr3-hell.ogg
+[32] */music/hr3-hell.ogg
 # Elemental Air [33]
-[33] music/hr3-motion.ogg
+[33] */music/hr3-motion.ogg
 # Elemental Earth [34]
-[34] music/hr3-caves.ogg
+[34] */music/hr3-caves.ogg
 # Elemental Water [35]
-[35] music/hr3-crossroads.ogg
+[35] */music/hr3-crossroads.ogg
 # Crossroads III [36]
-[36] music/hr3-crossroads.ogg
+[36] */music/hr3-crossroads.ogg
 # Seawall [37] (useless)
 # Elemental Wall [38] (useless)
 # Canvas [39]
-[39] music/hr3-laboratory.ogg
+[39] */music/hr3-laboratory.ogg
 # Wild West [41]
-[41] music/hr3-caves.ogg
+[41] */music/hr3-caves.ogg
 # Storms [42]
-[42] music/hr3-laboratory.ogg
+[42] */music/hr3-laboratory.ogg
 # Overgrown [43]
-[43] music/hr3-jungle.ogg
+[43] */music/hr3-jungle.ogg
 # Clearing [44]
-[44] music/hr3-jungle.ogg
+[44] */music/hr3-jungle.ogg
 # Haunted [45]
-[45] music/hr3-graveyard.ogg
+[45] */music/hr3-graveyard.ogg
 # Windy Plains [48]
-[48] music/hr3-laboratory.ogg
+[48] */music/hr3-laboratory.ogg
 # Rose Garden [49]
-[49] music/hr3-hell.ogg
+[49] */music/hr3-hell.ogg
 # Warped Coast/Sea [50, 51 -> 50]
-[50] music/hr3-caves.ogg
+[50] */music/hr3-caves.ogg
 # Crossroads IV [52]
-[52] music/hr3-crossroads.ogg
+[52] */music/hr3-crossroads.ogg
 # Yendorian [53]
-[53] music/hr3-laboratory.ogg
+[53] */music/hr3-laboratory.ogg
 # Galapagos [54]
-[54] music/hr3-crossroads.ogg
+[54] */music/hr3-crossroads.ogg
 # Dragon Chasms [55]
-[55] music/hr3-caves.ogg
+[55] */music/hr3-caves.ogg
 # Kraken [56]
-[56] music/hr3-rlyeh.ogg
+[56] */music/hr3-rlyeh.ogg
 # Burial Grounds [57]
-[57] music/hr3-graveyard.ogg
+[57] */music/hr3-graveyard.ogg
 # Trollheim [58]
-[58] music/hr3-desert.ogg
+[58] */music/hr3-desert.ogg
 # Halloween [59]
-[59] music/hr3-graveyard.ogg
+[59] */music/hr3-graveyard.ogg
 # Dungeon [60]
-[60] music/hr3-desert.ogg
+[60] */music/hr3-desert.ogg
 # Lost Mountain [61]
-[61] music/hr3-rlyeh.ogg
+[61] */music/hr3-rlyeh.ogg
 # Reptiles [62]
-[62] music/hr3-mirror.ogg
+[62] */music/hr3-mirror.ogg
 # Prairie [63]
-[63] music/hr3-desert.ogg
+[63] */music/hr3-desert.ogg
 # Bull Dash [64]
-[64] music/hr3-mirror.ogg
+[64] */music/hr3-mirror.ogg
 # Crossroads V [65]
-[65] music/hr3-crossroads.ogg
+[65] */music/hr3-crossroads.ogg
 # Cellular Automata [66]
-[66] music/hr3-laboratory.ogg
+[66] */music/hr3-laboratory.ogg
 
 # None [00] (used when the window is out of focus)