diff --git a/src/xmonad.hs b/src/xmonad.hs
index 5f4290f..79164be 100644
--- a/src/xmonad.hs
+++ b/src/xmonad.hs
@@ -60,7 +60,6 @@ myNormalBorderColor  = "#32302f"
 myFocusedBorderColor = "#32302f"
 myWorkspaces         = ["code", "chat", "web", "games", "misc"]
 myLauncher           = "dmenu_run -fn 'Fisa Code-10'"
-myFileManager        = "thunar"
 myScrot              = "scrot -s '%Y%m%d_%H%M%S.png' -e 'mv $f ~/Pictures/scrots/'"
 volumeDown           = "pactl set-sink-volume @DEFAULT_SINK@ -10%"
 volumeUp             = "pactl set-sink-volume @DEFAULT_SINK@ +10%"
@@ -75,23 +74,22 @@ myKeymap =
     -- LeaderKey
     --
 
+    -- enable modal modes
+    [ ("M-a e", setMode "edit")
+
     -- spawning programs
-    [ ("M-a <Return>", spawn myTerminal   )
-    , ("M-a s d"     , spawn myLauncher   )
-    , ("M-a s f"     , spawn myFileManager)
-    , ("M-a s s"     , spawn myScrot      )
+    , ("M-a n", spawn myTerminal   )
+    , ("M-a d", spawn myLauncher   )
+    , ("M-a s", spawn myScrot      )
 
     -- quit window
     , ("M-a q", kill)
 
-    -- focus master window
-    , ("M-a <Backspace>", windows W.focusMaster)
-
     -- toggling layouts
-    , ("M-a j t", sendMessage $ JumpToLayout "dynamic tiling"        )
-    , ("M-a j b", sendMessage $ JumpToLayout "binary space partition")
-    , ("M-a j m", sendMessage $ JumpToLayout "maximised"             )
-    , ("M-a j f", sendMessage $ JumpToLayout "fullscreen"            )
+    , ("M-a t", sendMessage $ JumpToLayout "dynamic tiling"        )
+    , ("M-a b", sendMessage $ JumpToLayout "binary space partition")
+    , ("M-a m", sendMessage $ JumpToLayout "maximised"             )
+    , ("M-a f", sendMessage $ JumpToLayout "fullscreen"            )
 
 
     --
@@ -132,9 +130,6 @@ myKeymap =
     , ("M-S-4", windows $ W.shift "games")
     , ("M-S-5", windows $ W.shift "misc" )
 
-    -- enable edit mode
-    , ("M-a m e", setMode "edit")
-
 
     --
     -- Multimedia