diff --git a/homedir/.config/bspwm/bspwmrc b/homedir/.config/bspwm/bspwmrc
index bd47dbb..320605e 100755
--- a/homedir/.config/bspwm/bspwmrc
+++ b/homedir/.config/bspwm/bspwmrc
@@ -48,7 +48,7 @@ bspc rule -a \* state=floating
 
 
 # start some services
-services=( sxhkd dunst )
+services=( sxhkd dunst ssh-agent )
 for s in "${services[@]}"; do
 	if ! service "$s" status; then
 		service "$s" start
@@ -59,7 +59,6 @@ done
 service moltenbar restart
 
 nullexec browser &
-nullexec terminal &
 nullexec telegram &
 nullexec dropbox &
 
diff --git a/homedir/.config/bspwm/sxhkdrc b/homedir/.config/bspwm/sxhkdrc
index 6116dbc..8ca8786 100644
--- a/homedir/.config/bspwm/sxhkdrc
+++ b/homedir/.config/bspwm/sxhkdrc
@@ -41,6 +41,9 @@ super + {r,u,p}
 super + z
 	ssm lockd lock
 
+super + shift + z
+	ssm lockd toggle
+
 Print
 	snap -f
 
diff --git a/homedir/.config/dunst/dunstrc b/homedir/.config/dunst/dunstrc
index 5f0192b..099ffc5 100644
--- a/homedir/.config/dunst/dunstrc
+++ b/homedir/.config/dunst/dunstrc
@@ -136,7 +136,7 @@
     startup_notification = true
     
     # dmenu path.
-    dmenu = /usr/bin/dmenu -p dunst:
+    dmenu = /home/fbt/bin/dmenu-extras
     #dmenu = /usr/bin/rofi -dmenu
     
     # Browser for opening urls in context menu.
diff --git a/homedir/.config/moltenbar/mod b/homedir/.config/moltenbar/mod
deleted file mode 120000
index b6492fa..0000000
--- a/homedir/.config/moltenbar/mod
+++ /dev/null
@@ -1 +0,0 @@
-/home/fbt/git/moltenbar/mod
\ No newline at end of file
diff --git a/homedir/.config/moltenbar/rc.yaml b/homedir/.config/moltenbar/rc.yaml
index 68650db..95f2016 100644
--- a/homedir/.config/moltenbar/rc.yaml
+++ b/homedir/.config/moltenbar/rc.yaml
@@ -12,21 +12,23 @@ modules:
   - bspwm_taskbar
   - load_average
   - network
-  - newmail
-format: "<%= @panel_data['bspwm_pager'] %><%= @panel_data['bspwm_taskbar'] %>%{r}%{F<%= @config['colours']['bg_focused'] %>} %{F-}%{B<%= @config['colours']['bg_focused'] %>}  New mail: <%= @panel_data['newmail'] %>  LA: <%= @panel_data['load_average'] %>  Network: <%= @panel_data['network'] %>   <%= @panel_data['date'] %>  %{B-}"
+  - 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'
 
 # Module settings
 mod:
   bspwm_pager:
     colour_focused: '#f9f9f9'
     show_empty_desktops: false
-#   monitors:
-#     - "WMHDMI1"
+    show_single_monitor: false
+    #monitors:
+    #  - "main"
     blacklist:
       -h
   bspwm_taskbar:
@@ -48,6 +50,14 @@ mod:
     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"
@@ -56,3 +66,9 @@ mod:
     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
diff --git a/homedir/.config/watchman/init.d/lockd b/homedir/.config/watchman/init.d/lockd
index 408cb6c..5216f9d 100755
--- a/homedir/.config/watchman/init.d/lockd
+++ b/homedir/.config/watchman/init.d/lockd
@@ -1,9 +1,30 @@
 #!/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 )
 
-lock() {
+function _lock {
 	kill -USR1 "$service_pid"
 }
+
+function lock {
+	status || {
+		start; sleep 1
+		"$0" "$service_name" lock
+		return "$?"
+	}
+
+	_lock
+}
+
+function toggle {
+	if status; then
+		out=$( "$0" "$service_name" stop 2>&1 )
+		notify-send "ssm" "$out"
+	else
+		out=$( "$0" "$service_name" start 2>&1 )
+		notify-send "ssm" "$out"
+	fi
+}
diff --git a/homedir/.config/watchman/init.d/socks b/homedir/.config/watchman/init.d/socks
index c2f7bef..29e09d6 100755
--- a/homedir/.config/watchman/init.d/socks
+++ b/homedir/.config/watchman/init.d/socks
@@ -4,5 +4,10 @@
 [[ $PROXY_HOST ]] || PROXY_HOST='malganis.priv'
 
 service_respawn=true
-service_command='/usr/bin/ssh'
-service_args=( -i ~/.ssh/proxy/id_ecdsa -ND 8080 "$PROXY_USER@$PROXY_HOST" )
+service_command=( /usr/bin/ssh -i ~/.ssh/proxy/id_ecdsa -ND 8080 "$PROXY_USER@$PROXY_HOST" )
+
+function info {
+	printf 'Name: %s\n' "$service_name"
+	printf 'Command: %s\n' "${service_command[*]}"
+	(( service_respawn )) && printf 'Respawn: yes\n'
+}