diff --git a/bluetile.cabal b/bluetile.cabal
--- a/bluetile.cabal
+++ b/bluetile.cabal
@@ -1,12 +1,12 @@
 Name:                bluetile
-Version:             0.2
+Version:             0.3
 synopsis:            A modern tiling window manager with a gentle learning curve
 description:
   Bluetile is a tiling window manager for X based on xmonad. Windows are arranged
   automatically to tile the screen without gaps or overlap, maximising
   screen use. Bluetile's focus lies on making the tiling paradigm easily
-  accessible for users coming from traditional window managers by drawing
-  on known conventions and making all features available using the mouse.
+  accessible to users coming from traditional window managers by drawing
+  on known conventions and providing both mouse and keyboard access for all features.
   It also tries to be usable 'out of the box', making configuration unnecessary.
 category:            System
 License:             BSD3
@@ -29,8 +29,7 @@
   Main-is:           Main.hs
   Hs-Source-Dirs:    src
   Build-Depends:     base>=3, base<4, containers, process,
-                     xmonad-bluetilebranch>=0.8, xmonad-bluetilebranch<0.9,
-                     xmonad-contrib-bluetilebranch>=0.8, xmonad-contrib-bluetilebranch<0.9
+                     xmonad-bluetilebranch>=0.8.1.3, xmonad-contrib-bluetilebranch>=0.8.1.3
   Ghc-Options:       -Wall
 
 Executable bluetiledock
diff --git a/src/Config.hs b/src/Config.hs
--- a/src/Config.hs
+++ b/src/Config.hs
@@ -73,8 +73,10 @@
     , ((modMask' .|. shiftMask, xK_Tab   ), focusUp) -- %! Move focus to the previous window
     , ((modMask',               xK_j     ), focusDown) -- %! Move focus to the next window
     , ((modMask',               xK_k     ), focusUp) -- %! Move focus to the previous window
+    , ((modMask',               xK_space ), focusMaster) -- %! Move focus to the master window
 
     -- modifying the window order
+    , ((modMask' .|. shiftMask, xK_space ), windows W.swapMaster) -- %! Swap the focused window and the master window
     , ((modMask' .|. shiftMask, xK_j     ), windows W.swapDown  ) -- %! Swap the focused window with the next window
     , ((modMask' .|. shiftMask, xK_k     ), windows W.swapUp    ) -- %! Swap the focused window with the previous window