diff --git a/scripts/_diffr b/scripts/_diffr
old mode 100644
new mode 100755
diff --git a/scripts/_sway_idle_toggle b/scripts/_sway_idle_toggle
old mode 100644
new mode 100755
diff --git a/scripts/bmenu b/scripts/bmenu
old mode 100644
new mode 100755
diff --git a/scripts/br b/scripts/br
old mode 100644
new mode 100755
diff --git a/scripts/default.nix b/scripts/default.nix
index 799403e..47aaac5 100644
--- a/scripts/default.nix
+++ b/scripts/default.nix
@@ -1,34 +1,32 @@
 (
   final: prev:
-  with prev;
   let
-    import_script = (_: path: import (path) { inherit pkgs lib; });
-    create_script = (
-      name: text: runtimeInputs:
-      let
-        script_body = pkgs.writeTextFile {
-          inherit name;
-          executable = true;
-          text = ''
-            ${builtins.readFile text}
-          '';
-        };
-      in
-      (pkgs.writeShellApplication {
-        inherit name runtimeInputs;
-        text = ''exec ${script_body} "$@"'';
-        checkPhase = "";
-      })
-    );
-    create_scripts = lib.mapAttrs (name: deps: create_script name ./${name} deps);
+    lib = prev.lib;
 
-    pass = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
+    importScript = (_: path: import (path) { inherit (final) pkgs lib; });
+    wrapScript =
+      name: text: runtimeInputs:
+      final.runCommand name
+        {
+          nativeBuildInputs = [ final.makeWrapper ];
+          meta.mainProgram = name;
+        }
+        ''
+          mkdir -p $out/bin
+          cp ${text} $out/bin/${name}
+          wrapProgram $out/bin/${name} \
+              --suffix PATH : ${lib.makeBinPath runtimeInputs}
+        '';
+    createScripts = lib.mapAttrs (name: deps: wrapScript name ./${name} deps);
+
+    myPass = final.pass.withExtensions (ex: with ex; [ pass-otp ]);
   in
-  create_scripts {
+  with final;
+  createScripts {
     br = [ ];
     bmenu = [
-      final.bemenu
-      final.dhist
+      bemenu
+      dhist
       fish
       j4-dmenu-desktop
       jq
@@ -44,21 +42,21 @@
       fish
     ];
     _diffr = [ diffr ];
-    _thunar-terminal = [ final.terminal ];
-    _sway_idle_toggle = [ final.swayidle ];
+    _thunar-terminal = [ terminal ];
+    _sway_idle_toggle = [ swayidle ];
     kak-pager = [
       fish
-      final._diffr
+      _diffr
     ];
-    kak-man-pager = [ final.kak-pager ];
+    kak-man-pager = [ kak-pager ];
     helix-pager = [
       fish
-      final._diffr
+      _diffr
     ];
-    helix-man-pager = [ final.helix-pager ];
+    helix-man-pager = [ helix-pager ];
     musmenu = [
       mpc-cli
-      final.wdmenu
+      wdmenu
       trash-cli
       xdg-user-dirs
       libnotify
@@ -71,11 +69,12 @@
     pass-export = [
       pass2csv
       gnupg
+      sd
     ];
     wpass = [
-      final.wdmenu
+      wdmenu
       fd
-      pass
+      myPass
       sd
       wl-clipboard
       wtype
@@ -96,7 +95,7 @@
     pulse_sink = [
       pulseaudio
       pamixer
-      final.wdmenu
+      wdmenu
     ];
     color_picker = [
       grim
@@ -108,13 +107,13 @@
     dzadd = [
       procps
       libnotify
-      final.wdmenu
+      wdmenu
       jq
       mpv
       pqiv
       python3Packages.deemix
       mpc-cli
-      final.mpdDup
+      mpdDup
     ];
     mpdDup = [
       mpc-cli
@@ -128,15 +127,15 @@
     auto_connect_gamepad = [
       bluez
       coreutils
-      final.gnugrep
+      gnugrep
     ];
     powerplay-led-idle = [
-      final.bash
+      bash
       libinput
       libratbag
     ];
   }
-  // lib.mapAttrs import_script {
+  // lib.mapAttrs importScript {
     wdmenu = ./wdmenu.nix;
     wlauncher = ./wlauncher.nix;
     _gpg-unlock = ./_gpg-unlock.nix;
diff --git a/scripts/helix-pager b/scripts/helix-pager
old mode 100644
new mode 100755
diff --git a/scripts/kak-pager b/scripts/kak-pager
old mode 100644
new mode 100755
diff --git a/scripts/pass-export b/scripts/pass-export
index 658f803..27596fc 100755
--- a/scripts/pass-export
+++ b/scripts/pass-export
@@ -8,3 +8,6 @@ pass2csv "$PASSWORD_STORE_DIR" "$HOME/passwords.csv" \
   -f User '(user|login)(:\s*)?' \
   -f TOTP 'otpauth(:)?' \
   -f URL 'url(:\s*)?'
+
+# Fix TOTP format for keepass
+sd '"//totp/.*?secret=(.*?)(&.*?)?"' '"$1"' "$HOME/passwords.csv"
\ No newline at end of file
diff --git a/scripts/playerctl-status b/scripts/playerctl-status
old mode 100644
new mode 100755
diff --git a/scripts/powerplay-led-idle b/scripts/powerplay-led-idle
index a99905e..888abde 100755
--- a/scripts/powerplay-led-idle
+++ b/scripts/powerplay-led-idle
@@ -4,7 +4,7 @@ set -e
 
 # Constants
 SECONDS_UNTIL_FADE=$(( 1 * 60))
-SECONDS_UNTIL_OFF=$(( 5 * 60))
+SECONDS_UNTIL_OFF=$(( 6 * 60))
 
 COLOR_ON=ff0000
 COLOR_FADE=880000
diff --git a/scripts/pulse_sink b/scripts/pulse_sink
old mode 100644
new mode 100755
diff --git a/scripts/screenshotsh b/scripts/screenshotsh
old mode 100644
new mode 100755
diff --git a/scripts/showkeys b/scripts/showkeys
old mode 100644
new mode 100755
diff --git a/scripts/terminal b/scripts/terminal
old mode 100644
new mode 100755
diff --git a/scripts/wl-copy-file b/scripts/wl-copy-file
old mode 100644
new mode 100755
diff --git a/scripts/wpass b/scripts/wpass
old mode 100644
new mode 100755
diff --git a/user/firefox.nix b/user/firefox.nix
index b23616a..48c4fc9 100644
--- a/user/firefox.nix
+++ b/user/firefox.nix
@@ -124,10 +124,53 @@ in
             "devtools.chrome.enabled" = true;
             "devtools.debugger.remote-enabled" = true;
           };
-          userChrome = lib.mkIf (desktop == "sway") ''
-            #titlebar { display: none !important; }
-            #sidebar-header { display: none !important; }
-          '';
+          userChrome =
+            if desktop == "sway" then
+              ''
+                #titlebar { display: none !important; }
+                #sidebar-header { display: none !important; }
+              ''
+            else
+              ''
+                /* Element | chrome://browser/content/browser.xhtml */
+
+                #navigator-toolbox {
+                  display: grid;
+                  grid-template-columns: 1fr 50px;
+                  overflow: hidden;
+                }
+
+                /* Element | chrome://browser/content/browser.xhtml */
+
+                #nav-bar {
+                  flex: 1;
+                  width: 100%;
+                  grid-column: 1 / 3;
+                  grid-row: 1;
+                  z-index: 0;
+                  padding-right: 29px !important;
+                }
+
+                /* Element | chrome://browser/content/browser.xhtml */
+
+                .toolbar-items {
+                  display: none;
+                }
+
+                /* Element | chrome://browser/content/browser.xhtml */
+
+                #TabsToolbar {
+                  max-width: 50px;
+                }
+
+                /* Element | chrome://browser/content/browser.xhtml */
+
+                #titlebar {
+                  max-width: 50px;
+                  grid-area: 1 / 2;
+                  z-index: 10;
+                }
+              '';
         };
       };
     };
diff --git a/user/gnome.nix b/user/gnome.nix
index e5ef257..443f1fe 100644
--- a/user/gnome.nix
+++ b/user/gnome.nix
@@ -34,7 +34,7 @@ lib.mkIf (config.my.desktop == "gnome") {
     foliate
     amberol
     pitivi
-    gnome-passwordsafe
+    keepassxc
 
     libsForQt5.qt5ct
     libsForQt5.qtstyleplugin-kvantum
@@ -42,10 +42,6 @@ lib.mkIf (config.my.desktop == "gnome") {
     qt6Packages.qtstyleplugin-kvantum
   ];
 
-  home.sessionVariables = {
-    QT_QPA_PLATFORMTHEME = "qt5ct";
-  };
-
   services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
 
   xdg.defaultApplications = {
diff --git a/user/home.nix b/user/home.nix
index 30f556e..e606b4f 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -42,6 +42,7 @@
     ./xdg-dirs.nix
     inputs.nix-index-database.hmModules.nix-index
     ../settings
+    ./powerplay-led-idle.nix
   ];
 
   my = import ./variables.nix;
diff --git a/user/sway/powerplay-led-idle.nix b/user/powerplay-led-idle.nix
similarity index 88%
rename from user/sway/powerplay-led-idle.nix
rename to user/powerplay-led-idle.nix
index a6aa3e0..a34990e 100644
--- a/user/sway/powerplay-led-idle.nix
+++ b/user/powerplay-led-idle.nix
@@ -11,7 +11,7 @@
       Restart = "on-failure";
     };
     Install = {
-      WantedBy = [ "sway-session.target" ];
+      WantedBy = [ "graphical-session.target" ];
     };
   };
 }
diff --git a/user/sway/default.nix b/user/sway/default.nix
index af61969..a8ed460 100644
--- a/user/sway/default.nix
+++ b/user/sway/default.nix
@@ -23,7 +23,6 @@ in
     ./swayidle.nix
     ./swaylock.nix
     ./theme.nix
-    ./powerplay-led-idle.nix
   ];
   config = lib.mkIf (config.my.desktop == "sway") {
     services.mako.enable = true;