diff --git a/.config/i3/config b/.config/i3/config
index 0c7ffba..b393390 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -200,9 +200,8 @@ client.focused #000000 #009900 #ffffff #ff0000
 client.unfocused #000000 #005500 #000000 #ff0000
 
 # use variables for screens
-set $screen0 "eDP-1"
-set $screen1 "DP-1-8"
-set $screen2 "DP-1-1"
+set $screen0 "DP-1"
+set $screen1 "HDMI-2"
 
 # Start i3bar to display a workspace bar (plus the system information
 # i3status-rust finds out, if available)
@@ -223,9 +222,8 @@ bar {
 	  #client.orientation #ff0000
         }
 }
-
 bar {
-        status_command i3status-rs
+        status_command i3status-rs ~/.config/i3status-rust/secondary.toml
         font pango:DejaVu Sans Mono, forkawesome 8
         position top
         tray_output primary
@@ -242,35 +240,14 @@ bar {
         }
 }
 
-bar {
-        status_command i3status-rs ~/.config/i3status-rust/secondary.toml
-        font pango:DejaVu Sans Mono, forkawesome 8
-        position top
-        tray_output primary
-        workspace_buttons yes
-        mode dock
-        modifier $mod
-        output $screen2
+workspace $ws1 output $screen0
+workspace $ws2 output $screen0
+workspace $ws3 output $screen0
+workspace $ws4 output $screen0
+workspace $ws5 output $screen0
 
-        colors {
-          statusline #00ff00
-          focused_workspace #00cc00 #00ff00 #000000
-          inactive_workspace #00cc00 #008b00 #cccccc
-	  #client.orientation #ff0000
-        }
-}
-
-workspace $ws1 output $screen1
-workspace $ws2 output $screen1
-workspace $ws3 output $screen1
-workspace $ws4 output $screen1
-workspace $ws5 output $screen1
-
-workspace $ws6 output $screen2
-workspace $ws7 output $screen2
-workspace $ws8 output $screen2
-workspace $ws9 output $screen2
-workspace $ws10 output $screen0
-
-# start autolock
-exec_always xautolock -time 5 -locker "fuzzy-i3lock"
+workspace $ws10 output $screen1
+workspace $ws9 output $screen1
+workspace $ws8 output $screen1
+workspace $ws7 output $screen1
+workspace $ws6 output $screen1
diff --git a/.config/i3status-rust/config.toml b/.config/i3status-rust/config.toml
index 9dde85f..fd1e336 100644
--- a/.config/i3status-rust/config.toml
+++ b/.config/i3status-rust/config.toml
@@ -1,5 +1,5 @@
 [icons]
-icons = "awesome4"
+icons = "awesome"
 
 [theme]
 theme = "solarized-dark"
@@ -12,113 +12,89 @@ separator_fg = "#00cc00"
 separator_bg = "#222222"
 
 [[block]]
-block = "uptime"
+block = "maildir"
+interval = 15
+inboxes = ["/home/finga/mail/onders.org/Inbox", "/home/finga/mail/chaostreff.at/Inbox"]
+display_type = "new"
 
 [[block]]
 block = "weather"
-format = " $icon $weather $temp, $humidity, $wind m/s $direction "
+format = "$weather $temp, $humidity, $wind m/s $direction"
 service = { name = "openweathermap", api_key = "8271cc3c23dbae82eda2123c55c050be", city_id = "2766824", units = "metric" }
 
 [[block]]
 block = "sound"
-driver = "pulseaudio"
 
 [[block]]
-block = "net"
-device = "br0"
-format = " $icon $ip $graph_down $speed_down^icon_net_down $graph_up $speed_up^icon_net_up "
+block = "music"
+format = "$combo.rot-str(30) $play"
+player = "mpd"
 
 [[block]]
 block = "net"
 device = "enp0s31f6"
-format = " $icon $ip $graph_down $speed_down $graph_up $speed_up "
+format = "$ip $graph_down $speed_down $graph_up $speed_up"
 
-[[block]]
-block = "net"
-device = "tn0"
-format = " $icon $ip $speed_down^icon_net_down $speed_up^icon_net_up "
+# [[block]]
+# block = "disk_space"
+# path = "/"
+# info_type = "used"
+# format = "{path} {percentage}"
 
-[[block]]
-block = "net"
-format = " $icon {$signal_strength $ssid $frequency| x} via $device "
+# [[block]]
+# block = "disk_space"
+# path = "/home"
+# info_type = "used"
+# format = "{path} {percentage}"
 
-[[block]]
-block = "disk_space"
-path = "/"
-warning = 80.0
-alert = 90.0
-info_type = "used"
-format = " $icon $path $percentage "
+# [[block]]
+# block = "disk_space"
+# path = "/var"
+# info_type = "used"
+# warning = 20.0
+# format = "{path} {percentage}"
 
-[[block]]
-block = "disk_space"
-path = "/home"
-warning = 75.0
-alert = 80.0
-info_type = "used"
-format = " $icon $path $percentage "
-
-[[block]]
-block = "disk_space"
-path = "/tmp"
-warning = 75.0
-alert = 80.0
-info_type = "used"
-format = " $icon $path $percentage "
-
-[[block]]
-block = "disk_space"
-path = "/var"
-warning = 80.0
-alert = 90.0
-info_type = "used"
-format = " $icon $path $percentage "
-
-[[block]]
-block = "disk_space"
-path = "/var/lib/machines"
-warning = 80.0
-alert = 90.0
-info_type = "used"
-format = " $icon $path $percentage "
-
-[[block]]
-block = "disk_space"
-path = "/var/lib/libvirt/images"
-warning = 80.0
-alert = 90.0
-info_type = "used"
-format = " $icon $path $percentage "
+# [[block]]
+# block = "disk_space"
+# path = "/tmp"
+# info_type = "used"
+# format = "{path} {percentage}"
 
 [[block]]
 block = "memory"
-format = " $icon $mem_used_percents.eng(w:3) "
+display_type = "memory"
+format_mem = "$mem_total_used_percents.eng(3)"
+clickable = false
 
 [[block]]
 block = "memory"
-format = " $icon_swap $swap_used_percents.eng(w:3) "
+display_type = "swap"
+format_swap = "$swap_used_percents.eng(3)"
+clickable = false
 
 [[block]]
 block = "cpu"
 interval = 1
-format = " $icon $barchart $utilization $frequency.eng(w:4) "
+format = "$barchart $utilization $frequency.eng(4)"
 
 [[block]]
 block = "temperature"
-format = " $icon $min min, $max max, $average avg "
+collapsed = false
+format = "$min min, $max max, $average avg"
+chip = "*-isa-*"
 
 [[block]]
 block = "load"
-format = " $icon $1m.eng(w:4) $5m.eng(w:4) $15m.eng(w:4) "
+format = "$1m.eng(4) $5m.eng(4) $15m.eng(4)"
 
 [[block]]
 block = "time"
 interval = 1
-format = " $icon $timestamp.datetime(f:'%F (%Z) %T') "
+format = "%F (%Z) %T"
 timezone = "Europe/Vienna"
 
 [[block]]
 block = "time"
 interval = 1
-format = " $icon $timestamp.datetime(f:'(%Z) %T') "
+format = "(%Z) %T"
 timezone = "Etc/UTC"
diff --git a/.config/i3status-rust/secondary.toml b/.config/i3status-rust/secondary.toml
index 412297d..88569de 100644
--- a/.config/i3status-rust/secondary.toml
+++ b/.config/i3status-rust/secondary.toml
@@ -1,5 +1,5 @@
 [icons]
-icons = "awesome4"
+icons = "awesome"
 
 [theme]
 theme = "solarized-dark"
@@ -13,40 +13,45 @@ separator_bg = "#222222"
 
 [[block]]
 block = "sound"
-driver = "pulseaudio"
 
 [[block]]
 block = "uptime"
 
 [[block]]
 block = "memory"
-format = " $icon $mem_used_percents.eng(w:3) "
+display_type = "memory"
+format_mem = "$mem_total_used_percents.eng(3)"
+clickable = false
 
 [[block]]
 block = "memory"
-format = " $icon_swap $swap_used_percents.eng(w:3) "
+display_type = "swap"
+format_swap = "$swap_used_percents.eng(3)"
+clickable = false
 
 [[block]]
 block = "cpu"
 interval = 1
-format = " $icon $barchart $utilization $frequency.eng(w:4) "
+format = "$barchart $utilization"
 
 [[block]]
 block = "temperature"
-format = " $icon $min min, $max max, $average avg "
+collapsed = false
+format = "$min min, $max max, $average avg"
+chip = "*-isa-*"
 
 [[block]]
 block = "load"
-format = " $icon $1m.eng(w:4) $5m.eng(w:4) $15m.eng(w:4) "
+format = "$1m.eng(4) $5m.eng(4) $15m.eng(4)"
 
 [[block]]
 block = "time"
 interval = 1
-format = " $icon $timestamp.datetime(f:'%F (%Z) %T') "
+format = "%Y-%m-%d %a (%Z) %H:%M:%S"
 timezone = "Europe/Vienna"
 
 [[block]]
 block = "time"
 interval = 1
-format = " $icon $timestamp.datetime(f:'(%Z) %T') "
+format = "(%Z) %H:%M:%S"
 timezone = "Etc/UTC"
diff --git a/.local/bin/fuzzy-i3lock b/.local/bin/fuzzy-i3lock
index ef62c6b..ae4b552 100755
--- a/.local/bin/fuzzy-i3lock
+++ b/.local/bin/fuzzy-i3lock
@@ -8,6 +8,6 @@
 
 screenshot="${TMPDIR:-/tmp}/fuzzy-i3lock.png"
 
-scrot -o "$screenshot"
+scrot "$screenshot"
 mogrify -scale 10% -scale 1000% "$screenshot"
 exec i3lock -i "$screenshot"