diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index a631902..1f800a2 100644
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -1,25 +1,9 @@
 {
-    "layer": "top", // Waybar at top layer
-    "height": 25, // Waybar height (to be removed for auto height)
+    "layer": "top",
+    "height": 25,
     "modules-left": ["sway/workspaces" ],
     "modules-center": ["custom/org-pomodoro", "clock"],
     "modules-right": ["mpd", "network", "pulseaudio", "battery", "battery#bat2"],
-    // Modules configuration
-    // "sway/workspaces": {
-    //     "disable-scroll": true,
-    //     "all-outputs": true,
-    //     "format": "{name}: {icon}",
-    //     "format-icons": {
-    //         "1": "",
-    //         "2": "",
-    //         "3": "",
-    //         "4": "",
-    //         "5": "",
-    //         "urgent": "",
-    //         "focused": "",
-    //         "default": ""
-    //     }
-    // },
     "mpd": {
         "format": "<span foreground='#88C0D0'>{stateIcon}</span>  {title}",
         "format-disconnected": "",
@@ -35,7 +19,9 @@
         },
         "tooltip-format": "{elapsedTime:%H:%M:%S}/{totalTime:%H:%M:%S}",
         "tooltip-format-disconnected": "MPD (disconnected)",
-        "title-len": 50
+        "title-len": 50,
+        "on-click": "mpc toggle",
+        "on-click-right": "mpc stop"
     },
     "clock": {
         "format": "{:%a %d %b  %H:%M}",
@@ -52,7 +38,6 @@
         "format-charging": "<span foreground='#88C0D0'></span> {capacity}%",
         "format-plugged": "<span foreground='#88C0D0'></span> {capacity}%",
         "format-alt": "{time} {icon}",
-        // "format-good": "", // An empty format will hide the module
         "format-full": "<span foreground='#88C0D0'></span> 100%",
         "format-icons": ["", "", ""]
     },
@@ -67,12 +52,10 @@
         "format-charging": "<span foreground='#88C0D0'></span> {capacity}%",
         "format-plugged": "<span foreground='#88C0D0'></span> {capacity}%",
         "format-alt": "{time} {icon}",
-        // "format-good": "", // An empty format will hide the module
         "format-full": "<span foreground='#88C0D0'></span> 100%",
         "format-icons": ["", "", ""]
     },
     "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
         "format-wifi": "<span foreground='#88C0D0'>{icon}</span>  {essid}",
         "format-ethernet": "<span foreground='#88C0D0'></span>  Connected",
         "format-linked": "{ifname} (No IP) ",
@@ -83,7 +66,6 @@
         "tooltip-format-disconnected": "Offline"
     },
     "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
         "format": "<span foreground='#88C0D0'>{icon}</span>  {volume}%",
         "format-muted": "<span foreground='#88C0D0'>婢</span>",
         "format-icons": {