diff --git a/.config/waybar/modules/backlight.jsonc b/.config/waybar/modules/backlight.jsonc
index 1cc06600..486975bf 100644
--- a/.config/waybar/modules/backlight.jsonc
+++ b/.config/waybar/modules/backlight.jsonc
@@ -1,7 +1,8 @@
 {
   "backlight": {
+    "device": "intel_backlight",
     "format": "{percent}% {icon}",
-    "format-icons": [" ", " "],
+    "format-icons": ["", "", "", "", "", "", "", "", ""],
     "on-scroll-up": "swayosd-client --brightness +10",
     "on-scroll-down": "swayosd-client --brightness -10",
   },
diff --git a/.config/waybar/modules/battery.jsonc b/.config/waybar/modules/battery.jsonc
index d9274c03..5d067406 100644
--- a/.config/waybar/modules/battery.jsonc
+++ b/.config/waybar/modules/battery.jsonc
@@ -1,14 +1,13 @@
 {
   "battery": {
     "format": "{capacity}% {icon}",
-    "format-icons": {
-      "charging": ["󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"],
-      "default": ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
-    },
-    "format-full": "Charged ",
+    "format-charging": " {capacity}%",
+    "format-plugged": " {capacity}%",
+    "format-alt": "{time} {icon}",
+    "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"],
     "interval": 5,
     "states": {
-      "warning": 20,
+      "warning": 30,
       "critical": 10,
     },
     "tooltip": false,
diff --git a/.config/waybar/modules/hyprland-window.jsonc b/.config/waybar/modules/hyprland-window.jsonc
index cfa8ee82..5957ddb7 100644
--- a/.config/waybar/modules/hyprland-window.jsonc
+++ b/.config/waybar/modules/hyprland-window.jsonc
@@ -3,12 +3,11 @@
     "format": "{}",
     "max-length": 80,
     "rewrite": {
-      "(.*) — LibreWolf": "󰇧 $1",
-      "(.*) — Abaze Floorp": "󰇧 $1",
-      "(.*) — Mozilla Firefox": "󰇧 $1",
-      "(.*) — Brave": "󰇧 $1",
-      "(.*) - Discord": "󰙯 $1",
-      "(.*) - fish": "> [$1]",
+      "(.*) — Mozilla Firefox": "$1 󰇧",
+      "(.*) — Ablaze Floorp": "$1 󰇧",
+      "(.*)VSCodium": "Codium 󰨞",
+      "(.*)Spotify": "Spotify 󰓇",
+      "(.*)Steam": "Steam 󰓓",
     },
     "separate-outputs": false,
   },