diff --git a/.config/espanso/default.yml b/.config/espanso/default.yml
index facd25b..9d06b66 100644
--- a/.config/espanso/default.yml
+++ b/.config/espanso/default.yml
@@ -123,14 +123,6 @@ matches:
         params:
           cmd: "pass information/social-security | head -1"
 
-  - trigger: ":ep"
-    replace: "{{output}}"
-    vars:
-      - name: output
-        type: shell
-        params:
-          cmd: "pass information/email/personal"
-
   - trigger: ":sign"
     replace: "{{output}}"
     vars:
diff --git a/.config/shell/functions b/.config/shell/functions
index 8ed3ac1..8f9ff45 100644
--- a/.config/shell/functions
+++ b/.config/shell/functions
@@ -78,7 +78,7 @@ edshell() {
 	esac
 	test -f "$file" || return 2
 	checksum="$(md5sum "$file")"
-	$EDITOR "$(test "$line" && echo "+normal! ${line}ggzx" || echo "--")" "${file%:*}"
+	$EDITOR $(test "$line" && echo "+normal!\ ${line}ggzx") "${file%:*}"
 	test "$checksum" != "$(md5sum $file)" && source "$HOME/.zprofile" && exec $SHELL
 }
 
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 3d66f76..6ff07ee 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -10,6 +10,6 @@ XDG_TEMPLATES_DIR="$HOME/.local/templates"
 XDG_DOWNLOAD_DIR="$HOME/data/4-incubator/downloads"
 XDG_MUSIC_DIR="$HOME/data/music"
 XDG_PICTURES_DIR="$HOME/data/images"
-XDG_VIDEOS_DIR="$HOME/data/3-resources"
-XDG_DOCUMENTS_DIR="$HOME/data/3-resources"
-XDG_PUBLICSHARE_DIR="$HOME/"
+XDG_VIDEOS_DIR="$HOME/data/3-resources/multimedia"
+XDG_DOCUMENTS_DIR="$HOME/data/3-resources/multimedia"
+XDG_PUBLICSHARE_DIR="$HOME/data/3-resources/multimedia"
diff --git a/README.org b/README.org
index 2db23cb..463d9f6 100644
--- a/README.org
+++ b/README.org
@@ -29,14 +29,15 @@ and configuration for ~less~ and ~fzf~.
 * Packages
 : pacman -Qe | cut -d\  -f1 | xclip -selection clipboard
 # Use org-yank-visible
-- essentials :: git zsh bat neovim man-db texinfo
-- basic tools :: fd ripgrep tree jrnl python-pynvim wget zsh-completions mlocate
-- common tools :: topgrade ffmpeg imagemagick pandoc [[https://lftp.yar.ru/][lftp]] glances youtube-dl dos2unix zsh-doc pacman-contrib
+- essentials :: git zsh bat neovim man-db
+- basic tools :: texinfo fd ripgrep tree jrnl python-pynvim wget zsh-completions mlocate (locate on deb)
+- common tools :: topgrade ffmpeg imagemagick pandoc [[https://lftp.yar.ru/][lftp]] glances youtube-dl dos2unix zsh-doc pacman-contrib espanso
 - pass :: pass pass-otp pass-extension-tail pass-clip
   -> interesting: pass-steam, pass-autotype, pass-file, pass-qr, pass-ssh, pass-rotate
 - ssh :: openssh sshfs lemonade-git
 - dotfiles :: yadm
-  : yadm clone --bootstrap git.jfischer.org:xeruf/dotfiles.git
+  : yadm clone --bootstrap git@git.jfischer.org:xeruf/dotfiles.git
+  : yadm clone --bootstrap https://git.jfischer.org/xeruf/dotfiles.git
 - aur recommendations :: tldr++ sc-im
 - git tools :: git-bug git-lfs git-crypt git-remote-gcrypt github-cli
 - personal aur utils (need configuration) :: [[https://github.com/mookid/diffr][diffr]] bat-extras-git rdictcc-git neovim-symlinks stderred-git
@@ -49,12 +50,14 @@ and configuration for ~less~ and ~fzf~.
 - tagging :: puddletag beets picard ffmpegthumbnailer
 - sync :: syncthing
   : systemctl enable --now syncthing
+** Emacs
+- mail :: offlineimap mu
 ** Graphical
 - x :: xorg-xserver xorg-xkill xorg-setxkbmap xorg-xinit xterm xclip xprintidle light
 - music production :: lilypond lilypond-docs timidity++ chordpro-git musescore
 - video :: vlc kdenlive
 - kde :: plasma-desktop plasma-nm spectacle breeze systemsettings konsole ktorrent dolphin kdeplasma-addons kinfocenter partitionmanager kdeconnect kwallet-pam kwalletmanager ksshaskpass okular bluedevil
-- office :: emacs texlive-core texlive-latexextra context-bin  libreoffice-fresh
+- office :: emacs texlive-core texlive-latexextra context-bin libreoffice-fresh
 - hacking :: etcher-bin
 - health :: stretchly-xeruf-git redshift acpilight light
   : scu enable --now redshift