diff --git a/modules/home-manager/common.nix b/modules/home-manager/common.nix
index 4600d9d..13f8dfe 100644
--- a/modules/home-manager/common.nix
+++ b/modules/home-manager/common.nix
@@ -70,71 +70,6 @@
       source = ./scripts;
       recursive = true;
     };
-
-    ".local/share/scripts/hyprland/start_services.sh" = {
-      executable = true;
-      text = # sh
-        ''
-          #!/bin/sh
-
-          #
-          # Make sure xdg-desktop-portal-hyprland has access to what it needs
-          #
-          dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
-
-          #
-          # Start waybar.
-          #
-          waybar &
-
-          #
-          # Start xwaylandvideobridge
-          #
-          xwaylandvideobridge &
-
-
-          #
-          # Start wallpaper daemon
-          #
-          ~/.local/share/scripts/wallpaper.sh &
-
-          #
-          # Start notification daemon.
-          #
-          mako &
-
-          #
-          # Start polkit agent
-          #
-          ${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1
-
-          #
-          # Start kwallet service
-          #
-          kwalletd6 &
-
-          #
-          # Start kdeconnect daemon
-          #
-          kdeconnectd &
-
-          #
-          # Clipboard manager
-          #
-          wl-paste --type text --watch cliphist store &
-          wl-paste --type image --watch cliphist store &
-
-          #
-          # Start Fcitx5
-          #
-          fcitx5 &
-
-          #
-          # Start the blueman applet for managing bluetooth devices
-          #
-          blueman-applet &
-        '';
-    };
   };
 
   # Configure XDG
diff --git a/modules/home-manager/programs/waybar.nix b/modules/home-manager/programs/waybar.nix
index 6328603..aeeeab2 100644
--- a/modules/home-manager/programs/waybar.nix
+++ b/modules/home-manager/programs/waybar.nix
@@ -69,18 +69,18 @@
 
         memory = {
           interval = 5;
-          format = "   {percentage}%";
+          format = " {percentage}%";
           states = {
             warning = 70;
             critical = 90;
           };
-          "tooltip-format" = "   {used:0.1f}G/{total:0.1f}G";
+          "tooltip-format" = "  {used:0.1f}G/{total:0.1f}G";
         };
 
         cpu = {
           interval = 5;
           tooltip = false;
-          format = "  {usage}%";
+          format = " {usage}%";
           format-alt = " {load}";
           states = {
             warning = 70;
diff --git a/modules/home-manager/scripts/hyprland/start_services.sh b/modules/home-manager/scripts/hyprland/start_services.sh
new file mode 100755
index 0000000..59c3a09
--- /dev/null
+++ b/modules/home-manager/scripts/hyprland/start_services.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+#
+# Make sure xdg-desktop-portal-hyprland has access to what it needs
+#
+dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
+
+#
+# Start waybar.
+#
+waybar &
+
+#
+# Start xwaylandvideobridge
+#
+xwaylandvideobridge &
+
+
+#
+# Start wallpaper daemon
+#
+~/.local/share/scripts/wallpaper.sh &
+
+#
+# Start notification daemon.
+#
+mako &
+
+#
+# Refresh kdeconnect connections
+#
+kdeconnect-cli --refresh &
+
+#
+# Clipboard manager
+#
+wl-paste --type text --watch cliphist store &
+wl-paste --type image --watch cliphist store &
+
+#
+# Start Fcitx5
+#
+fcitx5 &
+
+#
+# Start the blueman applet for managing bluetooth devices
+#
+blueman-applet &
diff --git a/modules/nixos/packages.nix b/modules/nixos/packages.nix
index b4c1ded..0eee06e 100644
--- a/modules/nixos/packages.nix
+++ b/modules/nixos/packages.nix
@@ -29,10 +29,7 @@
   };
 
   # Enable KDEConnect
-  programs.kdeconnect = {
-    enable = true;
-    package = pkgs.kdePackages.kdeconnect-kde;
-  };
+  programs.kdeconnect.enable = true;
 
   # Enable Docker.
   virtualisation.docker.enable = true;
diff --git a/specific/desktop/services/authentication.nix b/specific/desktop/services/authentication.nix
index 64a2b2c..94797f5 100644
--- a/specific/desktop/services/authentication.nix
+++ b/specific/desktop/services/authentication.nix
@@ -4,9 +4,9 @@
   # Enable polkit,
   security.polkit.enable = true;
 
-  # Install a keyring service and manager.
-  environment.systemPackages = with pkgs; [
-    libsForQt5.kwallet
-    libsForQt5.kwalletmanager
-  ];
+  # Install an agent to interface with it.
+  environment.systemPackages = with pkgs; [ polkit_gnome ];
+
+  # And enable GNOME keyring for registering keys.
+  services.gnome.gnome-keyring.enable = true;
 }