diff --git a/modules/desktop-environments/hyprland/config/waybar/default.nix b/modules/desktop-environments/hyprland/config/waybar/default.nix
index c3586a1..8718ae2 100755
--- a/modules/desktop-environments/hyprland/config/waybar/default.nix
+++ b/modules/desktop-environments/hyprland/config/waybar/default.nix
@@ -54,8 +54,8 @@ in
           "temperature#gpu"
           "keyboard-state#capslock"
           "keyboard-state#numlock"
-          "pulseaudio"
-          "pulseaudio#microphone"
+          "wireplumber#sink"
+          "wireplumber#source"
           "bluetooth"
           "clock"
           "custom/weather"
@@ -153,14 +153,14 @@ in
           };
         };
 
-        pulseaudio = {
+        "wireplumber#sink" = {
           format = "{icon} {volume}%";
           tooltip = false;
           format-muted = "{icon} Muted";
-          on-click = "pamixer -t";
+          on-click = "wpctl set-mute @DEFAULT_SINK@ toggle";
           on-click-right = "pavucontrol -t 1";
-          on-scroll-up = "pamixer -i 5";
-          on-scroll-down = "pamixer -d 5";
+          on-scroll-up = "wpctl set-volume @DEFAULT_SINK@ 5%+";
+          on-scroll-down = "wpctl set-volume @DEFAULT_SINK@ 5%-";
           scroll-step = 5;
           format-icons = {
             headphone = "󰋋";
@@ -179,6 +179,19 @@ in
           };
         };
 
+        "wireplumber#source" = {
+          node-type = "Audio/Source";
+          format = "";
+          format-muted = "";
+          tooltip = false;
+          # tooltip-format = "{source_desc} | {source_volume}%";
+          on-click = "wpctl set-mute @DEFAULT_SOURCE@ toggle";
+          on-click-right = "pavucontrol -t 2";
+          on-scroll-up = "wpctl set-volume @DEFAULT_SOURCE@ 5%+";
+          on-scroll-down = "wpctl set-volume @DEFAULT_SOURCE@ 5%-";
+          scroll-step = 5;
+        };
+
         "bluetooth" = {
           on-click = "overskride";
           tooltip = true;
@@ -195,20 +208,18 @@ in
           tooltip-format-enumerate-connected = { };
         };
 
-        "pulseaudio#microphone" = {
-          format = "{format_source}";
-          format-source = "";
-          format-source-muted = "";
-          on-click = "pamixer --default-source -t";
-          on-click-right = "pavucontrol -t 2";
-          on-scroll-up = "pamixer --default-source -i 5";
-          on-scroll-down = "pamixer --default-source -d 5";
-          scroll-step = 5;
-        };
-
         clock = {
           format = "{:%I:%M %p}";
-          tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
+          tooltip-format = "<tt><small>{calendar}</small></tt>";
+          calendar = {
+            mode = "month";
+            format = {
+              months =     "<span color='${theme.nord.frost.nord9}'><b>{}</b></span>";
+              days =       "<span color='${theme.nord.frost.nord10}'><b>{}</b></span>";
+              weekdays =   "<span color='${theme.nord.frost.nord8}'><b>{}</b></span>";
+              today =      "<span color='${theme.nord.aurora.nord14}'><b><u>{}</u></b></span>";
+            };
+          };
         };
 
         "custom/weather" = {
@@ -313,7 +324,7 @@ in
         ${borderRight}
       }
 
-      #pulseaudio.microphone {
+      #wireplumber.source {
         color: ${theme.nord.frost.nord8};
         background-color: ${theme.nord.polarNight.nord0};
         ${defaultOpacity}
@@ -321,7 +332,7 @@ in
         border-radius: 0;
       }
 
-      #pulseaudio {
+      #wireplumber.sink {
         color: ${theme.nord.frost.nord7};
         background-color: ${theme.nord.polarNight.nord0};
         ${defaultOpacity}