diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 6f3ca781339..8b053409042 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -37,7 +37,14 @@ var/global/datum/controller/gameticker/ticker
 	var/triai = 0//Global holder for Triumvirate
 
 /datum/controller/gameticker/proc/pregame()
-	login_music = pick('sound/ambience/title2.ogg','sound/ambience/title1.ogg','sound/ambience/b12_combined_start.ogg') // choose title music!
+	login_music = pick(\
+	'sound/music/title1.ogg',\
+	'sound/music/title2.ogg',\
+	'sound/music/1.ogg',\
+	'sound/music/clouds.s3m',\
+	'sound/music/space.ogg',\
+	'sound/music/THUNDERDOME.ogg',\
+	'sound/music/b12_combined_start.ogg')
 	for(var/mob/new_player/M in mob_list)
 		if(M.client)	M.client.playtitlemusic()
 	do
diff --git a/sound/misc/TestLoop1.ogg b/sound/misc/TestLoop1.ogg
new file mode 100644
index 00000000000..5e1210bfd06
Binary files /dev/null and b/sound/misc/TestLoop1.ogg differ
diff --git a/sound/music/1.ogg b/sound/music/1.ogg
new file mode 100644
index 00000000000..5e15c8ccc01
Binary files /dev/null and b/sound/music/1.ogg differ
diff --git a/sound/music/THUNDERDOME.ogg b/sound/music/THUNDERDOME.ogg
new file mode 100644
index 00000000000..0a36b251b79
Binary files /dev/null and b/sound/music/THUNDERDOME.ogg differ
diff --git a/sound/ambience/b12_combined_start.ogg b/sound/music/b12_combined_start.ogg
similarity index 100%
rename from sound/ambience/b12_combined_start.ogg
rename to sound/music/b12_combined_start.ogg
diff --git a/sound/music/clouds.s3m b/sound/music/clouds.s3m
new file mode 100644
index 00000000000..06c88c3f43f
Binary files /dev/null and b/sound/music/clouds.s3m differ
diff --git a/music/music help.txt b/sound/music/music help.txt
similarity index 100%
rename from music/music help.txt
rename to sound/music/music help.txt
diff --git a/sound/music/space.ogg b/sound/music/space.ogg
new file mode 100644
index 00000000000..d3b934d521e
Binary files /dev/null and b/sound/music/space.ogg differ
diff --git a/sound/ambience/title1.ogg b/sound/music/title1.ogg
similarity index 100%
rename from sound/ambience/title1.ogg
rename to sound/music/title1.ogg
diff --git a/sound/ambience/title2.ogg b/sound/music/title2.ogg
similarity index 100%
rename from sound/ambience/title2.ogg
rename to sound/music/title2.ogg