diff --git a/stumpwm/stumpwmrc b/stumpwm/stumpwmrc
index 38f6871..e732967 100644
--- a/stumpwm/stumpwmrc
+++ b/stumpwm/stumpwmrc
@@ -30,6 +30,11 @@
   (gnewbg "music")
   (gnewbg "winkel"))
 
+;; border width
+(setf *maxsize-border-width* 3)
+(setf *transient-border-width* 3)
+(setf *normal-border-width* 3)
+
 ;; border style
 (setf *window-border-style* :tight)
 (set-focus-color "#b00045")
@@ -83,7 +88,7 @@
 ;; Gaps
 (load-module "swm-gaps")
 (setf swm-gaps:*inner-gaps-size* 5
-      swm-gaps:*outer-gaps-size* 10
+      swm-gaps:*outer-gaps-size* 5
       swm-gaps:*head-gaps-size* 0)
 (when *initializing*
   (swm-gaps:toggle-gaps))
@@ -103,13 +108,12 @@
 (define-key *root-map* (kbd "m")  (concatenate 'string "exec " *music-player*))
 
 ;;; bind keys for changing workspace
-(define-key *top-map* (kbd "s-1") "gselect web")
-(define-key *top-map* (kbd "s-2") "gselect emacs")
-(define-key *top-map* (kbd "s-3") "gselect work")
-(define-key *top-map* (kbd "s-4") "gselect misc")
-(define-key *top-map* (kbd "s-9") "gselect music")
-(define-key *top-map* (kbd "s-0") "gselect winkel")
-(define-key *top-map* (kbd "s-p") "gother")
+(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 *top-map* (kbd "s-C-1") "gmove web")