diff --git a/home/xin/calcite.nix b/home/xin/calcite.nix
index 220de56..e0b4693 100644
--- a/home/xin/calcite.nix
+++ b/home/xin/calcite.nix
@@ -43,8 +43,14 @@ in
   # Theme
   catppuccin = {
     enable = true;
+    accent = "peach";
     flavor = "mocha";
   };
+  # Missing from catppuccin module
+  services.swaync.style = pkgs.fetchurl {
+    url = "https://github.com/catppuccin/swaync/releases/download/v0.2.3/mocha.css";
+    hash = "sha256-Hie/vDt15nGCy4XWERGy1tUIecROw17GOoasT97kIfc=";
+  };
 
   xdg.enable = true;
 
diff --git a/machines/calcite/network.nix b/machines/calcite/network.nix
index 0df1480..31203ad 100644
--- a/machines/calcite/network.nix
+++ b/machines/calcite/network.nix
@@ -50,4 +50,9 @@
     enable = true;
     package = pkgs.wireshark-qt;
   };
+
+  programs.kdeconnect = {
+    enable = true;
+    package = pkgs.valent;
+  };
 }
diff --git a/modules/home-manager/gui/bwmountains.jpg b/modules/home-manager/gui/bwmountains.jpg
new file mode 100755
index 0000000..41ca976
Binary files /dev/null and b/modules/home-manager/gui/bwmountains.jpg differ
diff --git a/modules/home-manager/gui/default.nix b/modules/home-manager/gui/default.nix
index 57bce02..5528027 100644
--- a/modules/home-manager/gui/default.nix
+++ b/modules/home-manager/gui/default.nix
@@ -1,3 +1,8 @@
+{ config, lib, ... }:
+let
+  inherit (lib) mkOption types;
+  cfg = config.custom-hm.gui;
+in
 {
   imports = [
     ./niri.nix
@@ -5,4 +10,11 @@
     ./gtklock.nix
     ./waybar.nix
   ];
+
+  options.custom-hm.gui = {
+    wallpaper = mkOption {
+      type = types.path;
+      default = ./bwmountains.jpg;
+    };
+  };
 }
diff --git a/modules/home-manager/gui/fuzzel.nix b/modules/home-manager/gui/fuzzel.nix
index 0a90bd7..3b4e880 100644
--- a/modules/home-manager/gui/fuzzel.nix
+++ b/modules/home-manager/gui/fuzzel.nix
@@ -21,6 +21,7 @@ in
           fields = "filename,name,exec,generic";
       	  y-margin = 30;
           width = 40;
+          font = "Ubuntu";
           use-bold = true;
           line-height = 30;
         };
diff --git a/modules/home-manager/gui/gtklock.nix b/modules/home-manager/gui/gtklock.nix
index 5ba6a22..69b3ce9 100644
--- a/modules/home-manager/gui/gtklock.nix
+++ b/modules/home-manager/gui/gtklock.nix
@@ -62,7 +62,14 @@ in
           str
           path
         ];
-        default = "";
+        default = pkgs.writeText "gtklock-style.css" ''
+          window {
+            background-image: url("${config.custom-hm.gui.wallpaper}");
+            background-size: cover;
+            background-repeat: no-repeat;
+            background-position: center;
+          }
+        '';
         description = ''
           The css file to be used for gtklock.
         '';
@@ -79,7 +86,9 @@ in
 
       modules = mkOption {
         type = listOf (either package str);
-        default = [ ];
+        default = [
+          # "${pkgs.gtklock-playerctl-module.outPath}/lib/gtklock/playerctl-module.so"
+        ];
         description = ''
           A list of gtklock modulesto use. Can either be packages, absolute paths, or strings.
         '';
diff --git a/modules/home-manager/gui/niri.nix b/modules/home-manager/gui/niri.nix
index 9db2265..8eb07b6 100644
--- a/modules/home-manager/gui/niri.nix
+++ b/modules/home-manager/gui/niri.nix
@@ -7,10 +7,7 @@
 let
   inherit (lib) mkIf mkEnableOption getExe;
   cfg = config.custom-hm.gui.niri;
-  wallpaper = pkgs.fetchurl {
-    url = "https://github.com/NixOS/nixos-artwork/blob/master/wallpapers/nixos-wallpaper-catppuccin-mocha.png?raw=true";
-    hash = "sha256-fmKFYw2gYAYFjOv4lr8IkXPtZfE1+88yKQ4vjEcax1s=";
-  };
+  wallpaper = config.custom-hm.gui.wallpaper;
   xwayland-satellite = pkgs.xwayland-satellite.overrideAttrs (drv: rec {
     src = pkgs.fetchFromGitHub {
       owner = "Supreeeme";
@@ -69,21 +66,14 @@ in
       };
     };
 
+    services.swaync = {
+      enable = true;
+    };
+
     custom-hm.gui.gtklock = {
       enable = true;
       config = {
         gtk-theme = "Catppuccin-GTK-Dark";
-        # style = pkgs.writeText "gtklock-style.css" ''
-        #   window {
-        #     background-size: cover;
-        #     background-repeat: no-repeat;
-        #     background-position: center;
-        #   }
-        # '';
-        # modules = [
-        #   "${pkgs.gtklock-playerctl-module}/lib/gtklock/playerctl-module.so"
-        #   "${pkgs.gtklock-userinfo-module}/lib/gtklock/userinfo-module.so"
-        # ];
       };
     };
 
@@ -93,10 +83,6 @@ in
       swayidle = {
         enable = true;
         timeouts = [
-          # {
-          #   timeout = 300;
-          #   command = "/run/
-          # }
           {
             timeout = 900;
             command = "/run/current-system/systemd/bin/systemctl suspend";
diff --git a/modules/home-manager/gui/waybar.css b/modules/home-manager/gui/waybar.css
index 6a5da1d..eaed007 100644
--- a/modules/home-manager/gui/waybar.css
+++ b/modules/home-manager/gui/waybar.css
@@ -49,7 +49,8 @@ window#waybar {
 #network,
 #backlight,
 #battery,
-#tray {
+#tray,
+#custom-notification {
   margin-right: 15px;
 }
 #clock {
diff --git a/modules/home-manager/gui/waybar.nix b/modules/home-manager/gui/waybar.nix
index 2162b2e..3890a00 100644
--- a/modules/home-manager/gui/waybar.nix
+++ b/modules/home-manager/gui/waybar.nix
@@ -57,6 +57,8 @@ in
             "battery"
             "custom/separator"
             "tray"
+            "custom/separator"
+            "custom/notification"
           ];
           "niri/workspaces" = {
             all-outputs = true;
@@ -158,6 +160,27 @@ in
             icon-size = 18;
             spacing = 14;
           };
+
+          "custom/notification" = {
+            escape = true;
+            exec = "swaync-client -swb";
+            exec-if = "which swaync-client";
+            format = "{icon}";
+            format-icons = {
+              dnd-inhibited-none = "";
+              dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
+              dnd-none = "";
+              dnd-notification = "<span foreground='red'><sup></sup></span>";
+              inhibited-none = "";
+              inhibited-notification = "<span foreground='red'><sup></sup></span>";
+              none = "";
+              notification = "<span foreground='red'><sup></sup></span>";
+            };
+            on-click = "swaync-client -t -sw";
+            on-click-right = "swaync-client -d -sw";
+            return-type = "json";
+            tooltip = false;
+          };
         };
       };
       systemd.enable = true;