diff --git a/.config/i3/config b/.config/i3/config
index 66c34e2..a9cb897 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -36,43 +36,6 @@ font pango:Iosevka Medium 10
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
-#########################
-# Various app shortcuts #
-#########################
-
-# Small (non-scaled) chrome
-bindsym $mod+shift+w exec chromium --force-device-scale-factor=1
-# Increase volume
-set $vol_sig_cmd pkill -RTMIN+10 i3blocks
-set $vol_down_cmd pamixer -d 5
-set $vol_up_cmd pamixer -i 5
-bindsym $mod+shift+d exec "$vol_up_cmd && $vol_sig_cmd"
-bindsym XF86AudioRaiseVolume exec "$vol_up_cmd && $vol_sig_cmd"
-# Decrease volume
-bindsym $mod+shift+s exec "$vol_down_cmd && $vol_sig_cmd"
-bindsym XF86AudioLowerVolume exec "$vol_down_cmd && $vol_sig_cmd"
-
-# Mute
-bindsym XF86AudioMute exec "pamixer -t && $vol_sig_cmd"
-
-# start a terminal
-#bindsym $mod+Return exec i3-sensible-terminal
-bindsym $mod+Return exec gnome-terminal
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# start dmenu (a program launcher)
-#bindsym $mod+d exec dmenu_run
-
-# start rofi (alt program launcher)
-bindsym $mod+d exec --no-startup-id "rofi -combi-modi window,drun -show combi -modi combi -config ~/.local/rofi/config"
-
-# Screen brightness
-set $brt_sig_cmd pkill -RTMIN+5 i3blocks
-bindsym XF86MonBrightnessUp exec "xbacklight -inc 10 && $brt_sig_cmd"
-bindsym XF86MonBrightnessDown exec "xbacklight -dec 10 && $brt_sig_cmd"
-
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
@@ -195,6 +158,9 @@ bindsym $mod+r mode "resize"
 bindsym $mod+o exec xrandr --output DP1 --auto --right-of eDP1 && $set_bg
 bindsym $mod+shift+o exec xrandr --output HDMI2 --auto --right-of eDP1 && $set_bg
 
+# Lock screen
+bindsym $mod+shift+b exec i3lock-wrapper
+
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
@@ -228,18 +194,21 @@ exec --no-startup-id xinput set-prop 12 296 1
 #exec --no-startup-id xinput set-prop 13 290 1
 exec --no-startup-id xinput set-prop 12 278 1
 
+# Autolock
+exec --no-startup-id xautolock -time 10 -locker 'i3lock-wrapper' &
+
 # Transparency
-exec compton -b
+exec --no-startup-id compton --unredir-if-possible -b
 
 # Redshift (hello sleep)
-exec redshift-gtk
+exec redshift-gtk &
 
 # Background
 set $set_bg feh --bg-fill ~/Pictures/wlp.jpg
-exec $set_bg
+exec --no-startup-id $set_bg &
 
 # Network manager applet
-exec nm-applet
+exec nm-applet &
 
 # Keyboard layout
 exec_always "setxkbmap -layout us,si -option 'grp:alt_shift_toggle'"
@@ -247,3 +216,44 @@ exec_always "setxkbmap -layout us,si -option 'grp:alt_shift_toggle'"
 # gaps between windows
 gaps inner 5
 gaps outer 1
+smart_gaps on
+smart_borders on
+for_window [class="^.*"] border pixel 1 # No titles
+
+#########################
+# Various app shortcuts #
+#########################
+
+# Small (non-scaled) chrome
+bindsym $mod+shift+w exec chromium --force-device-scale-factor=1
+
+# Increase volume
+set $vol_sig_cmd pkill -RTMIN+10 i3blocks
+set $vol_down_cmd pamixer -d 5
+set $vol_up_cmd pamixer -i 5
+bindsym $mod+shift+d exec "$vol_up_cmd && $vol_sig_cmd"
+bindsym XF86AudioRaiseVolume exec "$vol_up_cmd && $vol_sig_cmd"
+# Decrease volume
+bindsym $mod+shift+s exec "$vol_down_cmd && $vol_sig_cmd"
+bindsym XF86AudioLowerVolume exec "$vol_down_cmd && $vol_sig_cmd"
+
+# Mute
+bindsym XF86AudioMute exec "pamixer -t && $vol_sig_cmd"
+
+# start a terminal
+#bindsym $mod+Return exec i3-sensible-terminal
+bindsym $mod+Return exec gnome-terminal
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# start dmenu (a program launcher)
+#bindsym $mod+d exec dmenu_run
+
+# start rofi (alt program launcher)
+bindsym $mod+d exec --no-startup-id "rofi -combi-modi window,drun -show combi -modi combi -config ~/.local/rofi/config"
+
+# Screen brightness
+set $brt_sig_cmd pkill -RTMIN+5 i3blocks
+bindsym XF86MonBrightnessUp exec "xbacklight -inc 10 && $brt_sig_cmd"
+bindsym XF86MonBrightnessDown exec "xbacklight -dec 10 && $brt_sig_cmd"
diff --git a/.spacemacs b/.spacemacs
index e4a2c51..4022e7d 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -477,7 +477,7 @@ This function is called at the very end of Spacemacs initialization."
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (zenburn-theme spaceline-all-the-icons org-brain live-py-mode hy-mode auto-compile ac-php-core counsel helm helm-core magit with-editor yasnippet cider yapfify yaml-mode xcscope ws-butler winum which-key wgrep web-mode web-beautify volatile-highlights vimrc-mode vi-tilde-fringe uuidgen use-package unfill typit toml-mode toc-org tao-theme tagedit symon swiper suscolors-theme sudoku sublimity string-inflection sql-indent spaceline solarized-theme smex smeargle slim-mode scss-mode sayid sass-mode rvm rudel ruby-tools ruby-test-mode ruby-refactor rubocop rspec-mode robe restart-emacs request rbenv rake rainbow-delimiters racer queue pyvenv pytest pyenv-mode py-isort pug-mode popwin pippel pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode password-generator paradox pacmacs packed overseer orgit org-projectile org-present org-pomodoro org-download org-bullets open-junk-file neotree nameless mwim move-text mmm-mode minitest markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode linum-relative link-hint less-css-mode json-mode js2-refactor js-doc ivy-rich ivy-purpose ivy-hydra info+ indent-guide importmagic impatient-mode hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-make gruvbox-theme google-translate golden-ratio gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ ghub gh-md geiser fuzzy flycheck-rust flycheck-pos-tip flx-ido floobits fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-org evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu emmet-mode elisp-slime-nav editorconfig dumb-jump drupal-mode diminish diff-hl define-word dakrone-light-theme dactyl-mode cython-mode counsel-projectile counsel-css company-web company-tern company-statistics company-php company-auctex company-anaconda column-enforce-mode coffee-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode cider-eval-sexp-fu chruby cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auctex-latexmk all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ac-ispell 2048-game))))
+    (counsel swiper helm helm-core ivy zenburn-theme yapfify yaml-mode ws-butler winum which-key wgrep web-mode web-beautify volatile-highlights vimrc-mode vi-tilde-fringe uuidgen use-package unfill typit toml-mode toc-org tao-theme tagedit symon suscolors-theme sudoku sublimity string-inflection sql-indent spaceline-all-the-icons solarized-theme smex smeargle slim-mode scss-mode sayid sass-mode rvm rudel ruby-tools ruby-test-mode ruby-refactor rubocop rspec-mode robe restart-emacs request rbenv rake rainbow-delimiters racer pyvenv pytest pyenv-mode py-isort pug-mode popwin pippel pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode password-generator paradox pacmacs overseer orgit org-projectile org-present org-pomodoro org-download org-bullets org-brain open-junk-file neotree nameless mwim move-text mmm-mode minitest markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode live-py-mode linum-relative link-hint less-css-mode json-mode js2-refactor js-doc ivy-purpose ivy-hydra info+ indent-guide importmagic impatient-mode hy-mode hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-make gruvbox-theme google-translate golden-ratio gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy flycheck-rust flycheck-pos-tip flx-ido floobits fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-org evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu emmet-mode elisp-slime-nav editorconfig dumb-jump drupal-mode diminish diff-hl define-word dakrone-light-theme dactyl-mode cython-mode counsel-projectile counsel-css company-web company-tern company-statistics company-php company-auctex company-anaconda column-enforce-mode coffee-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode cider-eval-sexp-fu chruby cargo bundler browse-at-remote auto-yasnippet auto-highlight-symbol auto-compile auctex-latexmk all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ac-ispell 2048-game))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.