diff --git a/system/default.nix b/system/default.nix
index 3b9cba3d..3385abbe 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -204,10 +204,10 @@
     image = ./wallpapers/tropic_island_day.jpg;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/one-light.yaml";
     opacity = {
-      applications = 1.0;
-      desktop = 0.8;
-      popups = 0.4;
-      terminal = 0.8;
+      applications = 0.9;
+      desktop = 0.7;
+      popups = 0.5;
+      terminal = 0.9;
     };
     cursor = {
       package = pkgs.volantes-cursors;
diff --git a/system/home/fuzzel.nix b/system/home/fuzzel.nix
index 1f69d013..4569216f 100644
--- a/system/home/fuzzel.nix
+++ b/system/home/fuzzel.nix
@@ -4,15 +4,14 @@
     enable = true;
     settings = {
       main = {
+        use-bold = true;
         icon-theme = config.gtk.iconTheme.name;
         icons-enabled = true;
-        fields = "filename,name,generic,categories";
+        fields = "filename,name,generic,exec";
         fuzzy = true;
         filter-desktop = true;
         terminal = "${config.programs.alacritty.package}/bin/alacritty -e";
-        lines = 24;
-        width = 40;
-        tabs = 4;
+        anchor = "center";
         layer = "overlay";
       };
       border = {
diff --git a/system/home/mako.nix b/system/home/mako.nix
index 287ca842..e3a6be85 100644
--- a/system/home/mako.nix
+++ b/system/home/mako.nix
@@ -11,7 +11,7 @@
     icons = true;
     iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}";
     borderRadius = 10;
-    borderSize = 1;
+    borderSize = 2;
     borderColor = lib.mkForce config.lib.stylix.scheme.withHashtag.base0E;
     defaultTimeout = (builtins.mul 5 1000); # 5s timeout
   };
diff --git a/system/home/waybar.nix b/system/home/waybar.nix
index cf8749e6..bfb11cbf 100644
--- a/system/home/waybar.nix
+++ b/system/home/waybar.nix
@@ -1,5 +1,6 @@
 { config, pkgs, ... }:
 {
+  imports = [ ./avizo.nix ];
   stylix.targets.waybar.enable = false;
   systemd.user.targets.tray.Unit = {
     Description = "Home Manager System Tray";
@@ -12,13 +13,13 @@
     settings.main = {
       name = "main";
       layer = "top";
-      position = "top";
+      position = "left";
       # Layout
       "modules-left" = [
         "hyprland/workspaces"
-        "hyprland/window"
+        "mpris"
       ];
-      "modules-center" = [ "mpris" ];
+      "modules-center" = [ ];
       "modules-right" = [
         "custom/notification"
         "pulseaudio"
@@ -26,7 +27,6 @@
         "bluetooth"
         "clock#calendar"
         "clock"
-        "keyboard-state"
         "backlight"
         "battery"
         "custom/weather"
@@ -87,9 +87,8 @@
         };
       };
       mpris = {
-        "format" = "{player_icon} {status_icon} | {album} - {artist} - {title}";
-        "tooltip-format" = "{player_icon} ({player}) {status_icon} {dynamic}";
-        "title-len" = 64;
+        "format" = "{player_icon}\n{status_icon}";
+        "tooltip-format" = "{player_icon} ({player}) {status_icon}\n{title}\n{album}\n{artist}";
         "interval" = 1;
         "dynamic-order" = [
           "album"
@@ -110,8 +109,8 @@
       };
       pulseaudio = {
         scroll-step = 5;
-        format = "{format_source} {icon} {volume}%";
-        format-muted = "{format_source} 󰝟";
+        format = "{format_source}\n{icon}";
+        # format-muted = "{format_source} {icon}";
         format-source = "󰍬";
         format-source-muted = "󰍭";
         format-icons = {
@@ -121,36 +120,19 @@
             "󰖀"
             "󰕾"
           ];
+          default-muted = "󰝟";
           hands-free = "󰥰";
           headset = "󰋎";
           phone = "󰏲";
           portable = "󰏳";
           headphone = "󰋋";
         };
+        tooltip = true;
+        tooltip-format = "{desc} ({volume}%)";
         on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
-        on-click-right = "${pkgs.pamixer}/bin/pamixer -t";
-        on-scroll-up = "${pkgs.pamixer}/bin/pamixer -i 5";
-        on-scroll-down = "${pkgs.pamixer}/bin/pamixer -d 5";
-      };
-      disk = {
-        format = "󰋊 {percentage_used}%";
-        path = config.home.homeDirectory;
-      };
-      cpu = {
-        format = "󰻠 {usage}%";
-        tooltip = false;
-      };
-      memory = {
-        format = "󰍛 {}%";
-      };
-      temperature = {
-        critical-threshold = 80;
-        format = "{icon} {temperatureC}°C";
-        format-icons = [
-          "󱃃"
-          "󰔏"
-          "󱃂"
-        ];
+        on-click-right = "${config.services.avizo.package}/bin/volumectl %";
+        on-scroll-up = "${config.services.avizo.package}/bin/volumectl -u + 5";
+        on-scroll-down = "${config.services.avizo.package}/bin/volumectl -u - 5";
       };
       network = {
         format-icons = [
@@ -180,7 +162,7 @@
           size = "${toString config.stylix.fonts.sizes.popups}pt";
         in
         {
-          format = "󰃭 {:%Y-%m-%d}";
+          format = "󰃭";
           tooltip-format = "<span size='${size}'>{calendar}</span>";
           calendar = {
             mode = "month";
@@ -203,14 +185,9 @@
             on-scroll-down = "shift_down";
           };
         };
-      clock.format = "󰥔 {:%R}";
-      "keyboard-state" = {
-        capslock = true;
-        format.capslock = "󰪛 :{icon}";
-        format-icons = {
-          locked = "󰌾";
-          unlocked = "󰌿";
-        };
+      clock = {
+        format = "{:%H\n%M}";
+        tooltip = false;
       };
       backlight = {
         format = "{icon}";
@@ -234,10 +211,10 @@
         };
         format = "{icon}";
         format-time = "{H}:{m}";
-        format-charging = "󰂄 ({time})";
+        format-charging = "󰂄";
         format-plugged = "󰚥";
-        format-warning = "{icon}{capacity}%";
-        format-critical = "{icon}{capacity}% ({time})";
+        # format-warning = "{icon}{capacity}%";
+        # format-critical = "{icon}{capacity}% ({time})";
         tooltip-format = "{capacity}% | {power}W | {time}";
         format-icons = [
           "󱃍"
@@ -254,9 +231,10 @@
         ];
       };
       "systemd-failed-units" = {
-        hide-on-ok = false;
-        format = "󰀦 S:{nr_failed_system} U:{nr_failed_user}";
-        format-ok = "󰄬 ";
+        hide-on-ok = true;
+        format = "󰀦";
+        tooltip = true;
+        tooltip-format = "System failed:{nr_failed_system} User failed:{nr_failed_user}";
         system = true;
         user = true;
       };
@@ -268,13 +246,14 @@
         {
           exec = "( ${makoctl} list | ${jq} -e '.data[] | length > 0' >/dev/null && echo '󱅫' ) || echo '󰂚' ";
           format = "{}";
+          tooltip = false;
           on-click = "${makoctl} dismiss -a";
           interval = 3;
         };
       "custom/weather" =
         let
           date-format = "%Y-%m-%d";
-          custom-indicator = "{ICON}{temp_C}°C({FeelsLikeC}°C)";
+          custom-indicator = "{ICON}"; # "{temp_C}°C({FeelsLikeC}°C)";
         in
         {
           format = "{}";
@@ -298,7 +277,7 @@
         * {
             all: unset;
             font-family: ${config.stylix.fonts.monospace.name};
-            font-size: ${toString config.stylix.fonts.sizes.popups}px;
+            font-size: ${toString (config.stylix.fonts.sizes.desktop + 2)}px;
         }
 
         window {
@@ -310,17 +289,18 @@
         window > box {
             color: ${scheme.base05};
             background: alpha(${scheme.base00}, ${toString opacity});
-            margin: 5px 5px 0px;
-            padding: 0px;
+            margin: 5px 0px 5px 5px;
+            padding: 2px;
             border: 1px solid ${scheme.base04};
             border-radius: 10px;
         }
 
         tooltip {
             background: ${scheme.base00};
-            border: 1px solid ${scheme.base0E};
+            border: 2px solid ${scheme.base0E};
             border-radius: 10px;
             box-shadow: none;
+            padding: 10px;
         }
 
         tooltip label {
@@ -338,29 +318,23 @@
         #network,
         #bluetooth,
         #clock,
-        #keyboard-state,
         #backlight,
         #battery,
         #custom-weather,
         #tray {
             margin: 0px;
-            padding: 1px 5px;
+            padding: 2px 4px 2px 3px;
         }
 
-        #workspaces,
-        #window,
-        #tray,
-        #backlight,
-        #battery,
-        #custom-weather {
-            color: ${scheme.base05};
+        #workspaces {
+            background: ${scheme.base00};
+            border-radius: 5px;
+            margin: 3px 2px;
+            padding: 2px 3px;
         }
 
         #workspaces button {
-            background: transparent;
-            color: ${scheme.base05};
-            margin: 0px;
-            padding: 0px 5px;
+            padding: 2px 5px 2px 0px;
         }
         #workspaces button.empty {
             color: ${scheme.base03};
@@ -384,20 +358,23 @@
         }
         #network {
             color: ${scheme.base0A};
+            padding: 2px 6px 2px 1px;
         }
         #bluetooth {
             color: ${scheme.base0B};
         }
         #clock.calendar {
             color: ${scheme.base0C};
+            padding: 2px 4px 2px 2px;
         }
         #clock {
             color: ${scheme.base0D};
-        }
-        #keyboard-state {
-            color: ${scheme.base0E};
+            padding: 2px 1px 2px 2px;
         }
 
+        #backlight {
+            padding: 2px 6px 2px 0px;
+        }
         #battery.warning {
             color: ${scheme.base09};
         }
@@ -409,12 +386,20 @@
             color: ${scheme.base0B};
         }
 
+        #systemd-failed-units {
+            padding: 2px 5px 2px 0px;
+        }
         #systemd-failed-units.ok {
             color: ${scheme.base0B}
         }
         #systemd-failed-units.degraded {
             color: ${scheme.base08}
         }
+
+        #custom-weather,
+        #tray {
+            padding: 2px 2px 2px 3px;
+        }
       '';
   };
 }