diff --git a/config/waybar/config b/config/waybar/config
index b675be0..90f19e9 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -1,44 +1,43 @@
 {
-    "layer": "top",
+  "layer": "top",
     "position": "top",
     "spacing": 0,
-    "height": 20,
+    "height": 26,
     "modules-left": [
-        "hyprland/workspaces"
+      "hyprland/workspaces"
     ],
     "modules-center": [
-        "clock"
+      "clock"
     ],
     "modules-right": [
-        "bluetooth",
-        "network",
-        "cpu",
-        "battery",
+      "network",
+      "cpu",
+      "battery"
     ],
     "hyprland/workspaces": {
-        "on-click": "activate",
-        "format": "{icon}",
-        "format-icons": {
-            "default": "",
-            "1": "1",
-            "2": "2",
-            "3": "3",
-            "4": "4",
-            "5": "5",
-            "6": "6",
-            "7": "7",
-            "8": "8",
-            "9": "9",
-            "active": "󱓻",
-            "urgent": "󱓻"
-        },
-        "persistent_workspaces": {
-            "1": [],
-            "2": [],
-            "3": [],
-            "4": [],
-            "5": []
-        }
+      "on-click": "activate",
+      "format": "{icon}",
+      "format-icons": {
+        "default": "",
+        "1": "1",
+        "2": "2",
+        "3": "3",
+        "4": "4",
+        "5": "5",
+        "6": "6",
+        "7": "7",
+        "8": "8",
+        "9": "9",
+        "active": "󱓻",
+        "urgent": "󱓻"
+      },
+      "persistent_workspaces": {
+        "1": [],
+        "2": [],
+        "3": [],
+        "4": [],
+        "5": []
+      }
     },
     "bluetooth": {
       "format": " ",
@@ -51,64 +50,48 @@
       "on-click": "blueberry"
     },
     "cpu": {
-        "interval": 5,
-        "format": "{usage}% 󰍛",
-        "max-length": 10,
-        "on-click": "alacritty -e btop"
+      "interval": 5,
+      "format": "{usage}% 󰍛",
+      "on-click": "alacritty -e btop"
     },
     "clock": {
-        "tooltip-format": "{calendar}",
-        "format-alt": "  {:%a, %d %b %Y}",
-        "format": "{:%H:%M}"
+      "tooltip-format": "{calendar}",
+      "format-alt": "  {:%a, %d %b %Y}",
+      "format": "{:%H:%M %A}"
     },
     "network": {
-        "format-wifi" : "{icon} ",
-        "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
-        "format-ethernet": "󰀂",
-	"format-alt" : "󱛇",
-        "format-disconnected" : "󰖪",
-	"tooltip-format-wifi": "{icon} {essid}\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
-        "tooltip-format-ethernet": "󰀂  {ifname}\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
-	"tooltip-format-disconnected": "Disconnected",
-	"on-click": "~/.config/rofi/wifi/wifi.sh &",
-        "on-click-right": "~/.config/rofi/wifi/wifinew.sh &",
-	"interval": 5,
-	"nospacing": 1,
+      "format-wifi" : "{bandwidthDownBytes:>6} {icon}",
+      "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"],
+      "format-ethernet": "󰀂",
+      "format-alt" : "󱛇",
+      "format-disconnected" : "󰖪",
+      "tooltip-format-wifi": "{icon} {essid}\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
+      "tooltip-format-ethernet": "󰀂  {ifname}\n⇣{bandwidthDownBytes}  ⇡{bandwidthUpBytes}",
+      "tooltip-format-disconnected": "Disconnected",
+      "on-click": "~/.config/rofi/wifi/wifi.sh &",
+      "interval": 5,
+      "nospacing": 1,
     },
     "battery": {
-        "format": "{capacity}% {icon}",
+      "interval": 5,
+      "format": "{capacity}% {icon}",
+      "format-discharging": "↓ {power:>2.0f}W {icon}",
+      "format-charging":    "↑ {power:>2.0f}W {icon}",
+      "format-plugged":     "{capacity}%  {icon}",
         "format-icons": {
-            "charging": [
-                "󰢜",
-                "󰂆",
-                "󰂇",
-                "󰂈",
-                "󰢝",
-                "󰂉",
-                "󰢞",
-                "󰂊",
-                "󰂋",
-                "󰂅"
-            ],
-            "default": [
-                "󰁺",
-                "󰁻",
-                "󰁼",
-                "󰁽",
-                "󰁾",
-                "󰁿",
-                "󰂀",
-                "󰂁",
-                "󰂂",
-                "󰁹"
-            ]
+          "charging": [
+            "󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"
+          ],
+          "default": [
+            "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
+          ]
         },
-        "format-full": "Charged ",
-        "interval": 5,
-        "states": {
-            "warning": 20,
-            "critical": 10
-        },
-        "tooltip": false
+      "format-full": "Charged ",
+      "interval": 5,
+      "states": {
+        "warning": 20,
+        "critical": 10
+      },
+      "tooltip": false
     }
 }
diff --git a/config/waybar/style.css b/config/waybar/style.css
index d5424cd..57f6ae0 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -25,7 +25,6 @@ window#waybar {
   color: #cdd6f4;
 }
 
-#bluetooth,
 #cpu,
 #battery,
 #network,