diff --git a/homedir/.config/bspwm/bspwmrc b/homedir/.config/bspwm/bspwmrc
index 8d6f8c6..4f0c428 100755
--- a/homedir/.config/bspwm/bspwmrc
+++ b/homedir/.config/bspwm/bspwmrc
@@ -12,7 +12,7 @@ xsetroot -cursor_name left_ptr
 
 # Global config
 bspc config focused_sticky_border_color     "#030061"
-bspc config focused_border_color            "#467EC2"
+bspc config focused_border_color            "#67748F"
 bspc config normal_border_color             "#1f1f1f"
 bspc config urgent_border_color             "#f9f9f9"
 bspc config window_gap                      "9"
@@ -41,10 +41,11 @@ done
 while read -r rule _; do bspc rule -r "$rule"; done < <(bspc rule -l)
 
 # Now add the rules
-bspc rule -a Steam state=floating desktop=^8
-bspc rule -a Firefox:Navigator state=tiled desktop=^2
-bspc rule -a \*:Hearthstone.exe desktop=^5
-bspc rule -a \* state=floating
+bspc rule -a 'Steam'              state=floating desktop=^8
+bspc rule -a 'Firefox:Navigator'  state=tiled desktop=^2
+bspc rule -a '*:Hearthstone.exe'  desktop=^5
+bspc rule -a '*:Arma 3'           state=fullscreen desktop=^5
+bspc rule -a '*'                  state=floating
 
 # start some services
 services=( sxhkd dunst ssh-agent )
diff --git a/homedir/.config/bspwm/sxhkdrc b/homedir/.config/bspwm/sxhkdrc
index 1a3ba2b..1f8fe81 100644
--- a/homedir/.config/bspwm/sxhkdrc
+++ b/homedir/.config/bspwm/sxhkdrc
@@ -3,23 +3,20 @@
 #
 
 # general
-super + w; {q,c,k}
-	bspc node -{c,c,k}
-
-super + w; {n,p}
-	bspc node -f {next,prev}.local
+super + w; {q,k}
+	bspc node -{c,k}
 
 super + w; m; {t,f,T,F}
 	bspc node -t {tiled,floating,pseudo_tiled,fullscreen}
 
-super + w; d; {0-9,h}
-	bspc node -d {0-9,h}
+super + w; d; {0-9,h,p}
+	bspc node -d {0-9,h,p}
 
 super + w; s; {Left,Up,Right,Down}
 	bspc node --presel-dir '~'{west,north,east,south}
 
-super + w; {0-9,h}
-	bspc desktop -f {0-9,h}
+super + w; {0-9,h,p}
+	bspc desktop -f {0-9,h,p}
 
 super + w; space
 	bspc desktop -l next
@@ -27,9 +24,21 @@ super + w; space
 super + w; x
 	terminal
 
+super + w; b
+	bspc node -s biggest.local
+
+super + w; Return
+	bspc node @focused:/ -R 90
+
+super + w; w
+	ssm chameleon reload
+
+super + w; c
+	win-hd-center 1280x720
+
 # Locker
 super + l; l
-	ssm lockd lock
+	ssm lockd start_or_lock
 
 super + l; {u,s}
 	ssm lockd stop
@@ -49,11 +58,11 @@ super + {j,k}
 
 # mpd
 super + m; {a,s,n,p}
-	mpc {play,stop,next,prev}
+	playerctl -p tuijam {play-pause,stop,next,prev}
 
 # Sound
 super + {comma,period}
-   amixer -c 0 set PCM 2dB{-,+}
+   amixer -c 0 set PCM 5%{-,+}
 
 # Fucking Firefox man
 control + q
diff --git a/homedir/.config/dunst/dunstrc b/homedir/.config/dunst/dunstrc
index 38b92d0..300f949 100644
--- a/homedir/.config/dunst/dunstrc
+++ b/homedir/.config/dunst/dunstrc
@@ -1,5 +1,5 @@
 [global]
-    font = xos4 Terminus 12
+    font = Terminus 12
     
     # Allow a small subset of html markup:
     #   <b>bold</b>
diff --git a/homedir/.config/moltenbar/rc.yaml b/homedir/.config/moltenbar/rc.yaml
index 95f2016..6067077 100644
--- a/homedir/.config/moltenbar/rc.yaml
+++ b/homedir/.config/moltenbar/rc.yaml
@@ -1,74 +1,65 @@
 # vim: ft=yaml sw=2 et
 
-#geometry: '1262x14+9+9'
-height: 14
-gap: 9
-fontspec: '-*-terminesspowerline-medium-*-normal-*-14-*-*-*-*-*-iso10646-*'
-window_name: 'moltenbar'
-active_areas: '128'
-modules:
-  - bspwm_pager
-  - date
-  - bspwm_taskbar
-  - load_average
-  - network
-  - memory
-format: "<%= @panel_data['bspwm_pager'] %><%= @panel_data['bspwm_taskbar'] %>%{r}%{F<%= @config['colours']['bg_focused'] %>} %{F-}%{B<%= @config['colours']['bg_focused'] %>}  LA: <%= @panel_data['load_average'] %>  Mem (used): <%= @panel_data['memory'] %>%  Internet: <%= @panel_data['network'] %>  Warp: <%= @panel_data['warp'] %>   <%= @panel_data['date'] %>  %{B-}"
-colours:
-  fg: '#f9f9f9'
-  fg_focused: '#f9f9f9'
-  bg: '#001f1f1f'
-  bg_focused: '#467EC2'
-  mon_focused: '#46C252'
+panels:
+  main:
+    #geometry: '1262x14+9+9'
+    height: 14
+    gap: 9
+    fontspec: '-*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*'
+    window_name: 'moltenbar'
+    active_areas: '128'
+    modules:
+      pager: bspwm_pager
+      taskbar: bspwm_taskbar
+      date: date
+      la: load_average
+      memory: memory
+      playing: playing
+      www: network
+      xnt: network
+      warp: network
+    format: "@{pager}%{FC{bg}}%{BC{bg_focused}}%{F-}  @{taskbar}%{FC{bg_focused}}  %{B-} %{r} %{FC{bg_focused}} %{F-}%{BC{bg_focused}} d( %{F#E87C00}@{playing}%{F-} )b | LA: @{la} | Mem: @{memory}%% | Network: @{www} @{warp} @{xnt} | @{date}  %{B-}"
+    colours:
+      # #1D2129
+      fg: '#f9f9f9'
+      fg_focused: '#f9f9f9'
+      bg: '#001f1f1f'
+      bg_focused: '#67748F'
+      mon_focused: '#46C252'
+      ok_colour: "#17D127"
+      warn_colour: "#CAD117"
+      crit_colour: "#D15417"
 
-# Module settings
-mod:
-  bspwm_pager:
-    colour_focused: '#f9f9f9'
-    show_empty_desktops: false
-    show_single_monitor: false
-    #monitors:
-    #  - "main"
-    blacklist:
-      -h
-  bspwm_taskbar:
-    begin: "%{F<%= @config['colours']['bg'] %>}%{B<%= @config['colours']['bg_focused'] %>}%{F-}  "
-    end: "%{F<%= @config['colours']['bg_focused'] %>}  %{B-} "
-  date:
-    format: '%A, %Y.%m.%d %H:%M:%S'
-  load_average:
-    warn_value: 3
-    crit_value: 4
-    ok_colour: "#00FF00"
-    warn_colour: "#FFFF00"
-    crit_colour: "#FF0000"
-  network:
-    hosts:
-      - de-ber-as20647.anchors.atlas.ripe.net
-      - nl-ams-as1101.anchors.atlas.ripe.net
-      - uk-boh-as196745.anchors.atlas.ripe.net
-    ok_colour: "#00FF00"
-    warn_colour: "#FFFF00"
-    crit_colour: "#FF0000"
-  warp:
-    hosts:
-      - malganis.priv
-      - spike.priv
-      - builder.virt
-    ok_colour: "#00FF00"
-    warn_colour: "#FFFF00"
-    crit_colour: "#FF0000"
-  newmail:
-    ok_message: "*"
-    ok_colour: "#00FF00"
-    crit_message: "***"
-    crit_colour: "#FF0000"
-    maildirs:
-      - /home/fbt/sync/maildir/.ops
-      - /home/fbt/sync/maildir/.inbox
-  memory:
-    ok_colour: "#00FF00"
-    warn_colour: "#FFFF00"
-    crit_colour: "#FF0000"
-    warn_value: 75
-    crit_value: 90
+    # Module settings
+    mod:
+      pager:
+        show_empty_desktops: false
+        show_single_monitor: false
+        #monitors:
+        #  - "main"
+        blacklist:
+          -0
+          -p
+      date:
+        format: '%A, %Y.%m.%d %H:%M:%S'
+      la:
+        warn_value: 3
+        crit_value: 4
+      www:
+        hosts:
+          - de-ber-as20647.anchors.atlas.ripe.net
+          - nl-ams-as1101.anchors.atlas.ripe.net
+          - ru-mow-as15835.anchors.atlas.ripe.net
+      warp:
+        hosts:
+          - malganis.priv
+          - spike.priv
+          - builder.virt
+      xnt:
+        hosts:
+          - emerald.zorg.sh
+          - brilliant.zorg.sh
+          - ui-server17.prod.zorg.sh
+      memory:
+        warn_value: 75
+        crit_value: 90
diff --git a/homedir/.config/ssm/services/compton b/homedir/.config/ssm/services/compton
index cf2dc5f..06e165e 100755
--- a/homedir/.config/ssm/services/compton
+++ b/homedir/.config/ssm/services/compton
@@ -1,4 +1,3 @@
-#!/usr/bin/env watchman
+#!/usr/bin/env ssm
 
-service_command='/bin/compton'
-service_args=( --vsync opengl -f -D 3 -e 1.0 )
+service_command = /bin/compton --vsync -f -D 3 -e 1.0
diff --git a/homedir/.config/ssm/services/lockd b/homedir/.config/ssm/services/lockd
index c41a8be..71e9651 100755
--- a/homedir/.config/ssm/services/lockd
+++ b/homedir/.config/ssm/services/lockd
@@ -1,33 +1,24 @@
 #!/usr/bin/env ssm
 # vim: ft=sh
 
-service_respawn='true'
-service_command="$HOME/bin/lockd"
-service_args=( i3lock-extra -s -o ~/pics/lock.png -g -p )
+service_respawn = always
+service_command = "$HOME/bin/lockd" i3lock-extra -s -o ~/pics/lock.png -p -g -- -e -f
 
-function do_notify {
-	declare output; var output
-	output = "$( "$@" )"
-
-	if output; then
-		notify-send "ssm ($service_name)" "$output"
-	fi
+function pre_start {
+	notify-send 'ssm' "Starting $service_name; press again to lock."
 }
 
 function start_or_lock {
-	if status; then
-		notify-send 'ssm' "Starting $service_name"
-		start
+	if ! status; then
+		"$0" "$service_name" start
 	else
-		notify-send 'ssm' "Locking..."
-		kill -USR1 "$service_pid"
+		"$0" "$service_name" lock
 	fi
 }
 
-function toggle {
-	if status; then
-		do_notify "$0" "$service_name" stop
-	else
-		do_notify "$0" "$service_name" start
-	fi
+function pre_lock { notify-send 'ssm' "Locking..."; }
+function lock { kill -USR1 "$service_pid"; }
+
+function pre_stop {
+	notify-send 'ssm' "Stopping $service_name"
 }
diff --git a/homedir/.config/ssm/services/pulseaudio b/homedir/.config/ssm/services/pulseaudio
index 5d6f041..78bc2ee 100755
--- a/homedir/.config/ssm/services/pulseaudio
+++ b/homedir/.config/ssm/services/pulseaudio
@@ -1,14 +1,10 @@
 #!/bin/env watchman
 
-service_depends=( jackd )
 
-service_command='/usr/bin/pulseaudio'
-service_args=( 
-	--realtime=false
-	--exit-idle-time=-1
-	-L module-jack-sink
-	-L module-jack-source
+service_command = '/usr/bin/pulseaudio' \
+	--exit-idle-time=-1 \
+	-L module-jack-sink \
+	-L module-jack-source \
 	-L module-native-protocol-tcp
-)
 
-stop () { "$service_command" -k; }
+stop() { "$service_command" -k; }
diff --git a/homedir/.config/ssm/services/scron b/homedir/.config/ssm/services/scron
index db786dd..b8b28d6 100755
--- a/homedir/.config/ssm/services/scron
+++ b/homedir/.config/ssm/services/scron
@@ -1,5 +1,4 @@
 #!/usr/bin/env ssm
 
-service_respawn='true'
-service_command='/usr/bin/crond'
-service_args=( -n -f ~/.config/crontab )
+service_respawn = always
+service_command = /usr/bin/crond -n -f ~/.config/crontab
diff --git a/homedir/.config/ssm/services/ssh-agent b/homedir/.config/ssm/services/ssh-agent
index 6a2851b..6e6d34a 100755
--- a/homedir/.config/ssm/services/ssh-agent
+++ b/homedir/.config/ssm/services/ssh-agent
@@ -1,4 +1,4 @@
 #!/usr/bin/env watchman
 
 service_command='/usr/bin/ssh-agent'
-service_args=( -d -a "/tmp/${USER}-ssh-auth.sock" )
+service_args=( -d -a "/run/user/$UID/ssh-auth.sock" )
diff --git a/homedir/.config/ssm/services/sxhkd b/homedir/.config/ssm/services/sxhkd
index ae65a18..7708c7c 100755
--- a/homedir/.config/ssm/services/sxhkd
+++ b/homedir/.config/ssm/services/sxhkd
@@ -1,5 +1,8 @@
 #!/usr/bin/env watchman
 
-service_respawn='true'
-service_command='/usr/bin/sxhkd'
-service_reload_signal='USR1'
+service_workdir = "$HOME"
+service_respawn = always
+service_command = /usr/bin/sxhkd
+service_reload_signal = USR1
+
+service_cgroup_exclusive = 0
diff --git a/homedir/.config/ssm/services/ufwd b/homedir/.config/ssm/services/ufwd
index b060438..1c813ff 100755
--- a/homedir/.config/ssm/services/ufwd
+++ b/homedir/.config/ssm/services/ufwd
@@ -1,4 +1,6 @@
-#!/usr/bin/env watchman
+#!/usr/bin/env ssm
+
+service_tmpfiles=( "/run/user/$UID/ufwd:dir" )
 
 #service_respawn='true'
 service_command='/usr/bin/ufwd'
diff --git a/homedir/.config/termite/config b/homedir/.config/termite/config
index 21b37a0..4e4a617 100644
--- a/homedir/.config/termite/config
+++ b/homedir/.config/termite/config
@@ -1,5 +1,12 @@
+# Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+# Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+
+# Project:    Nord Termite
+# Repository: https://github.com/arcticicestudio/nord-termite
+# License:    MIT
+
 [options]
-font = xos4 terminus 10
+font = Terminus 10
 #allow_bold = false
 cursor_blink = off
 cursor_shape = ibeam
@@ -12,30 +19,29 @@ font = terminus 10
 roundness = 0.0
 
 [colors]
-foreground = #839496
-foreground_bold = #eee8d5
-foreground_dim = #888888
-background = #141414
-#background = rgba(18, 21, 26, 0.9)
-cursor = #93a1a1
+cursor = #d8dee9
+cursor_foreground = #2e3440
 
-# if unset, will reverse foreground and background
-#highlight = #839496
+foreground = #d8dee9
+foreground_bold = #d8dee9
+background = #262C36
+background = rgba(38, 44, 54, 0.9)
 
-# colors from color0 to color254 can be set
-color0 = #073642
-color1 = #dc322f
-color2 = #859900
-color3 = #b58900
-color4 = #268bd2
-color5 = #d33682
-color6 = #2aa198
-color7 = #eee8d5
-color8 = #002b36
-color9 = #cb4b16
-color10 = #586e75
-color11 = #657b83
-color12 = #839496
-color13 = #6c71c4
-color14 = #93a1a1
-color15 = #fdf6e3
+highlight = #4c566a
+
+color0  = #3b4252
+color1  = #bf616a
+color2  = #a3be8c
+color3  = #ebcb8b
+color4  = #81a1c1
+color5  = #b48ead
+color6  = #88c0d0
+color7  = #e5e9f0
+color8  = #4c566a
+color9  = #bf616a
+color10 = #a3be8c
+color11 = #ebcb8b
+color12 = #81a1c1
+color13 = #b48ead
+color14 = #8fbcbb
+color15 = #eceff4
diff --git a/homedir/.config/zsh.d/modules/config b/homedir/.config/zsh.d/modules/config
index 850aad9..3bf7b18 100644
--- a/homedir/.config/zsh.d/modules/config
+++ b/homedir/.config/zsh.d/modules/config
@@ -43,8 +43,7 @@ set_misc_path \
 	"$HOME/games/bin" \
 	"$HOME/.local/bin" \
 	"$HOME/.nails/bin" \
-	"$HOME/.winepx/bin" \
-	"$HOME/.rvm/bin"
+	"$HOME/.winepx/bin"
 
 # GPG
 GPG_TTY=$(tty)
diff --git a/homedir/.ncmpcpp/config b/homedir/.ncmpcpp/config
index fae61ad..6d3913a 100644
--- a/homedir/.ncmpcpp/config
+++ b/homedir/.ncmpcpp/config
@@ -34,12 +34,11 @@ selected_item_suffix = "$9"
 
 #playlist_separate_albums = no
 
-#progressbar_look = "▃▃ "
-progressbar_look = "▄▄ "
+progressbar_look = "▰▱ "
 progressbar_boldness = yes
 
 header_visibility = no
-statusbar_visibility = no
+statusbar_visibility = yes
 titles_visibility = no
 
 ## Screens available for use: help, playlist, browser, search_engine,