diff --git a/config/stumpwm/config b/config/stumpwm/config
index 7db30de7..fb9cb6e4 100644
--- a/config/stumpwm/config
+++ b/config/stumpwm/config
@@ -17,7 +17,7 @@
   (message "Config reloaded"))
 (define-key *top-map* (kbd "s-r") "reload-dotfiles")
 
-(load (concat *config-dir* "/core/core.lisp"))
+;; (load (concat *config-dir* "/core/core.lisp"))
 
 
 (defun show-key-seq (key seq val)
@@ -25,10 +25,9 @@
 (add-hook *key-press-hook* 'show-key-seq)
 
 
-
 ;;; Config
 (setf *mouse-focus-policy* :click)
-(set-font "-CTDB-Fira Code-normal-normal-normal-*-12-*-*-*-m-0-iso10646-1")
+(set-font "-CTDB-Fira Sans-normal-normal-normal-*-12-*-*-*-m-0-iso10646-1")
 
 
 ;;; Keybinds
@@ -46,6 +45,9 @@
       (format nil "gmove ~D" i))))
 
 ;; Window management
+(define-key *top-map* (kbd "s-f") "float-this")
+(define-key *top-map* (kbd "s-F") "unfloat-this")
+
 (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")
@@ -56,16 +58,67 @@
 (define-key *top-map* (kbd "s-K") "move-window up")
 (define-key *top-map* (kbd "s-L") "move-window right")
 
-(define-key *top-map* (kbd "s-RET") "exec urxvt")
-(define-key *top-map* (kbd "s-SPC") "exec rofi-appmenu")
+(define-key *top-map* (kbd "s-RET") "exec xst")
+(define-key *top-map* (kbd "s-SPC") "exec rofi/appmenu")
+
+(define-key *top-map* (kbd "s-TAB")   "next-in-frame")
+(define-key *top-map* (kbd "s-ISO_Left_Tab") "prev-in-frame")
+
 (define-key *top-map* (kbd "s-`")   "exec scratch")
 
 
 (defvar *window-manipulation-map* (make-sparse-keymap))
 
+(defcommand kill-or-delete-window () ()
+            (and (delete-window)
+                 (remove-split)))
+
+(define-key *top-map* (kbd "s-q") "delete-window")
+(define-key *top-map* (kbd "s-Q") "kill-or-delete-window")
 (define-key *top-map* (kbd "s-w") *window-manipulation-map*)
 (let ((map *window-manipulation-map*))
   (define-key map (kbd "s-c") "remove-split")
-  (define-key map (kbd "s-d") "delete-window")
   (define-key map (kbd "s-s") "hsplit")
   (define-key map (kbd "s-v") "vsplit"))
+
+
+;;; Modeline
+(setf *bar-med-color* "^B^3")
+(setf *bar-hi-color* "^B^3")
+(setf *bar-crit-color* "^B^1")
+
+(setf *colors*
+      '("#101216"  ; fg
+        "#f9a03f"  ; orange
+        "#8BD49C"  ; green
+        "#8abeb7"  ; cyan
+        "#5EC4FF"  ; blue
+        "#cc6666"  ; red
+        "#E27E8D"  ; magenta
+        "#f0c674"  ; yellow
+        ))
+
+(update-color-map (current-screen))
+
+(setf *group-format* " %t ")
+(setf *window-format* "%m%s%20t ")
+(setf *mode-line-timeout* 1)
+
+(setf *time-modeline-string* "^B^3 %e %b %H:%M ^n")
+
+(set-focus-color (elt *colors* 6))
+(set-unfocus-color (elt *colors* 0))
+
+(setf *screen-mode-line-format*
+      (list "^B^3%g ^n^b %W ^>  "
+            "  %B  %d"
+            ))
+
+(setf *mode-line-border-width* 0)
+(setf *mode-line-pad-x* 0)
+(setf *mode-line-pad-y* 0)
+(setf *mode-line-background-color* (elt *colors* 0))
+(setf *mode-line-foreground-color* (elt *colors* 1))
+
+(unless (head-mode-line (current-head))
+  (toggle-mode-line (current-screen) (current-head)))