diff --git a/.cache/.keep b/.cache/zsh/history
similarity index 100%
rename from .cache/.keep
rename to .cache/zsh/history
diff --git a/.config/lf/shortcutrc b/.config/lf/shortcutrc
index b471d6e..fafae4a 100644
--- a/.config/lf/shortcutrc
+++ b/.config/lf/shortcutrc
@@ -3,3 +3,4 @@ map gmn cd "/mnt"
 map g/ cd "/"
 map go cd "/opt"
 map ge cd "/etc"
+map gd cd "/data"
diff --git a/.config/shell/profile b/.config/shell/profile
index 0ff7687..84bea88 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -206,5 +206,3 @@ ex=:\
 *.pdf=:\
 *.nix=:\
 "
-
-[ ! -f ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ] && setsid shortcuts >/dev/null 2>&1
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 45564da..e3758a6 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -80,7 +80,7 @@ _lfcd () {
   zle accept-line
 }
 zle -N _lfcd
-bindkey '^o' _lfcd
+bindkey '^e' _lfcd
 
 # bind lazygit to ctrl-g
 lg () {
@@ -92,8 +92,8 @@ zle -N lg{,}
 bindkey '^g' lg
 
 # Edit line in vim with ctrl-e:
-autoload edit-command-line; zle -N edit-command-line
-bindkey '^e' edit-command-line
+# autoload edit-command-line; zle -N edit-command-line
+# bindkey '^e' edit-command-line
 
 # other keybinds
 bindkey -v '^?' backward-delete-char
diff --git a/.local/bin/shortcuts b/.local/bin/shortcuts
deleted file mode 100755
index 032388e..0000000
--- a/.local/bin/shortcuts
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-bmdirs="${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-dirs"
-bmfiles="${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-files"
-
-# Output locations. Unactivated progs should go to /dev/null.
-shell_shortcuts="${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc"
-zsh_named_dirs="${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc"
-lf_shortcuts="${XDG_CONFIG_HOME:-$HOME/.config}/lf/shortcutrc"
-ranger_shortcuts="/dev/null"
-qute_shortcuts="/dev/null"
-fish_shortcuts="/dev/null"
-vifm_shortcuts="/dev/null"
-
-# Remove, prepare files
-rm -f "$lf_shortcuts" "$ranger_shortcuts" "$qute_shortcuts" "$zsh_named_dirs" 2>/dev/null
-printf "# vim: filetype=sh\\n" > "$fish_shortcuts"
-printf "# vim: filetype=sh\\nalias " > "$shell_shortcuts"
-printf "\" vim: filetype=vim\\n" > "$vifm_shortcuts"
-
-# Format the `directories` file in the correct syntax and sent it to all three configs.
-eval "echo \"$(cat "$bmdirs")\"" | \
-awk "!/^\s*#/ && !/^\s*\$/ {gsub(\"\\\s*#.*$\",\"\");
-	printf(\"%s=\42cd %s && tput cuu1;tput el\42 \\\\\n\",\$1,\$2)             >> \"$shell_shortcuts\" ;
-	printf(\"hash -d %s=%s \n\",\$1,\$2)                  >> \"$zsh_named_dirs\"  ;
-	printf(\"map C%s cd \42%s\42 \n\",\$1,\$2)            >> \"$lf_shortcuts\" }"
-
-# Format the `files` file in the correct syntax and sent it to both configs.
-eval "echo \"$(cat "$bmfiles")\"" | \
-awk "!/^\s*#/ && !/^\s*\$/ {gsub(\"\\\s*#.*$\",\"\");
-	printf(\"%s=\42\$EDITOR %s\42 \\\\\n\",\$1,\$2)       >> \"$shell_shortcuts\" ;
-	printf(\"hash -d %s=%s \n\",\$1,\$2)                  >> \"$zsh_named_dirs\"  ;
-	printf(\"map E%s \$\$EDITOR \42%s\42 \n\",\$1,\$2)    >> \"$lf_shortcuts\" }"