diff --git a/xmonad.hs b/xmonad.hs
index 3dd203a..7bcc4eb 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -25,8 +25,8 @@ import qualified Data.List as L
 baseConfig = desktopConfig
     { modMask = mod5Mask -- AltGr
     , terminal = "mate-terminal.wrapper"
-    , workspaces = ["1:web", "2:com", "3:dev"] ++ map show [4..8] ++ ["9:div"]
-    , layoutHook = smartBorders $ fullscreenFull $ avoidStruts $ boringWindows $ minimize $ maximize $ onWorkspaces ["2:com", "9:div"] simpleTabbed $ (layoutHook desktopConfig ||| simpleTabbed )
+    , workspaces = ["1:web", "2:com", "3:dev"] ++ map show [4..7] ++ ["8:media", "9:div"]
+    , layoutHook = smartBorders $ fullscreenFull $ avoidStruts $ boringWindows $ minimize $ maximize $ onWorkspace "8:media" Full $ onWorkspaces ["2:com", "9:div"] simpleTabbed $ (layoutHook desktopConfig ||| simpleTabbed )
 	, handleEventHook = handleEventHook desktopConfig <+> fullscreenEventHook
     }
 	`removeKeys`
@@ -50,13 +50,14 @@ workspaceManageHook = composeAll [
     ,className =? "jetbrains-pycharm" --> doShift "3:dev"
     ,className =? "KeePass2" --> doShift "9:div"
     ,className =? "Xmessage" --> doFloat
+    ,className =? "Clementine" --> doShift "8:media"
     ]
 
 
 main = do
     xmobar_proc <- spawnPipe "xmobar"
     xmonad $ baseConfig
-        { manageHook = (scratchpadManageHook $ W.RationalRect 0.0 0.0 1.0 0.5) <+> workspaceManageHook <+> fullscreenManageHook <+> manageDocks <+> manageHook baseConfig
+        { manageHook = (scratchpadManageHook $ W.RationalRect 0.0 0.0 1.0 0.5) <+> workspaceManageHook <+> fullscreenManageHook <+> manageDocks
 		, logHook =  dynamicLogWithPP xmobarPP
 						{ ppOutput = hPutStrLn xmobar_proc
 						, ppTitle = xmobarColor "green" "" . shorten 50
@@ -99,6 +100,11 @@ main = do
 		, ((0, 0x1008FF13), spawn "~/.xmonad/xmonad-pulsevolume/pulse-volume.sh increase")
 		-- volumedown button
 		, ((0, 0x1008FF11), spawn "~/.xmonad/xmonad-pulsevolume/pulse-volume.sh decrease")
+        -- 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")
         ]
 		`additionalKeys`
 		--