diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc
index 27022fa..b69ef39 100644
--- a/stumpwm/stumpwmrc
+++ b/stumpwm/stumpwmrc
@@ -49,10 +49,10 @@
 (gravity :center)
 
 ;; input bar position
-(setf *input-window-gravity* :bottom)
+(setf *input-window-gravity* :center)
 
 ;; message bar position
-(setf *message-window-gravity* :bottom)
+(setf *message-window-gravity* :center)
 
 ;; message timeout
 (setf *timeout-wait* 3)
@@ -78,13 +78,20 @@
 ;; mode-line style
 (setf *mode-line-background-color* "#333333"
       *mode-line-foreground-color* "#cccccc"
-      *mode-line-border-color* "#b00045"
       *mode-line-timeout* 5
-      *mode-line-border-width* 3
+      *mode-line-border-width* 0
       *mode-line-pad-x* 3
       *mode-line-pad-y* 3
       *screen-mode-line-format* (list "[" '(:eval (RUN-SHELL-COMMAND "date '+%F %H:%M'|tr -d [:cntrl:]" T)) "] [%n]  %w ^> [%B] [marcel@%h] %T"))
 
+;; Gaps
+(load-module "swm-gaps")
+(setf swm-gaps:*inner-gaps-size* 5
+      swm-gaps:*outer-gaps-size* 5
+      swm-gaps:*head-gaps-size* 0)
+(when *initializing*
+  (swm-gaps:toggle-gaps))
+
 ;; customize texts
 (setf *window-format* "^B %n ^b %20t "
       *group-format* "%t")
@@ -100,20 +107,32 @@
 (define-key *root-map* (kbd "m")  (concatenate 'string "exec " *music-player*))
 
 ;;; bind keys for changing workspace
-(define-key *root-map* (kbd "C-1") "change-workspace web")
-(define-key *root-map* (kbd "C-2") "change-workspace emacs")
-(define-key *root-map* (kbd "C-3") "change-workspace work")
-(define-key *root-map* (kbd "C-4") "change-workspace misc")
-(define-key *root-map* (kbd "C-9") "change-workspace music")
-(define-key *root-map* (kbd "C-0") "change-workspace winkel")
+(define-key *top-map* (kbd "s-1") "change-workspace web")
+(define-key *top-map* (kbd "s-2") "change-workspace emacs")
+(define-key *top-map* (kbd "s-3") "change-workspace work")
+(define-key *top-map* (kbd "s-4") "change-workspace misc")
+(define-key *top-map* (kbd "s-9") "change-workspace music")
+(define-key *top-map* (kbd "s-0") "change-workspace winkel")
 
 ;; bind keys for moving the current window to another workspace
-(define-key *root-map* (kbd "M-1") "gmove web")
-(define-key *root-map* (kbd "M-2") "gmove emacs")
-(define-key *root-map* (kbd "M-3") "gmove work")
-(define-key *root-map* (kbd "M-4") "gmove misc")
-(define-key *root-map* (kbd "M-9") "gmove music")
-(define-key *root-map* (kbd "M-0") "gmove winkel")
+(define-key *top-map* (kbd "s-C-1") "gmove web")
+(define-key *top-map* (kbd "s-C-2") "gmove emacs")
+(define-key *top-map* (kbd "s-C-3") "gmove work")
+(define-key *top-map* (kbd "s-C-4") "gmove misc")
+(define-key *top-map* (kbd "s-C-9") "gmove music")
+(define-key *top-map* (kbd "s-C-0") "gmove winkel")
+
+;; bind keys for focus changing
+(define-key *top-map* (kbd "s-h") "move-focus left")
+(define-key *top-map* (kbd "s-j") "move-focus down")
+(define-key *top-map* (kbd "s-k") "move-focus up")
+(define-key *top-map* (kbd "s-l") "move-focus right")
+
+;; bind keys for window moving
+(define-key *top-map* (kbd "s-C-h") "move-window left")
+(define-key *top-map* (kbd "s-C-j") "move-window down")
+(define-key *top-map* (kbd "s-C-k") "move-window up")
+(define-key *top-map* (kbd "s-C-l") "move-window right")
 
 ;;; mode-line key
 (define-key *root-map* (kbd "Menu") "mode-line")
@@ -293,7 +312,7 @@
 (defmacro make-web-jump (name prefix)
   `(defcommand ,(intern name) (search) ((:rest ,(concatenate 'string name " search: ")))
     (substitute #\+ #\Space search)
-    (run-shell-command (concatenate 'string *www-browser* " " ,prefix search))))
+    (run-shell-command (concatenate 'string *web-browser* " " ,prefix search))))
 
 (make-web-jump "google" "http://www.google.com/search?q=")
 (make-web-jump "googlede" "http://www.google.de/search?q=")