diff --git a/.config/i3status/config_kanaya b/.config/i3status/config_kanaya
deleted file mode 100644
index a7bdc9f..0000000
--- a/.config/i3status/config_kanaya
+++ /dev/null
@@ -1,66 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
-        colors = true
-        interval = 1
-}
-
-#order += "ipv6"
-#order += "disk /"
-#order += "wireless _first_"
-order += "ethernet tun0"
-order += "ethernet _first_"
-#order += "battery all"
-order += "cpu_temperature 0"
-order += "load"
-order += "tztime local"
-
-wireless _first_ {
-        format_up = "W: (%quality at %essid) %ip"
-        format_down = "W: down"
-}
-
-ethernet _first_ {
-        # if you use %speed, i3status requires root privileges
-        format_up = "E: %ip (%speed)"
-        format_down = "E: down"
-}
-
-# VPN
-ethernet tun0 {
-        format_up = "VPN: %ip"
-        format_down = "No VPN"
-		color_good = "#FF0000"
-		color_bad = "#666666"
-}
-
-battery all {
-        format = "%status %percentage %remaining"
-		last_full_capacity = true
-		integer_battery_capacity = true
-		low_threshold = 30
-}
-
-tztime local {
-        format = "%Y-%m-%d %H:%M:%S"
-}
-
-cpu_temperature 0 {
-        format = "%degrees °C"
-		max_threshold = 70
-		path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon1/temp1_input"
-}
-
-load {
-        format = "%1min"
-}
-
-disk "/" {
-        format = "%avail"
-}
diff --git a/_local/kanaya/.config/i3status/config b/_local/kanaya/.config/i3status/config
new file mode 100644
index 0000000..b312171
--- /dev/null
+++ b/_local/kanaya/.config/i3status/config
@@ -0,0 +1,64 @@
+# ~/.config/i3status/config -- i3status config file
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Author: binaryDiv
+# Host-specific config for: kanaya
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+# (See "man i3status" for documentation.)
+
+# ~~ General i3status settings
+general {
+    colors = true
+    interval = 1
+}
+
+
+# ~~ Define order of status bar elements
+order += "ethernet tun0"
+order += "ethernet _first_"
+order += "cpu_temperature 0"
+order += "load"
+order += "tztime local"
+order += "volume master"
+
+
+# ~~ Ethernet status
+ethernet _first_ {
+    format_up = "🌐 %ip (%speed)"
+    format_down = "🌐 Ethernet down :("
+}
+
+# ~~ VPN status via tun0 device
+ethernet tun0 {
+    format_up = "VPN: %ip"
+    format_down = "No VPN"
+    color_good = "#FF0000"
+    color_bad = "#666666"
+}
+
+# ~~ Date and time
+tztime local {
+    format = "%Y-%m-%d %H:%M:%S"
+}
+
+# ~~ Volume control display
+volume master {
+    format = "🔉 %volume"
+    format_muted = "🔇 %volume"
+    device = "pulse"
+}
+
+# ~~ CPU temperature
+cpu_temperature 0 {
+    format = "%degrees °C"
+    format_above_threshold = "🔥 %degrees °C"
+    max_threshold = 70
+    path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon1/temp1_input"
+}
+
+# ~~ CPU average load
+load {
+    format = "%1min"
+}
+