diff --git a/roles/waybar/files/waybar/config b/roles/waybar/files/waybar/config
index 3dc3ce4..6b88be3 100644
--- a/roles/waybar/files/waybar/config
+++ b/roles/waybar/files/waybar/config
@@ -19,7 +19,21 @@
     "clock": {
         "interval": 1,
         "format": "{:%d<span foreground='#929292'>%m</span><span foreground='#606060'>%y</span> %H<span foreground='#929292'>%M</span><span foreground='#606060'>%S</span>}",
-        "tooltip": false
+        "tooltip-format": "<tt><small>{calendar}</small></tt>",
+        "calendar": {
+                    "mode"          : "year",
+                    "mode-mon-col"  : 3,
+                    "weeks-pos"     : "right",
+                    "on-scroll"     : 1,
+                    "on-click-right": "mode",
+                    "format": {
+                              "months":     "<span color='#ffead3'><b>{}</b></span>",
+                              "days":       "<span color='#ecc6d9'><b>{}</b></span>",
+                              "weeks":      "<span color='#99ffdd'><b>W{}</b></span>",
+                              "weekdays":   "<span color='#ffcc66'><b>{}</b></span>",
+                              "today":      "<span color='#ff6699'><b><u>{}</u></b></span>"
+                              }
+                    }
     },
     "battery": {
         "format-icons": ["", "", "", "", ""],
@@ -31,8 +45,7 @@
         "states": {
             "warning": 25,
             "critical": 10
-        },
-        "tooltip": false
+        }
     },
     "custom/pkg": {
         "format": "{}",
@@ -46,6 +59,7 @@
         "format-disconnected": "",
         "tooltip": false
     },
+
     "pulseaudio": {
         "format": "{icon} {volume}%",
         "format-muted": "<span foreground='#929292'></span>",
@@ -53,8 +67,8 @@
             "default": ["<span foreground='#929292'></span>"],
             "headphones": ["<span foreground='#929292'></span>"]
         },
-        "on-scroll-up": "pamixer -ui 1 && pamixer --get-volume > $SWAYSOCK.wob",
-        "on-scroll-down": "pamixer -ud 1 && pamixer --get-volume > $SWAYSOCK.wob",
+        "on-scroll-up": "pamixer -ui 2 && pamixer --get-volume > $SWAYSOCK.wob",
+        "on-scroll-down": "pamixer -ud 2 && pamixer --get-volume > $SWAYSOCK.wob",
         "tooltip": false
     },
     "custom/vpn": {
diff --git a/roles/waybar/templates/style.j2 b/roles/waybar/templates/style.j2
index 386c54b..1cbdc1e 100644
--- a/roles/waybar/templates/style.j2
+++ b/roles/waybar/templates/style.j2
@@ -1,5 +1,5 @@
 /* colorscheme */
-@define-color background rgba(34, 34, 34, 0.9); 
+@define-color background rgba(34, 34, 34, 0.9);
 @define-color active rgba(68, 68, 68, 0.8);
 @define-color warning rgba(243, 249, 157, 1);
 @define-color alert rgba(255, 92, 87, 1);
@@ -29,6 +29,11 @@ window {
     background: @background;
 }
 
+tooltip {
+    border: 1px solid rgba(100, 114, 125, 0.5);
+    border-radius: 5px;
+}
+
 #workspaces {
     padding-right: 30px;
 }