diff --git a/.config/i3status-rust/config.toml b/.config/i3status-rust/config.toml
index fd1e336..6e92eba 100644
--- a/.config/i3status-rust/config.toml
+++ b/.config/i3status-rust/config.toml
@@ -1,5 +1,5 @@
 [icons]
-icons = "awesome"
+icons = "awesome4"
 
 [theme]
 theme = "solarized-dark"
@@ -11,90 +11,91 @@ separator = "|"
 separator_fg = "#00cc00"
 separator_bg = "#222222"
 
-[[block]]
-block = "maildir"
-interval = 15
-inboxes = ["/home/finga/mail/onders.org/Inbox", "/home/finga/mail/chaostreff.at/Inbox"]
-display_type = "new"
-
 [[block]]
 block = "weather"
-format = "$weather $temp, $humidity, $wind m/s $direction"
+format = "$icon $weather $temp, $humidity, $wind m/s $direction "
 service = { name = "openweathermap", api_key = "8271cc3c23dbae82eda2123c55c050be", city_id = "2766824", units = "metric" }
 
 [[block]]
 block = "sound"
 
 [[block]]
-block = "music"
-format = "$combo.rot-str(30) $play"
-player = "mpd"
+block = "net"
+device = "enp2s0f0"
+inactive_format = "$icon x "
+format = "$icon $ip $graph_down $speed_down $graph_up $speed_up via $device "
 
 [[block]]
 block = "net"
-device = "enp0s31f6"
-format = "$ip $graph_down $speed_down $graph_up $speed_up"
+device = "wlp3s0"
+inactive_format = "$icon x "
+format = "$icon $ip $speed_down $speed_up $signal_strength $ssid $frequency "
 
-# [[block]]
-# block = "disk_space"
-# path = "/"
-# info_type = "used"
-# format = "{path} {percentage}"
+[[block]]
+block = "disk_space"
+path = "/"
+warning = 70.0
+alert = 85.0
+info_type = "used"
+format = "$icon $path $percentage "
 
-# [[block]]
-# block = "disk_space"
-# path = "/home"
-# info_type = "used"
-# format = "{path} {percentage}"
+[[block]]
+block = "disk_space"
+path = "/boot"
+warning = 70.0
+alert = 85.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 = 70.0
+alert = 85.0
+info_type = "used"
+format = "$icon $path $percentage "
 
-# [[block]]
-# block = "disk_space"
-# path = "/tmp"
-# info_type = "used"
-# format = "{path} {percentage}"
+[[block]]
+block = "disk_space"
+path = "/var"
+warning = 70.0
+alert = 85.0
+info_type = "used"
+format = "$icon $path $percentage "
 
 [[block]]
 block = "memory"
-display_type = "memory"
-format_mem = "$mem_total_used_percents.eng(3)"
-clickable = false
+format = "$icon $mem_used_percents.eng(w:2) "
 
 [[block]]
 block = "memory"
-display_type = "swap"
-format_swap = "$swap_used_percents.eng(3)"
-clickable = false
+format = "$icon_swap $swap_used_percents.eng(w:2) "
 
 [[block]]
 block = "cpu"
 interval = 1
-format = "$barchart $utilization $frequency.eng(4)"
+format = "$icon $barchart $utilization $frequency.eng(w:4) "
 
 [[block]]
 block = "temperature"
-collapsed = false
-format = "$min min, $max max, $average avg"
-chip = "*-isa-*"
+format = "$icon $min min, $max max, $average avg "
 
 [[block]]
 block = "load"
-format = "$1m.eng(4) $5m.eng(4) $15m.eng(4)"
+format = " $icon $1m.eng(w:4) $5m.eng(w:4) $15m.eng(w:4) "
+
+[[block]]
+block = "battery"
+format = " $icon $percentage $time"
 
 [[block]]
 block = "time"
 interval = 1
-format = "%F (%Z) %T"
+format = " $icon $timestamp.datetime(f:'%F (%Z) %T') "
 timezone = "Europe/Vienna"
 
 [[block]]
 block = "time"
 interval = 1
-format = "(%Z) %T"
+format = " $icon $timestamp.datetime(f:'(%Z) %T') "
 timezone = "Etc/UTC"