diff --git a/user/home.nix b/user/home.nix
index f40e59bc..928053c5 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -56,7 +56,7 @@
     # Media
     gimp-with-plugins
     krita
-    cmus
+    musikcube
     vlc
     mpv
     yt-dlp
diff --git a/user/wm/xmonad/xmonad.hs b/user/wm/xmonad/xmonad.hs
index ce86f09a..c9086342 100644
--- a/user/wm/xmonad/xmonad.hs
+++ b/user/wm/xmonad/xmonad.hs
@@ -94,7 +94,7 @@ myScratchPads =
     NS "btm" spawnBtm findBtm manageBtm,
     NS "geary" spawnGeary findGeary manageGeary,
     NS "helpmenu" spawnHelp findHelp manageHelp,
-    NS "cmus" spawnCmus findCmus manageCmus,
+    NS "musikcube" spawnMusikcube findMusikcube manageMusikcube,
     NS "cal" spawnCal findCal manageCal,
     NS "pavucontrol" spawnPavucontrol findPavucontrol managePavucontrol,
     NS "discord" spawnDiscord findDiscord manageDiscord
@@ -157,9 +157,9 @@ myScratchPads =
         w = 0.9
         t = 0.95 - h
         l = 0.95 - w
-    spawnCmus = myTerminal ++ " -o font.size=28 --title cmus-scratchpad -e cmus && cmus-remote -R && cmus-remote -S"
-    findCmus = title =? "cmus-scratchpad"
-    manageCmus = customFloating $ W.RationalRect l t w h
+    spawnMusikcube = myTerminal ++ " -o font.size=28 --title musikcube-scratchpad -e musikcube"
+    findMusikcube = title =? "musikcube-scratchpad"
+    manageMusikcube = customFloating $ W.RationalRect l t w h
       where
         h = 0.9
         w = 0.9
@@ -221,10 +221,10 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) =
       ((0, xF86XK_AudioMute), spawn "pamixer -t"),
 
       -- control music from kbd
-      ((0, xF86XK_AudioPlay), spawn "cmus-remote -u"),
-      ((0, xF86XK_AudioStop), spawn "cmus-remote -s"),
-      ((0, xF86XK_AudioNext), spawn "cmus-remote -n && ~/.local/bin/cmus-current-song-notify.sh"),
-      ((0, xF86XK_AudioPrev), spawn "cmus-remote -r && ~/.local/bin/cmus-current-song-notify.sh"),
+      --((0, xF86XK_AudioPlay), spawn "cmus-remote -u"),
+      --((0, xF86XK_AudioStop), spawn "cmus-remote -s"),
+      --((0, xF86XK_AudioNext), spawn "cmus-remote -n && ~/.local/bin/cmus-current-song-notify.sh"),
+      --((0, xF86XK_AudioPrev), spawn "cmus-remote -r && ~/.local/bin/cmus-current-song-notify.sh"),
 
       -- launch rofi
       ((modm, xK_semicolon), spawn ("rofi -show drun -show-icons")),
@@ -301,7 +301,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) =
       ((modm, xK_d), namedScratchpadAction myScratchPads "discord"),
       ((modm, xK_o), namedScratchpadAction myScratchPads "octave"),
       ((modm, xK_e), namedScratchpadAction myScratchPads "geary"),
-      ((modm, xK_n), namedScratchpadAction myScratchPads "cmus"),
+      ((modm, xK_n), namedScratchpadAction myScratchPads "musikcube"),
       ((modm, xK_c), namedScratchpadAction myScratchPads "cal"),
       ((modm, xK_y), namedScratchpadAction myScratchPads "pavucontrol"),
       ((modm, xK_slash), namedScratchpadAction myScratchPads "helpmenu")
diff --git a/user/wm/xmonad/xmonad.org b/user/wm/xmonad/xmonad.org
index bc20541f..fd879997 100644
--- a/user/wm/xmonad/xmonad.org
+++ b/user/wm/xmonad/xmonad.org
@@ -153,7 +153,7 @@ myScratchPads =
     NS "btm" spawnBtm findBtm manageBtm,
     NS "geary" spawnGeary findGeary manageGeary,
     NS "helpmenu" spawnHelp findHelp manageHelp,
-    NS "cmus" spawnCmus findCmus manageCmus,
+    NS "musikcube" spawnMusikcube findMusikcube manageMusikcube,
     NS "cal" spawnCal findCal manageCal,
     NS "pavucontrol" spawnPavucontrol findPavucontrol managePavucontrol,
     NS "discord" spawnDiscord findDiscord manageDiscord
@@ -216,9 +216,9 @@ myScratchPads =
         w = 0.9
         t = 0.95 - h
         l = 0.95 - w
-    spawnCmus = myTerminal ++ " -o font.size=28 --title cmus-scratchpad -e cmus && cmus-remote -R && cmus-remote -S"
-    findCmus = title =? "cmus-scratchpad"
-    manageCmus = customFloating $ W.RationalRect l t w h
+    spawnMusikcube = myTerminal ++ " -o font.size=28 --title musikcube-scratchpad -e musikcube"
+    findMusikcube = title =? "musikcube-scratchpad"
+    manageMusikcube = customFloating $ W.RationalRect l t w h
       where
         h = 0.9
         w = 0.9
@@ -302,10 +302,10 @@ These setup standard bindings for brightness and audio control from the keyboard
       ((0, xF86XK_AudioMute), spawn "pamixer -t"),
 
       -- control music from kbd
-      ((0, xF86XK_AudioPlay), spawn "cmus-remote -u"),
-      ((0, xF86XK_AudioStop), spawn "cmus-remote -s"),
-      ((0, xF86XK_AudioNext), spawn "cmus-remote -n && ~/.local/bin/cmus-current-song-notify.sh"),
-      ((0, xF86XK_AudioPrev), spawn "cmus-remote -r && ~/.local/bin/cmus-current-song-notify.sh"),
+      --((0, xF86XK_AudioPlay), spawn "cmus-remote -u"),
+      --((0, xF86XK_AudioStop), spawn "cmus-remote -s"),
+      --((0, xF86XK_AudioNext), spawn "cmus-remote -n && ~/.local/bin/cmus-current-song-notify.sh"),
+      --((0, xF86XK_AudioPrev), spawn "cmus-remote -r && ~/.local/bin/cmus-current-song-notify.sh"),
 
 #+END_SRC
 **** Launcher Keybinds
@@ -428,7 +428,7 @@ These are then bound:
       ((modm, xK_d), namedScratchpadAction myScratchPads "discord"),
       ((modm, xK_o), namedScratchpadAction myScratchPads "octave"),
       ((modm, xK_e), namedScratchpadAction myScratchPads "geary"),
-      ((modm, xK_n), namedScratchpadAction myScratchPads "cmus"),
+      ((modm, xK_n), namedScratchpadAction myScratchPads "musikcube"),
       ((modm, xK_c), namedScratchpadAction myScratchPads "cal"),
       ((modm, xK_y), namedScratchpadAction myScratchPads "pavucontrol"),
       ((modm, xK_slash), namedScratchpadAction myScratchPads "helpmenu")