diff --git a/waybar/battery_menu.xml b/waybar/battery_menu.xml
deleted file mode 100644
index 449438e..0000000
--- a/waybar/battery_menu.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkMenu" id="menu">
-	<child>
-		<object class="GtkMenuItem" id="performance">
-			<property name="label">Performance</property>
-        </object>
-	</child>
-	<child>
-        <object class="GtkMenuItem" id="balanced">
-			<property name="label">Balanced</property>
-        </object>
-	</child>
-    <child>
-        <object class="GtkMenuItem" id="powersaver">
-			<property name="label">Powersaver</property>
-        </object>
-    </child>
-  </object>
-</interface>
-
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 8bc6aa5..ecdd3b1 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -19,9 +19,7 @@
     "modules-right": [
         "battery",
         "pulseaudio",
-        "custom/notification",
         "tray",
-        "custom/power",
         "clock"
     ],
     // Modules configuration
@@ -44,6 +42,7 @@
     "dwl/window": {
         "format": "{layout} {title}",
         "max-length": 50,
+        "tooltip": false,
         "rewrite": {
             " \\| ": ""
         }
@@ -119,7 +118,8 @@
         "format-icons": {
             "default": ["", "", ""]
         },
-        "on-click": "pavucontrol"
+        "on-click": "pavucontrol",
+        "on-click-right": "~/.config/waybar/scripts/audio-output-menu.sh"
     },
         "bluetooth": {
         "format": "󰂲",
@@ -133,31 +133,6 @@
         },
         "on-click": "blueman-manager",
         "tooltip-format-connected": "{device_enumerate}"
-    },
-    "custom/notification": {
-        "format": "{icon} {text}",
-        "tooltip": false,
-        "format-icons": {
-            "notification": "󱅫",
-            "none": "",
-            "dnd-notification": "",
-            "dnd-none": "󰂛",
-            "inhibited-notification": "",
-            "inhibited-none": "",
-            "dnd-inhibited-notification": "",
-            "dnd-inhibited-none": ""
-        },
-        "return-type": "json",
-        "exec-if": "which swaync-client",
-        "exec": "swaync-client -swb",
-        "on-click": "swaync-client -t -sw",
-        "on-click-right": "swaync-client -d -sw",
-        "escape": true
-    },
-    "custom/power": {
-	    "format" : "⏻",
-		  "tooltip": false,
-      "on-click": "wlogout"
     }
 }
 
diff --git a/waybar/style.css b/waybar/style.css
index e22c186..48c9b6e 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -13,10 +13,61 @@
   margin: 0;
   padding: 0;
 }
+/* Tray right-click menu (GTK context menu) */
+menu, .menu, drawer {
+    background-color: @mantle;
+    color: @theme_fg_color;
+    border: 1px solid @surface0;
+    border-radius: 8px;
+    padding: 4px;
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.35);
+}
+
+/* Individual items inside the menu */
+menuitem, menu header, menu button {
+    background-color: transparent;
+    color: @theme_fg_color;
+    border-radius: 6px;
+    margin: 1px 2px;
+    padding: 6px 10px;
+    min-height: 0;
+}
+
+/* Hover / active state */
+menuitem:hover,
+menuitem:selected {
+    background-color: @lavender;
+    color: @theme_selected_fg_color;
+}
+
+menuitem:disabled {
+    color: @insensitive_fg_color;
+}
+
+/* Separators between menu sections */
+menu separator {
+    background-color: @surface1;
+    min-height: 1px;
+    margin: 4px 6px;
+}
+
+/* Waybar module tooltips */
+tooltip {
+    background-color: @mantle;
+    color: @theme_fg_color;
+    border: 1px solid @surface0;
+    border-radius: 8px;
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.35);
+}
+
+tooltip label {
+    color: @theme_fg_color;
+    padding: 6px 10px;
+}
 
 #waybar {
   background: @theme_bg_color;
-  color: @theme_fg_color;
+  color: rgba(198, 208, 245, 0.3);
 }
 #window,
 #mpris {
@@ -25,7 +76,6 @@
 #clock,
 #battery,
 #pulseaudio,
-#custom-notification,
 #tray,
 #custom-power {
   padding: 0 0.75rem;
diff --git a/waybar/waybar.sh b/waybar/waybar.sh
deleted file mode 100755
index 720620c..0000000
--- a/waybar/waybar.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env sh
-
-# Terminate already running bar instances
-killall -q waybar
-
-# Wait until the processes have been shut down
-while pgrep -x waybar >/dev/null; do sleep 1; done
-
-# Launch main
-waybar