diff --git a/catppuccin-macchiato/config-battery.jsonc b/catppuccin-macchiato/config-laptop.jsonc
similarity index 91%
rename from catppuccin-macchiato/config-battery.jsonc
rename to catppuccin-macchiato/config-laptop.jsonc
index cca61fc..ef2b821 100644
--- a/catppuccin-macchiato/config-battery.jsonc
+++ b/catppuccin-macchiato/config-laptop.jsonc
@@ -21,35 +21,19 @@
     "hyprland/scratchpad",
     "idle_inhibitor",
     "custom/updates",
-    "custom/kernel",
+    // "custom/kernel",
     // "disk#ssd",
     // "temperature",
     // "cpu",
     // "memory",
+    // "custom/weather",
     "bluetooth",
     "network",
     "pulseaudio",
     "battery",
     "clock",
-    "custom/weather",
   ],
 
-  "hyprland/workspaces": {
-    "disable-scroll": false,
-    "all-outputs": true,
-    "warp-on-scroll": false,
-    "format": "{icon}",
-    "format-icons": {
-      //         "1": "",
-      //         "2": "",
-      //         "3": "",
-      //         "4": "",
-      //         "5": "",
-      "urgent": "",
-      //         "focused": "",
-      //         "default": ""
-    },
-  },
   "bluetooth": {
     "format-on": "bt ",
     "format-off": "bt ({status}) ",
@@ -88,7 +72,8 @@
   "clock": {
     "interval": 60,
     "timezone": "America/Los_Angeles",
-    "format": "{:%F %R }",
+    "format": "{:%R }",
+    "format-alt": "{:%F %R }",
     "tooltip-format": "<tt><small>{calendar}</small></tt>",
     "calendar": {
       "mode": "year",
@@ -166,9 +151,12 @@
   },
   "pulseaudio": {
     "scroll-step": 2,
-    "format": "{volume}% {icon} {format_source}",
-    "format-bluetooth": "{volume}% {icon} {format_source}",
-    "format-bluetooth-muted": " {icon} {format_source}",
+    // "format": "{volume}% {icon} {format_source}",
+    // "format-bluetooth": "{volume}% {icon} {format_source}",
+    // "format-bluetooth-muted": " {icon} {format_source}",
+    "format": "{volume}% {icon}",
+    "format-bluetooth": "{volume}% {icon}",
+    "format-bluetooth-muted": " {icon}",
     "format-muted": " {format_source}",
     "format-source": "{volume}% ",
     "format-source-muted": "",
@@ -257,7 +245,7 @@
   "custom/firefox": {
     "exec": "$HOME/.config/waybar/scripts/scroll-firefox.sh",
     "format": "<span color='#E66000'> </span>{}",
-    "max-length": 35,
+    "max-length": 24,
     "on-click": "playerctl -p firefox play-pause",
     "hide-empty-text": true,
   },
@@ -265,7 +253,7 @@
     "escape": "true",
     "exec": "$HOME/.config/waybar/scripts/scroll-mpd.sh",
     "format": "{}",
-    "max-length": 35,
+    "max-length": 24,
     "on-click": "mpc toggle",
     "on-click-right": "ghostty --initial-command=ncmpcpp",
     "on-scroll-down": "mpc volume -5",
@@ -277,7 +265,7 @@
     "framerate": 144,
     "autosens": 0,
     "sensitivity": 100,
-    "bars": 12,
+    "bars": 18,
     "lower_cutoff_freq": 50,
     "higher_cutoff_freq": 10000,
     "method": "pipewire",