diff --git a/xmonad.hs b/xmonad.hs
index 063685a..f4e2fd3 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -55,7 +55,7 @@ workspaceManageHook = composeAll [
     ,className =? "qtcreator" --> doShift "3:dev"
     ,className =? "KeePass2" --> doShift "9:div"
     ,className =? "Xmessage" --> doFloat
-    ,className =? "Clementine" --> doShift "8:media"
+    ,className =? "rhythmbox" --> doShift "8:media"
     ,className =? "vlc" --> doShift "8:media"
     ]
 
@@ -121,10 +121,10 @@ main = do
         -- volumedown button
         , ((0, 0x1008FF11), spawn "~/.xmonad/action-manager/command.sh - ~/.xmonad/actioncontrol")
         -- Media buttons
-        , ((0, 0x1008ff14), spawn "clementine --play-pause")
-        , ((0, 0x1008ff15), spawn "clementine --stop")
-        , ((0, 0x1008ff16), spawn "clementine --restart-or-previous")
-        , ((0, 0x1008ff17), spawn "clementine --next")
+        , ((0, 0x1008ff14), spawn "rhythmbox-client --play-pause")
+        , ((0, 0x1008ff15), spawn "rhythmbox-client --stop")
+        , ((0, 0x1008ff16), spawn "rhythmbox-client --restart-or-previous")
+        , ((0, 0x1008ff17), spawn "rhythmbox-client --next")
         -- Brightness buttons
         , ((0, 0x1008ff02), spawn "~/.xmonad/brightness-adjust +")
         , ((0, 0x1008ff03), spawn "~/.xmonad/brightness-adjust -")