diff --git a/modules/graphical/firefox/default.nix b/modules/graphical/firefox/default.nix
index e4038647..0d74e351 100644
--- a/modules/graphical/firefox/default.nix
+++ b/modules/graphical/firefox/default.nix
@@ -65,41 +65,35 @@ in
       { path = ".cache/mozilla"; type = "cache"; }
     ];
     home-manager.users.charlotte = { ... }: {
-      programs = {
-        browserpass = {
-          enable = true;
-          browsers = [ "firefox" ];
-        };
-        firefox = {
-          enable = true;
-          package = ffPackage;
-          profiles.default = {
-            extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-              belgium-eid
-              browserpass
-              decentraleyes
-              ff2mpv
-              ublock-origin
-              umatrix
-              zotero-connector
-            ];
-            settings = {
-              "browser.aboutConfig.showWarning" = false;
-              "browser.contentblocking.category" = "custom";
-              "browser.download.dir" = "/home/charlotte/downloads";
-              "browser.newtabpage.enabled" = false;
-              "browser.safebrowsing.malware.enabled" = false;
-              "browser.safebrowsing.phishing.enabled" = false;
-              "browser.shell.checkDefaultBrowser" = false;
-              "browser.startup.homepage" = "about:blank";
-              "browser.startup.page" = 3;
-              "dom.security.https_only_mode" = true;
-              "network.cookie.cookieBehavior" = 1;
-              "privacy.annotate_channels.strict_list.enabled" = true;
-              "privacy.trackingprotection.enabled" = true;
-              "privacy.trackingprotection.socialtracking.enabled" = true;
-              "security.identityblock.show_extended_validation" = true;
-            };
+      programs.firefox = {
+        enable = true;
+        package = ffPackage;
+        profiles.default = {
+          extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+            belgium-eid
+            decentraleyes
+            ff2mpv
+            keepassxc-browser
+            ublock-origin
+            umatrix
+            zotero-connector
+          ];
+          settings = {
+            "browser.aboutConfig.showWarning" = false;
+            "browser.contentblocking.category" = "custom";
+            "browser.download.dir" = "/home/charlotte/downloads";
+            "browser.newtabpage.enabled" = false;
+            "browser.safebrowsing.malware.enabled" = false;
+            "browser.safebrowsing.phishing.enabled" = false;
+            "browser.shell.checkDefaultBrowser" = false;
+            "browser.startup.homepage" = "about:blank";
+            "browser.startup.page" = 3;
+            "dom.security.https_only_mode" = true;
+            "network.cookie.cookieBehavior" = 1;
+            "privacy.annotate_channels.strict_list.enabled" = true;
+            "privacy.trackingprotection.enabled" = true;
+            "privacy.trackingprotection.socialtracking.enabled" = true;
+            "security.identityblock.show_extended_validation" = true;
           };
         };
       };
diff --git a/modules/graphical/pass/default.nix b/modules/graphical/pass/default.nix
index edcef8c6..331e5ccf 100644
--- a/modules/graphical/pass/default.nix
+++ b/modules/graphical/pass/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   options.chvp.graphical.pass.enable = lib.mkOption {
@@ -7,19 +7,12 @@
   };
 
   config = lib.mkIf config.chvp.graphical.pass.enable {
-    nixpkgs.overlays = [
-      (self: super: {
-        pass = (super.pass.override { pass = super.pass-wayland; }).withExtensions (ext: [ ext.pass-otp ]);
-      })
-    ];
-
     chvp.base.emacs.extraConfig = [
       ''
-        (use-package auth-source-pass
+        (use-package secrets
          :ensure nil
          :custom
-         (auth-sources '(password-store))
-         (auth-source-pass-filename "${config.home-manager.users.charlotte.programs.password-store.settings.PASSWORD_STORE_DIR}")
+         (auth-sources '(default))
          )
       ''
     ];
@@ -30,6 +23,7 @@
         settings = { PASSWORD_STORE_DIR = "/home/charlotte/repos/passwords"; };
       };
       services.password-store-sync.enable = true;
+      home.packages = [ pkgs.keepassxc ];
     };
   };
 }
diff --git a/patches/236258.patch b/patches/236258.patch
deleted file mode 100644
index 55fd4a02..00000000
--- a/patches/236258.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix
-index 83f34e2f066f5..ee774172f9122 100644
---- a/pkgs/tools/security/browserpass/default.nix
-+++ b/pkgs/tools/security/browserpass/default.nix
-@@ -4,6 +4,7 @@
- , fetchFromGitHub
- , gnupg
- , makeWrapper
-+, autoPatchelfHook
- }:
- 
- buildGoModule rec {
-@@ -17,7 +18,7 @@ buildGoModule rec {
-     sha256 = "sha256-UZzOPRRiCUIG7uSSp9AEPMDN/+4cgyK47RhrI8oUx8U=";
-   };
- 
--  nativeBuildInputs = [ makeWrapper ];
-+  nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
- 
-   vendorHash = "sha256-CjuH4ANP2bJDeA+o+1j+obbtk5/NVLet/OFS3Rms4r0=";
-