diff --git a/app/src/main/java/org/toop/app/view/displays/SongDisplay.java b/app/src/main/java/org/toop/app/view/displays/SongDisplay.java
index 0c31455..09d3748 100644
--- a/app/src/main/java/org/toop/app/view/displays/SongDisplay.java
+++ b/app/src/main/java/org/toop/app/view/displays/SongDisplay.java
@@ -18,6 +18,7 @@ public class SongDisplay extends VBox {
     private final Text songTitle;
     private final ProgressBar progressBar;
     private final Text progressText;
+    private boolean paused = false;
 
     public SongDisplay() {
         new EventFlow()
@@ -26,7 +27,6 @@ public class SongDisplay extends VBox {
         setAlignment(Pos.CENTER);
         getStyleClass().add("song-display");
 
-        // TODO ADD GOOD SONG TITLES WITH ARTISTS DISPLAYED
         songTitle = new Text("song playing");
         songTitle.getStyleClass().add("song-title");
 
@@ -36,8 +36,6 @@ public class SongDisplay extends VBox {
         progressText = new Text("0:00/0:00");
         progressText.getStyleClass().add("progress-text");
 
-        // TODO ADD BETTER CSS FOR THE SKIPBUTTON WHERE ITS AT A NICER POSITION
-
         Button skipButton = new Button(">>");
         Button pauseButton = new Button("⏸");
         Button previousButton = new Button("<<");
@@ -48,20 +46,20 @@ public class SongDisplay extends VBox {
 
         skipButton.setOnAction( event -> {
             GlobalEventBus.post(new AudioEvents.SkipMusic());
+            paused = false;
+            pauseButton.setText(getPlayString(paused));
         });
 
         pauseButton.setOnAction(event -> {
             GlobalEventBus.post(new AudioEvents.PauseMusic());
-            if (pauseButton.getText().equals("⏸")) {
-                pauseButton.setText("▶");
-            }
-            else if (pauseButton.getText().equals("▶")) {
-                pauseButton.setText("⏸");
-            }
+            paused = !paused;
+            pauseButton.setText(getPlayString(paused));
         });
 
         previousButton.setOnAction( event -> {
             GlobalEventBus.post(new AudioEvents.PreviousMusic());
+            paused = false;
+            pauseButton.setText(getPlayString(paused));
         });
 
         HBox control = new HBox(10, previousButton, pauseButton, skipButton);
@@ -107,6 +105,15 @@ public class SongDisplay extends VBox {
         String time = positionMinutes + ":" + positionSecondsStr + " / " + durationMinutes + ":" + durationSecondsStr;
         return time;
     }
+
+    private String getPlayString(boolean paused) {
+        if (paused) {
+            return "▶";
+        }
+        else {
+            return "⏸";
+        }
+    }
 }
 
 
diff --git a/app/src/main/resources/assets/audio/music/formerseas.mp3 b/app/src/main/resources/assets/audio/music/DM DOKURO - Guardian of the Former Seas.mp3
similarity index 100%
rename from app/src/main/resources/assets/audio/music/formerseas.mp3
rename to app/src/main/resources/assets/audio/music/DM DOKURO - Guardian of the Former Seas.mp3
diff --git a/app/src/main/resources/assets/audio/music/Roar Of The Jungle Dragon - Terraria Calamity.mp3 b/app/src/main/resources/assets/audio/music/DM DOKURO - Roar of the Jungle Dragon.mp3
similarity index 100%
rename from app/src/main/resources/assets/audio/music/Roar Of The Jungle Dragon - Terraria Calamity.mp3
rename to app/src/main/resources/assets/audio/music/DM DOKURO - Roar of the Jungle Dragon.mp3
diff --git a/app/src/main/resources/assets/audio/music/MW Main Menu - some artist.mp3 b/app/src/main/resources/assets/audio/music/MW2 (2009) Multiplayer Theme.mp3
similarity index 100%
rename from app/src/main/resources/assets/audio/music/MW Main Menu - some artist.mp3
rename to app/src/main/resources/assets/audio/music/MW2 (2009) Multiplayer Theme.mp3
diff --git a/app/src/main/resources/assets/audio/music/main-game-theme-loop.mp3 b/app/src/main/resources/assets/audio/music/main-game-theme-loop.mp3
index 7105fde..e69de29 100644
Binary files a/app/src/main/resources/assets/audio/music/main-game-theme-loop.mp3 and b/app/src/main/resources/assets/audio/music/main-game-theme-loop.mp3 differ