diff --git a/.config/environment b/.config/environment
index 7a3a2b5..6ba4ebc 100644
--- a/.config/environment
+++ b/.config/environment
@@ -48,6 +48,8 @@ export TIME_STYLE="long-iso"
 
 export VIMINIT="if has('nvim') | source $XDG_CONFIG_HOME/nvim/init.lua | else | source $XDG_CONFIG_HOME/vim/vimrc | endif"
 
+export XDG_DATA_DIRS="$XDG_CONFIG_HOME/xdg-data:$XDG_DATA_DIRS"
+
 export YADM_OVERRIDE_ARCHIVE="$HOME/.password-store/yadm.gpg"
 
 
diff --git a/.config/qutebrowser/keybindings.py b/.config/qutebrowser/keybindings.py
index 723da2c..c153075 100644
--- a/.config/qutebrowser/keybindings.py
+++ b/.config/qutebrowser/keybindings.py
@@ -18,11 +18,11 @@ def init(c):
 
     gpg_key = '723B78C0BF8D8C721D2C4EEF41E544A54E2533B2'
 
-    c.bind(',p', 'spawn --userscript qute-keepassxc --key ' + gpg_key, mode='normal')
-    c.bind(',Pu', 'spawn --userscript qute-keepassxc --only-username --key ' + gpg_key, mode='normal')
-    c.bind(',Pi', 'spawn --userscript qute-keepassxc --only-password --key ' + gpg_key, mode='normal')
-    c.bind(',Po', 'spawn --userscript qute-keepassxc --only-otp --key ' + gpg_key, mode='normal')
-    c.bind(',Pp', 'spawn --userscript qute-keepassxc --autotype --key ' + gpg_key, mode='normal')
+    c.bind(',p', 'spawn --userscript qutebrowser-keepassxc --key ' + gpg_key, mode='normal')
+    c.bind(',Pu', 'spawn --userscript qutebrowser-keepassxc --only-username --key ' + gpg_key, mode='normal')
+    c.bind(',Pi', 'spawn --userscript qutebrowser-keepassxc --only-password --key ' + gpg_key, mode='normal')
+    c.bind(',Po', 'spawn --userscript qutebrowser-keepassxc --only-otp --key ' + gpg_key, mode='normal')
+    c.bind(',Pp', 'spawn --userscript qutebrowser-keepassxc --autotype --key ' + gpg_key, mode='normal')
 
     c.bind(',q', 'spawn --userscript qr {url}')
     c.bind(',Q', 'hint links spawn --userscript qr {hint-url}')
@@ -39,7 +39,7 @@ def init(c):
         import unalix
         c.unbind('yy')
         c.unbind('yY')
-        c.bind('yy', 'spawn --userscript qute-clear-url', mode='normal')
-        c.bind('yY', 'spawn --userscript qute-clear-url -s', mode='normal')
+        c.bind('yy', 'spawn --userscript qutebrowser-clear-url', mode='normal')
+        c.bind('yY', 'spawn --userscript qutebrowser-clear-url -s', mode='normal')
     except:
         pass
diff --git a/.local/share/qutebrowser/userscripts/qute-clear-url b/.config/qutebrowser/userscripts/qutebrowser-clear-url
similarity index 100%
rename from .local/share/qutebrowser/userscripts/qute-clear-url
rename to .config/qutebrowser/userscripts/qutebrowser-clear-url
diff --git a/.local/share/qutebrowser/userscripts/qute-keepassxc b/.config/qutebrowser/userscripts/qutebrowser-keepassxc
similarity index 100%
rename from .local/share/qutebrowser/userscripts/qute-keepassxc
rename to .config/qutebrowser/userscripts/qutebrowser-keepassxc
diff --git a/.local/share/applications/org.qutebrowser.qutebrowser-kiosk.desktop b/.config/xdg-data/applications/org.qutebrowser.qutebrowser-kiosk.desktop
similarity index 100%
rename from .local/share/applications/org.qutebrowser.qutebrowser-kiosk.desktop
rename to .config/xdg-data/applications/org.qutebrowser.qutebrowser-kiosk.desktop