diff --git a/scripts/_diffr b/scripts/_diffr
old mode 100755
new mode 100644
diff --git a/scripts/_sway_idle_toggle b/scripts/_sway_idle_toggle
old mode 100755
new mode 100644
diff --git a/scripts/bmenu b/scripts/bmenu
old mode 100755
new mode 100644
diff --git a/scripts/br b/scripts/br
old mode 100755
new mode 100644
diff --git a/scripts/default.nix b/scripts/default.nix
index 47aaac5..799403e 100644
--- a/scripts/default.nix
+++ b/scripts/default.nix
@@ -1,32 +1,34 @@
 (
   final: prev:
+  with prev;
   let
-    lib = prev.lib;
-
-    importScript = (_: path: import (path) { inherit (final) pkgs lib; });
-    wrapScript =
+    import_script = (_: path: import (path) { inherit pkgs lib; });
+    create_script = (
       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);
+      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);
 
-    myPass = final.pass.withExtensions (ex: with ex; [ pass-otp ]);
+    pass = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
   in
-  with final;
-  createScripts {
+  create_scripts {
     br = [ ];
     bmenu = [
-      bemenu
-      dhist
+      final.bemenu
+      final.dhist
       fish
       j4-dmenu-desktop
       jq
@@ -42,21 +44,21 @@
       fish
     ];
     _diffr = [ diffr ];
-    _thunar-terminal = [ terminal ];
-    _sway_idle_toggle = [ swayidle ];
+    _thunar-terminal = [ final.terminal ];
+    _sway_idle_toggle = [ final.swayidle ];
     kak-pager = [
       fish
-      _diffr
+      final._diffr
     ];
-    kak-man-pager = [ kak-pager ];
+    kak-man-pager = [ final.kak-pager ];
     helix-pager = [
       fish
-      _diffr
+      final._diffr
     ];
-    helix-man-pager = [ helix-pager ];
+    helix-man-pager = [ final.helix-pager ];
     musmenu = [
       mpc-cli
-      wdmenu
+      final.wdmenu
       trash-cli
       xdg-user-dirs
       libnotify
@@ -69,12 +71,11 @@
     pass-export = [
       pass2csv
       gnupg
-      sd
     ];
     wpass = [
-      wdmenu
+      final.wdmenu
       fd
-      myPass
+      pass
       sd
       wl-clipboard
       wtype
@@ -95,7 +96,7 @@
     pulse_sink = [
       pulseaudio
       pamixer
-      wdmenu
+      final.wdmenu
     ];
     color_picker = [
       grim
@@ -107,13 +108,13 @@
     dzadd = [
       procps
       libnotify
-      wdmenu
+      final.wdmenu
       jq
       mpv
       pqiv
       python3Packages.deemix
       mpc-cli
-      mpdDup
+      final.mpdDup
     ];
     mpdDup = [
       mpc-cli
@@ -127,15 +128,15 @@
     auto_connect_gamepad = [
       bluez
       coreutils
-      gnugrep
+      final.gnugrep
     ];
     powerplay-led-idle = [
-      bash
+      final.bash
       libinput
       libratbag
     ];
   }
-  // lib.mapAttrs importScript {
+  // lib.mapAttrs import_script {
     wdmenu = ./wdmenu.nix;
     wlauncher = ./wlauncher.nix;
     _gpg-unlock = ./_gpg-unlock.nix;
diff --git a/scripts/helix-pager b/scripts/helix-pager
old mode 100755
new mode 100644
diff --git a/scripts/kak-pager b/scripts/kak-pager
old mode 100755
new mode 100644
diff --git a/scripts/pass-export b/scripts/pass-export
index 27596fc..658f803 100755
--- a/scripts/pass-export
+++ b/scripts/pass-export
@@ -8,6 +8,3 @@ 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 100755
new mode 100644
diff --git a/scripts/powerplay-led-idle b/scripts/powerplay-led-idle
index 888abde..a99905e 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=$(( 6 * 60))
+SECONDS_UNTIL_OFF=$(( 5 * 60))
 
 COLOR_ON=ff0000
 COLOR_FADE=880000
diff --git a/scripts/pulse_sink b/scripts/pulse_sink
old mode 100755
new mode 100644
diff --git a/scripts/screenshotsh b/scripts/screenshotsh
old mode 100755
new mode 100644
diff --git a/scripts/showkeys b/scripts/showkeys
old mode 100755
new mode 100644
diff --git a/scripts/terminal b/scripts/terminal
old mode 100755
new mode 100644
diff --git a/scripts/wl-copy-file b/scripts/wl-copy-file
old mode 100755
new mode 100644
diff --git a/scripts/wpass b/scripts/wpass
old mode 100755
new mode 100644
diff --git a/user/firefox.nix b/user/firefox.nix
index 48c4fc9..b23616a 100644
--- a/user/firefox.nix
+++ b/user/firefox.nix
@@ -124,53 +124,10 @@ in
             "devtools.chrome.enabled" = true;
             "devtools.debugger.remote-enabled" = true;
           };
-          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;
-                }
-              '';
+          userChrome = lib.mkIf (desktop == "sway") ''
+            #titlebar { display: none !important; }
+            #sidebar-header { display: none !important; }
+          '';
         };
       };
     };
diff --git a/user/gnome.nix b/user/gnome.nix
index 443f1fe..e5ef257 100644
--- a/user/gnome.nix
+++ b/user/gnome.nix
@@ -34,7 +34,7 @@ lib.mkIf (config.my.desktop == "gnome") {
     foliate
     amberol
     pitivi
-    keepassxc
+    gnome-passwordsafe
 
     libsForQt5.qt5ct
     libsForQt5.qtstyleplugin-kvantum
@@ -42,6 +42,10 @@ 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 e606b4f..30f556e 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -42,7 +42,6 @@
     ./xdg-dirs.nix
     inputs.nix-index-database.hmModules.nix-index
     ../settings
-    ./powerplay-led-idle.nix
   ];
 
   my = import ./variables.nix;
diff --git a/user/sway/default.nix b/user/sway/default.nix
index a8ed460..af61969 100644
--- a/user/sway/default.nix
+++ b/user/sway/default.nix
@@ -23,6 +23,7 @@ in
     ./swayidle.nix
     ./swaylock.nix
     ./theme.nix
+    ./powerplay-led-idle.nix
   ];
   config = lib.mkIf (config.my.desktop == "sway") {
     services.mako.enable = true;
diff --git a/user/powerplay-led-idle.nix b/user/sway/powerplay-led-idle.nix
similarity index 88%
rename from user/powerplay-led-idle.nix
rename to user/sway/powerplay-led-idle.nix
index a34990e..a6aa3e0 100644
--- a/user/powerplay-led-idle.nix
+++ b/user/sway/powerplay-led-idle.nix
@@ -11,7 +11,7 @@
       Restart = "on-failure";
     };
     Install = {
-      WantedBy = [ "graphical-session.target" ];
+      WantedBy = [ "sway-session.target" ];
     };
   };
 }