diff --git a/.config/bookmarks/directories b/.config/bookmarks/directories
new file mode 100644
index 000000000..93c8be40a
--- /dev/null
+++ b/.config/bookmarks/directories
@@ -0,0 +1,16 @@
+# You can add comments to these files with #
+h   $HOME
+ch  ${XDG_CACHE_HOME:-$HOME/.cache}
+cf  ${XDG_CONFIG_HOME:-$HOME/.config}
+dt  ${XDG_DATA_HOME:-$HOME/.local/share}
+sr  $HOME/.local/src
+it  $HOME/.local/src/git
+sc  $HOME/.local/bin
+mn  /mnt
+dl  ${XDG_DOWNLOAD_DIR:-$HOME/Downloads}
+dm  ${XDG_DOCUMENTS_DIR:-$HOME/Documents}
+dk  ${XDG_DOCUMENTS_DIR:-$HOME/Desktop}
+ms  ${XDG_MUSIC_DIR:-$HOME/Music}
+pc  ${XDG_PICTURES_DIR:-$HOME/Pictures}
+vd  ${XDG_VIDEOS_DIR:-$HOME/Videos}
+dot $STOW_DIR/dots
diff --git a/.config/bookmarks/files b/.config/bookmarks/files
new file mode 100644
index 000000000..641a129f4
--- /dev/null
+++ b/.config/bookmarks/files
@@ -0,0 +1,18 @@
+# These files automatically update when edited/saved in vim:
+# keys  filename
+bf  ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-files
+bd  ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-dirs
+cfx ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources
+cfX ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xprofile
+cfb ${XDG_HOME:-$HOME}/.local/src/dwmblocks/config.h
+
+# These do not update automatically, but on the next new instance of a program:
+# keys  filename
+cfk ${XDG_CONFIG_HOME:-$HOME/.config}/kitty/kitty.conf
+cfK ${XDG_CONFIG_HOME:-$HOME/.config}/kitty/kittyfullscreen.conf
+cfv ${XDG_CONFIG_HOME:-$HOME/.config}/lvim/config.lua
+cfz $ZDOTDIR/.zshrc
+cfa ${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc
+cfp ${XDG_CONFIG_HOME:-$HOME/.config}/shell/profile
+cfl ${XDG_CONFIG_HOME:-$HOME/.config}/lf/lfrc
+cfL ${XDG_CONFIG_HOME:-$HOME/.config}/lf/preview
diff --git a/.local/bin/shortcuts b/.local/bin/shortcuts
index d88d3d67b..0a1ff9b15 100755
--- a/.local/bin/shortcuts
+++ b/.local/bin/shortcuts
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 # Inputs
-bmdirs="$XDG_DATA_HOME/bookmarks/directories"
-bmfiles="$XDG_DATA_HOME/bookmarks/files"
+bmdirs="$XDG_CONFIG_HOME/bookmarks/directories"
+bmfiles="$XDG_CONFIG_HOME/bookmarks/files"
 
 # Outputs
 shell_shortcuts="$ZDOTDIR/configs/autogenerated/shortcuts"