diff --git a/.gitignore b/.gitignore
index 94e3e959..2e3c178e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ server
 .ldtk-backups
 assets/data/config/ng/ng-secrets.json
 .vscode
+/scripts/openssl
diff --git a/assets/music/christmasjoy_realtin3sn.ogg b/assets/music/christmasjoy-realtin3sn.ogg
similarity index 100%
rename from assets/music/christmasjoy_realtin3sn.ogg
rename to assets/music/christmasjoy-realtin3sn.ogg
diff --git a/assets/music/christmasohyeah_stixdevs.ogg b/assets/music/christmasohyeah-stixdevs.ogg
similarity index 100%
rename from assets/music/christmasohyeah_stixdevs.ogg
rename to assets/music/christmasohyeah-stixdevs.ogg
diff --git a/assets/music/rudolftehrednosereindeer_littlbox.mp3 b/assets/music/rudolftehrednosereindeer_littlbox.mp3
deleted file mode 100644
index d230e626..00000000
Binary files a/assets/music/rudolftehrednosereindeer_littlbox.mp3 and /dev/null differ
diff --git a/assets/music/sadgamertime_ninjamuffin99.mp3 b/assets/music/sadgamertime_ninjamuffin99.mp3
deleted file mode 100644
index 362b5442..00000000
Binary files a/assets/music/sadgamertime_ninjamuffin99.mp3 and /dev/null differ
diff --git a/source/SoundPlayer.hx b/source/SoundPlayer.hx
index eb81cbe9..efc01a87 100644
--- a/source/SoundPlayer.hx
+++ b/source/SoundPlayer.hx
@@ -5,7 +5,7 @@ import flixel.system.FlxAssets.FlxSoundAsset;
 class SoundPlayer
 {
 	public static var MUSIC_ALREADY_PLAYING:String = "";
-	public static var MUSIC_VOLUME:Float = .6;
+	public static var MUSIC_VOLUME:Float = 1;
 	public static var SOUND_VOLUME:Float = 1;
 
 	static var ran:FlxRandom;
@@ -19,6 +19,13 @@ class SoundPlayer
 		return return_sound;
 	}
 
+	public static function music(music_asset:String, vol:Float = 1)
+	{
+		music_asset = music_asset.replace(".ogg", "");
+		FlxG.sound.playMusic(Paths.get('${music_asset}.ogg'), MUSIC_VOLUME * vol);
+		return FlxG.sound.music;
+	}
+
 	static var slots:Array<Array<String>> = [];
 
 	static var alt_sounds:Map<String, Array<String>> = [];
diff --git a/source/net/tankmas/TankmasClient.hx b/source/net/tankmas/TankmasClient.hx
index b15cc9b4..6a5e88e3 100644
--- a/source/net/tankmas/TankmasClient.hx
+++ b/source/net/tankmas/TankmasClient.hx
@@ -3,7 +3,6 @@ package net.tankmas;
 import net.core.Client;
 import net.tankmas.NetDefs;
 
-
 class TankmasClient
 {
 	static var address:String = #if test_local 'http://127.0.0.1:5000' #else "http://78.108.218.30:25567" #end;
@@ -21,6 +20,7 @@ class TankmasClient
 
 		Client.post(url, user, on_complete);
 	}
+
 	public static function get_events(room_id:String, ?on_complete:Dynamic->Void)
 	{
 		var url:String = '$address/rooms/$room_id/events/get';
@@ -34,4 +34,4 @@ class TankmasClient
 
 		Client.post(url, event, on_complete);
 	}
-}
\ No newline at end of file
+}
diff --git a/source/states/BaseState.hx b/source/states/BaseState.hx
index b392788b..482d6dd0 100644
--- a/source/states/BaseState.hx
+++ b/source/states/BaseState.hx
@@ -27,8 +27,12 @@ class BaseState extends FlxState
 			FlxG.game.stage.quality = openfl.display.StageQuality.LOW;
 			// FlxG.stage.window.borderless = true;
 			FIRST_RUN = false;
-			//radio = new RadioManager();
-			FlxG.sound.playMusic(Paths.get('christmasohyeah_stixdevs.ogg'));
+
+			#if !no_radio
+			radio = new RadioManager();
+			#end
+
+			SoundPlayer.music(Paths.get('christmasohyeah-stixdevs.ogg'));
 			SaveManager.init();
 		}
 		else