diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
index 7b0816b..4ddf353 100644
--- a/tasks/setup-Debian.yml
+++ b/tasks/setup-Debian.yml
@@ -22,7 +22,6 @@
     - 'swayimg'
     - 'wdisplays'
     - 'cmatrix'
-    - 'pavucontrol'
 
 - name: Ensure font-awesome is installed
   ansible.builtin.apt:
diff --git a/tasks/waybar.yml b/tasks/waybar.yml
index 78d12c5..49be4e6 100644
--- a/tasks/waybar.yml
+++ b/tasks/waybar.yml
@@ -7,6 +7,8 @@
   with_items:
     - 'waybar'
     - 'wlogout'
+    - 'qpwgraph'
+    - 'pavucontrol'
 
 - name: Create waybar config folder
   become: true
diff --git a/templates/waybar.json.j2 b/templates/waybar.json.j2
index 99831eb..d2b884f 100644
--- a/templates/waybar.json.j2
+++ b/templates/waybar.json.j2
@@ -134,7 +134,8 @@
         "format-linked": "{ifname} (No IP) ⛒",
         "format-disconnected": "Disconnected ⚠",
         "format-alt": "{ifname}: {ipaddr}/{cidr}",
-        "on-click": "gnome-control-center network"
+        "on-click": "gnome-control-center network",
+        "on-click-right": "gnome-control-center wifi"
     },
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
@@ -153,14 +154,16 @@
             "car": "",
             "default": ["", "", ""]
         },
-        "on-click": "pavucontrol"
+        "on-click": "pavucontrol",
+        "on-click-right": "qpwgraph"
     },
     "custom/weather": {
         "format": "{}",
         "tooltip": true,
         "interval": 300,
         "exec": "{{ swayusr.home }}/.config/waybar/wttr.py",
-        "return-type": "json"
+        "return-type": "json",
+        "on-click-middle": "gnome-weather"
     },
      "custom/power": {
          "format": "",