diff --git a/modules/autostart.nix b/modules/autostart.nix
index 4cb3147..f0274e8 100644
--- a/modules/autostart.nix
+++ b/modules/autostart.nix
@@ -4,15 +4,14 @@
   #   Temporary workaround until https://github.com/nix-community/home-manager/issues/3447 is merged.
 
   home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
-#    home.file."keepassxc" = {
-#      target = ".config/autostart/org.keepassxc.KeePassXC.desktop";
-#      source = (pkgs.keepassxc + "/share/applications/org.keepassxc.KeePassXC.desktop");
-#    };
-
-    home.file."gnome-secrets" = {
-      target = ".config/autostart/org.gnome.World.Secrets.desktop";
-      source = (pkgs.gnome-secrets + "/share/applications/org.gnome.World.Secrets.desktop");
+   home.file."keepassxc" = {
+     target = ".config/autostart/org.keepassxc.KeePassXC.desktop";
+     source = (pkgs.keepassxc + "/share/applications/org.keepassxc.KeePassXC.desktop");
     };
+    # home.file."gnome-secrets" = {
+    #   target = ".config/autostart/org.gnome.World.Secrets.desktop";
+    #   source = (pkgs.gnome-secrets + "/share/applications/org.gnome.World.Secrets.desktop");
+    # };
 
     home.file."signal-desktop" = lib.mkIf (osConfig.networking.hostName == "yodaTux") {
       target = ".config/autostart/" + pkgs.signal-desktop.pname + ".desktop";
diff --git a/modules/programs.nix b/modules/programs.nix
index 4e4e4d2..fb9a26e 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -32,8 +32,8 @@
 
       # Graphical apps
 
-      gnome-secrets # Password manager (Native Wayland client)
-      #keepassxc # Password manager
+      #gnome-secrets # Password manager (Native Wayland client), but very slow.
+      keepassxc # Password manager. TODO Wayland: Maybe QT_QPA_PLATFORM defined in ghostwriter.nix fixed blurry fonts?
       tartube-yt-dlp # Video downloader (front-end for yt-dlp)
       joplin-desktop # Markdown notes
       rnote # Handwritten notes