diff --git a/.gitignore b/.gitignore
index b2be92b..726d2d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 result
+.direnv
diff --git a/common/style/stylix.nix b/common/style/stylix.nix
index 8da06bf..ac9f89e 100644
--- a/common/style/stylix.nix
+++ b/common/style/stylix.nix
@@ -37,7 +37,7 @@
       };
 
       emoji = {
-        package = pkgs.noto-fonts-emoji;
+        package = pkgs.noto-fonts-color-emoji;
         name = "Noto Color Emoji";
       };
     };
diff --git a/flake.nix b/flake.nix
index 828473c..7aa92fc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -122,10 +122,12 @@
     homeConfigurations = {
       "kdb424@cubert" = mkHome [./home-manager/machines/cubert.nix] nixpkgs.legacyPackages.aarch64-darwin;
       "kdb424@farnsworth" = mkHome [./home-manager/machines/headless.nix] nixpkgs.legacyPackages.aarch64-linux;
-      "kdb424@zapp" = mkHome [
-        stylix.homeManagerModules.stylix
-        ./home-manager/machines/headless.nix
-      ] nixpkgs.legacyPackages.x86_64-linux;
+      "kdb424@zapp" =
+        mkHome [
+          stylix.homeManagerModules.stylix
+          ./home-manager/machines/headless.nix
+        ]
+        nixpkgs.legacyPackages.x86_64-linux;
     };
   };
 
diff --git a/home-manager/modules/hyprland.nix b/home-manager/modules/hyprland.nix
index 050ea2c..25c8d9b 100644
--- a/home-manager/modules/hyprland.nix
+++ b/home-manager/modules/hyprland.nix
@@ -39,7 +39,7 @@
 
     general = {
       gaps_in = 5;
-      gaps_out = 16;
+      gaps_out = 8;
       resize_on_border = true;
       hover_icon_on_border = false;
       layout = "master";
diff --git a/home-manager/modules/waybar.nix b/home-manager/modules/waybar.nix
index 1abef3b..0244595 100644
--- a/home-manager/modules/waybar.nix
+++ b/home-manager/modules/waybar.nix
@@ -17,116 +17,178 @@
     else if osConfig.networking.hostName == "amy"
     then "/sys/class/hwmon/hwmon4/temp1_input"
     else "";
-
+  colors = config.lib.stylix.colors.withHashtag;
+  primaryColor = colors.base04;
+  altColor = colors.base0C;
 in {
-  programs.waybar.enable = true;
+  programs.waybar = {
+    enable = true;
 
-  programs.waybar.settings = {
-    mainBar = {
-      layer = "top";
-      position = "top";
-      height = 24;
-      modules-left = ["hyprland/workspaces" "wlr/taskbar"];
-      modules-center = ["hyprland/window" "gamemode"];
-      modules-right = ["network" "pulseaudio" "disk" "cpu" "temperature" "memory" "battery" "tray" "clock"];
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        height = 24;
+        spacing = 8;
+        margin = "2px 2px 0px 2px";
+        modules-left = ["hyprland/workspaces"];
+        modules-center = ["hyprland/window" "gamemode"];
+        modules-right = ["network" "cpu" "temperature" "memory" "disk" "pulseaudio" "battery" "tray" "clock" "privacy"];
 
-      "hyprland/workspaces" = {
-        sort-by-number = true;
-        on-click = "activate";
-        format = "{icon}";
-        persistent-workspaces = {
-          "1" = "[]";
-          "2" = "[]";
-          "3" = "[]";
-          "4" = "[]";
+        "hyprland/window" = {
+          format = "<span color='${primaryColor}'>{}</span>";
         };
-        format-icons = {
-          "urgent" = "";
-          "active" = "";
-          "default" = "";
+
+        "hyprland/workspaces" = {
+          sort-by-number = true;
+          on-click = "activate";
+          format = "{icon}";
+          persistent-workspaces = {
+            "1" = "[]";
+            "2" = "[]";
+            "3" = "[]";
+            "4" = "[]";
+          };
+          format-icons = {
+            "urgent" = "<span color='${colors.base08}'></span>";
+            "active" = "<span color='${colors.base0C}'></span>";
+            "default" = "<span color='${primaryColor}'></span>";
+          };
         };
-      };
 
-      "tray"."spacing" = 2;
+        "tray"."spacing" = 2;
 
-      "clock" = {
-        format = " {:%a %b %d %R}";
-      };
-
-      "cpu" = {
-        "interval" = 2;
-        "format" = "{usage}%  {avg_frequency}GHz";
-        "on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.bottom}/bin/btm";
-      };
-
-      "battery" = {
-        "bat" = "BAT0";
-        "states" = {
-          "good" = 95;
-          "warning" = 30;
-          "critical" = 15;
+        "clock" = {
+          format = "<span color='${primaryColor}'> {:%R} </span>";
+          "format-alt" = "<span color='${primaryColor}'> {:%a, %b %d, %Y %R} </span>";
+          "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='${colors.base0D}'><b>{}</b></span>";
+              "days" = "<span color='${colors.base05}'><b>{}</b></span>";
+              "weeks" = "<span color='${colors.base03}'><b>W{}</b></span>";
+              "weekdays" = "<span color='${colors.base05}'><b>{}</b></span>";
+              "today" = "<span color='${primaryColor}'><b><u>{}</u></b></span>";
+            };
+          };
+          "actions" = {
+            "on-click-right" = "mode";
+            "on-scroll-up" = "shift_up";
+            "on-scroll-down" = "shift_down";
+          };
         };
-        "format" = "{capacity}% {icon} ";
-        "format-full" = "";
-        "format-icons" = ["" "" "" "" ""];
-      };
 
-      "memory" = {
-        "format" = "{used:0.1f}G/{total:0.1f}G  ";
-        "on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.bottom}/bin/btm";
-      };
-
-      "disk" = {
-        "format" = "{used}/{total} ";
-        "path" = "/";
-      };
-
-      "network" = {
-        "interface" = "${networkInterface.eth}";
-        "interval" = 2;
-        "format-ethernet" = "Up: {bandwidthUpBits} Down: {bandwidthDownBits}  ";
-        "tooltip-format-ethernet" = "{ifname}  ";
-        "format-wifi" = "Up: {bandwidthUpBits} Down: {bandwidthDownBits} {essid} ({signalStrength}%)  ";
-        "tooltip-format-wifi" = "{ifname} {essid} ({signalStrength}%) ";
-        "format-disconnected" = "Disconnected ⚠";
-        "on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.networkmanager}/bin/nmtui";
-      };
-
-      "pulseaudio" = {
-        "format" = "{volume}% {icon} ";
-        "format-bluetooth" = "{volume}% {icon} ";
-        "format-muted" = "";
-        "format-icons" = {
-          "headphones" = "";
-          "handsfree" = "";
-          "headset" = "";
-          "phone" = "";
-          "portable" = "";
-          "car" = "";
-          "default" = ["" ""];
+        "cpu" = {
+          "interval" = 2;
+          "format" = "<span color='${altColor}'>{usage}%  {avg_frequency}GHz</span>";
+          "on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.bottom}/bin/btm";
         };
-        "on-click" = "${pkgs.pavucontrol}/bin/pavucontrol";
-      };
 
-      "temperature" = {
-        "hwmon-path" = "${hwmon}";
-        "format" = "{}°C";
-        "critical-threshold" = 80;
-        "on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.bottom}/bin/btm";
-      };
+        "battery" = {
+          "bat" = "BAT0";
+          "states" = {
+            "good" = 95;
+            "warning" = 30;
+            "critical" = 15;
+          };
+          "format" = "<span color='${primaryColor}'>{capacity}% </span>{icon}";
+          "format-full" = "";
+          "format-icons" = [
+            "<span color='${colors.base08}'></span>"
+            "<span color='${colors.base09}'></span>"
+            "<span color='${colors.base09}'></span>"
+            "<span color='${primaryColor}'></span>"
+            "<span color='${primaryColor}'></span>"
+          ];
+        };
 
-      "gamemode" = {
-        "format" = "{glyph}";
-        "format-alt" = "{glyph} {count}";
-        "glyph" = "";
-        "hide-not-running" = true;
-        "use-icon" = true;
-        "icon-name" = "input-gaming-symbolic";
-        "icon-spacing" = 4;
-        "icon-size" = 20;
-        "tooltip" = true;
-        "tooltip-format" = "Games running: {count}";
+        "memory" = {
+          "format" = "<span color='${altColor}'>{used:0.1f}G/{total:0.1f}G </span>";
+          "on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.bottom}/bin/btm";
+        };
+
+        "disk" = {
+          "format" = "<span color='${primaryColor}'>{used}/{total} </span>";
+          "path" = "/";
+        };
+
+        "network" = {
+          "interface" = "${networkInterface.eth}";
+          "interval" = 2;
+          "format-ethernet" = "<span color='${primaryColor}'>Up: {bandwidthUpBits} Down: {bandwidthDownBits} </span>";
+          "tooltip-format-ethernet" = "<span color='${primaryColor}'>{ifname} </span>";
+          "format-wifi" = "<span color='${primaryColor}'>Up: {bandwidthUpBits} Down: {bandwidthDownBits} {essid} ({signalStrength}%) </span>";
+          "tooltip-format-wifi" = "<span color='${primaryColor}'>{ifname} {essid} ({signalStrength}%) </span>";
+          "format-disconnected" = "<span color='${primaryColor}'>Disconnected ⚠</span>";
+          "on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.networkmanager}/bin/nmtui";
+        };
+
+        "pulseaudio" = {
+          "format" = "<span color='${altColor}'>{volume}% {icon}</span>";
+          "format-bluetooth" = "<span color='${altColor}'>{volume}% {icon}</span>";
+          "format-muted" = "<span color='${altColor}'></span>";
+          "format-icons" = {
+            "headphones" = "<span color='${altColor}'></span>";
+            "handsfree" = "<span color='${altColor}'></span>";
+            "headset" = "<span color='${altColor}'></span>";
+            "phone" = "<span color='${altColor}'></span>";
+            "portable" = "<span color='${altColor}'></span>";
+            "car" = "<span color='${altColor}'></span>";
+            "default" = [
+              "<span color='${altColor}'></span>"
+              "<span color='${altColor}'></span>"
+            ];
+          };
+          "on-click" = "${pkgs.pavucontrol}/bin/pavucontrol";
+        };
+
+        "temperature" = {
+          "hwmon-path" = "${hwmon}";
+          "format" = "<span color='${primaryColor}'>{}°C</span>";
+          "critical-threshold" = 80;
+          "on-click" = "${pkgs.alacritty}/bin/alacritty -e ${pkgs.bottom}/bin/btm";
+        };
+
+        "gamemode" = {
+          "format" = "<span color='${primaryColor}'>{glyph}</span>";
+          "format-alt" = "<span color='${primaryColor}'>{glyph} {count}</span>";
+          "glyph" = "<span color='${primaryColor}'></span>";
+          "hide-not-running" = true;
+          "use-icon" = true;
+          "icon-name" = "input-gaming-symbolic";
+          "icon-spacing" = 4;
+          "icon-size" = 20;
+          "tooltip" = true;
+          "tooltip-format" = "<span color='${primaryColor}'>Games running: {count}</span>";
+        };
+        "privacy" = {
+          "icon-size" = 20;
+          "icon-spacing" = 4;
+          "transition-duration" = 250;
+          "modules" = [
+            {
+              "type" = "screenshare";
+              "tooltip" = true;
+              "tooltip-icon-size" = 24;
+            }
+            {
+              "type" = "audio-in";
+              "tooltip" = true;
+              "tooltip-icon-size" = 24;
+            }
+          ];
+        };
       };
     };
+    style = ''
+      window#waybar {
+        border-radius: 5px;
+      }
+    '';
   };
 }