diff --git a/config/mako/config b/config/mako/config
index 57524ec..79a1742 100644
--- a/config/mako/config
+++ b/config/mako/config
@@ -1,14 +1,18 @@
-font=Monospace 10
+font=Departure Mono 10
+default-timeout=5000
 
 [urgency=low]
-background-color=#121218
-text-color=#e0e0e0
-border-color=#646496
+background-color=#000000
+text-color=#ffffff
+border-color=#ffffff
 
 [urgency=normal]
-background-color=#121218
-text-color=#e0e0e0
-border-color=#646496
+background-color=#000000
+text-color=#ffffff
+border-color=#ffffff
 
 [urgency=high]
-text-color=#CB4B16
+background-color=#000000
+text-color=#ff0000
+border-color=#ff0000
+
diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
index d10a794..a78366e 100644
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@@ -2,11 +2,11 @@
   "layer": "top",
   "position": "top",
 
-  "modules-left": ["sway/workspaces", "custom/sway-layout"],
-  "modules-center": ["sway/window"],
+  "modules-left": ["sway/workspaces", "custom/sway-layout", "sway/window"],
+  "modules-center": [],
   "modules-right": ["custom/dwmstatus"],
 
-"sway/workspaces": {
+  "sway/workspaces": {
     "format": "{name}",
     "format-focused": "[{name}]",
     "format-unfocused": "{name}",
@@ -14,20 +14,20 @@
     "format-urgent": "<{name}>",
     "disable-scroll": true,
     "persistent-workspaces": {
-        "1": [],
-        "2": [],
-        "3": [],
-        "4": [],
-        "5": [],
-        "6": [],
-        "7": [],
-        "8": [],
-        "9": []
+      "1": [],
+      "2": [],
+      "3": [],
+      "4": [],
+      "5": [],
+      "6": [],
+      "7": [],
+      "8": [],
+      "9": []
     }
-},
+  },
 
   "sway/window": {
-    "max-length": 80,
+    "format": " | {title}",
     "tooltip": false
   },
 
diff --git a/config/waybar/dwmbar.sh b/config/waybar/dwmbar.sh
index 6d2ed4a..03ec3f7 100755
--- a/config/waybar/dwmbar.sh
+++ b/config/waybar/dwmbar.sh
@@ -3,20 +3,32 @@
 cpu() {
     awk '/^cpu / {
         usage = ($2 + $4) * 100 / ($2 + $4 + $5)
-        printf "CPU: %.1f%%", usage
+        printf "%.1f%%", usage
     }' /proc/stat
 }
 
 mem() {
     free | awk '/Mem:/ {
         used = $3 / $2 * 100
-        printf "MEM: %.1f%%", used
+        printf "%.1f%%", used
     }'
 }
 
+localip() {
+    sb-network
+}
+
+vol() {
+    sb-volume
+}
+
+charging() {
+    bat-symbol
+}
+
 get_time() {
     date '+%I:%M-%p'
 }
 
-echo "$(cpu) | $(mem) | $(get_time)"
+echo "[$(vol)] [$(cpu)] [$(mem)] $(charging) [$(get_time)]"
 
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 87df473..09e5268 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -4,7 +4,6 @@
   padding: 0;
   margin: 0;
   border: none;
-  box-shadow: none;
   background: #000000;
   color: #ffffff;
 }
@@ -14,6 +13,7 @@ window#waybar {
   color: #ffffff;
 }
 
+/* Workspaces */
 #workspaces button {
   background: #000000;
   color: #888888;
@@ -21,23 +21,52 @@ window#waybar {
   margin: 0 1px;
 }
 
+#workspaces button:hover {
+  background: #000000;
+  color: #888888;
+  padding: 0 4px;
+  margin: 0 1px;
+  border: none;
+  box-shadow: none;
+  transition-duration: 0s;
+}
+
 #workspaces button.focused {
   color: #ffffff;
   font-weight: bold;
 }
 
+#workspaces button.focused:hover {
+  color: #ffffff;
+  font-weight: bold;
+  border: none;
+  box-shadow: none;
+  transition-duration: 0s;
+}
+
+/* Layout icon */
 #sway-layout {
   margin-left: 8px;
   margin-right: 8px;
   min-width: 20px;
 }
 
+/* WINDOW TITLE with distinct background */
 #sway-window {
-  font-style: italic;
-  color: #cccccc;
+  background-color: #222222;
+  color: #ffffff;
+  padding: 2px 8px;
+  margin: 0 4px;
+}
+
+/* Filler pushes the window title toward the right modules */
+#custom-filler {
+  background: transparent;
+  color: transparent;
+  min-width: 800px;
 }
 
+/* DWM-style right status bar */
 #custom-dwmstatus {
   margin-right: 10px;
 }
-