diff --git a/assets/preload/data/dad battle/0.offset b/assets/preload/data/dad-battle/0.offset
similarity index 100%
rename from assets/preload/data/dad battle/0.offset
rename to assets/preload/data/dad-battle/0.offset
diff --git a/assets/preload/data/dad battle/dad battle-easy.json b/assets/preload/data/dad-battle/dad-battle-easy.json
similarity index 100%
rename from assets/preload/data/dad battle/dad battle-easy.json
rename to assets/preload/data/dad-battle/dad-battle-easy.json
diff --git a/assets/preload/data/dad battle/dad battle-hard.json b/assets/preload/data/dad-battle/dad-battle-hard.json
similarity index 100%
rename from assets/preload/data/dad battle/dad battle-hard.json
rename to assets/preload/data/dad-battle/dad-battle-hard.json
diff --git a/assets/preload/data/dad battle/dad battle.json b/assets/preload/data/dad-battle/dad-battle.json
similarity index 100%
rename from assets/preload/data/dad battle/dad battle.json
rename to assets/preload/data/dad-battle/dad-battle.json
diff --git a/assets/preload/data/philly nice/0.offset b/assets/preload/data/philly-nice/0.offset
similarity index 100%
rename from assets/preload/data/philly nice/0.offset
rename to assets/preload/data/philly-nice/0.offset
diff --git a/assets/preload/data/philly nice/philly nice-easy.json b/assets/preload/data/philly-nice/philly-nice-easy.json
similarity index 100%
rename from assets/preload/data/philly nice/philly nice-easy.json
rename to assets/preload/data/philly-nice/philly-nice-easy.json
diff --git a/assets/preload/data/philly nice/philly nice-hard.json b/assets/preload/data/philly-nice/philly-nice-hard.json
similarity index 100%
rename from assets/preload/data/philly nice/philly nice-hard.json
rename to assets/preload/data/philly-nice/philly-nice-hard.json
diff --git a/assets/preload/data/philly nice/philly nice.json b/assets/preload/data/philly-nice/philly-nice.json
similarity index 100%
rename from assets/preload/data/philly nice/philly nice.json
rename to assets/preload/data/philly-nice/philly-nice.json
diff --git a/assets/preload/data/satin panties/0.offset b/assets/preload/data/satin-panties/0.offset
similarity index 100%
rename from assets/preload/data/satin panties/0.offset
rename to assets/preload/data/satin-panties/0.offset
diff --git a/assets/preload/data/satin panties/satin panties-easy.json b/assets/preload/data/satin-panties/satin-panties-easy.json
similarity index 100%
rename from assets/preload/data/satin panties/satin panties-easy.json
rename to assets/preload/data/satin-panties/satin-panties-easy.json
diff --git a/assets/preload/data/satin panties/satin panties-hard.json b/assets/preload/data/satin-panties/satin-panties-hard.json
similarity index 100%
rename from assets/preload/data/satin panties/satin panties-hard.json
rename to assets/preload/data/satin-panties/satin-panties-hard.json
diff --git a/assets/preload/data/satin panties/satin panties.json b/assets/preload/data/satin-panties/satin-panties.json
similarity index 100%
rename from assets/preload/data/satin panties/satin panties.json
rename to assets/preload/data/satin-panties/satin-panties.json
diff --git a/assets/preload/data/winter horrorland/0.offset b/assets/preload/data/winter-horrorland/0.offset
similarity index 100%
rename from assets/preload/data/winter horrorland/0.offset
rename to assets/preload/data/winter-horrorland/0.offset
diff --git a/assets/preload/data/winter horrorland/winter horrorland-easy.json b/assets/preload/data/winter-horrorland/winter-horrorland-easy.json
similarity index 100%
rename from assets/preload/data/winter horrorland/winter horrorland-easy.json
rename to assets/preload/data/winter-horrorland/winter-horrorland-easy.json
diff --git a/assets/preload/data/winter horrorland/winter horrorland-hard.json b/assets/preload/data/winter-horrorland/winter-horrorland-hard.json
similarity index 100%
rename from assets/preload/data/winter horrorland/winter horrorland-hard.json
rename to assets/preload/data/winter-horrorland/winter-horrorland-hard.json
diff --git a/assets/preload/data/winter horrorland/winter horrorland.json b/assets/preload/data/winter-horrorland/winter-horrorland.json
similarity index 100%
rename from assets/preload/data/winter horrorland/winter horrorland.json
rename to assets/preload/data/winter-horrorland/winter-horrorland.json
diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
index 97366d3..f5ee518 100644
--- a/source/FreeplayState.hx
+++ b/source/FreeplayState.hx
@@ -202,11 +202,11 @@ class FreeplayState extends MusicBeatState
 
 		if (accepted)
 		{
-			var poop:String = Highscore.formatSong(songs[curSelected].songName.toLowerCase(), curDifficulty);
+			var poop:String = Highscore.formatSong(StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase(), curDifficulty);
 
 			trace(poop);
 
-			PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].songName.toLowerCase());
+			PlayState.SONG = Song.loadFromJson(poop, StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase());
 			PlayState.isStoryMode = false;
 			PlayState.storyDifficulty = curDifficulty;
 			PlayState.storyWeek = songs[curSelected].week;
diff --git a/source/GameplayCustomizeState.hx b/source/GameplayCustomizeState.hx
index 929d509..26407b5 100644
--- a/source/GameplayCustomizeState.hx
+++ b/source/GameplayCustomizeState.hx
@@ -58,7 +58,6 @@ class GameplayCustomizeState extends MusicBeatState
 		var camFollow = new FlxObject(0, 0, 1, 1);
 
 		dad = new Character(100, 100, 'dad');
-        bf = new Boyfriend(770, 450, 'bf');
 
         bf = new Boyfriend(770, 450, 'bf');
 
diff --git a/source/Paths.hx b/source/Paths.hx
index 70f0020..27cd3e4 100644
--- a/source/Paths.hx
+++ b/source/Paths.hx
@@ -97,15 +97,13 @@ class Paths
 
 	inline static public function voices(song:String)
 	{
-		var r = ~/\s+/g;
-		r.replace(song,'-');
+		song = StringTools.replace(song," ", "-");
 		return 'songs:assets/songs/${song.toLowerCase()}/Voices.$SOUND_EXT';
 	}
 
 	inline static public function inst(song:String)
 	{
-		var r = ~/\s+/g;
-		r.replace(song,'-');
+		song = StringTools.replace(song," ", "-");
 		return 'songs:assets/songs/${song.toLowerCase()}/Inst.$SOUND_EXT';
 	}
 
diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx
index 9dbafc8..501cf2b 100644
--- a/source/StoryMenuState.hx
+++ b/source/StoryMenuState.hx
@@ -297,7 +297,7 @@ class StoryMenuState extends MusicBeatState
 
 			PlayState.storyDifficulty = curDifficulty;
 
-			PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + diffic, PlayState.storyPlaylist[0].toLowerCase());
+			PlayState.SONG = Song.loadFromJson(StringTools.replace(PlayState.storyPlaylist[0]," ", "-").toLowerCase() + diffic, StringTools.replace(PlayState.storyPlaylist[0]," ", "-").toLowerCase());
 			PlayState.storyWeek = curWeek;
 			PlayState.campaignScore = 0;
 			new FlxTimer().start(1, function(tmr:FlxTimer)
diff --git a/version.downloadMe b/version.downloadMe
index add4405..65f6485 100644
--- a/version.downloadMe
+++ b/version.downloadMe
@@ -1,4 +1,5 @@
-1.5;
+1.5.1;
+- 1.5.1: Bug Fixes
 - Added toggle for ghost tapping
 - Officially support macOS (and add macOS requirements to docs)
 - Autoplay