diff --git a/.mpw.d b/.mpw.d
new file mode 120000
index 0000000..7e183ab
--- /dev/null
+++ b/.mpw.d
@@ -0,0 +1 @@
+.local/share/mpw
\ No newline at end of file
diff --git a/.zshenv b/.zshenv
index 98915bc..7fdaff3 100644
--- a/.zshenv
+++ b/.zshenv
@@ -18,13 +18,14 @@ export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
 
 export GNUPGHOME="$XDG_DATA_HOME"/gnupg
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
+export RLWRAP_HOME="$XDG_DATA_HOME"/rlwrap
+export LESSHISTFILE="$XDG_STATE_HOME"/lesshst
 
+ ## Graphical
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 export KDEHOME="$XDG_STATE_HOME"/kdehome
 export DOOMLOCALDIR="$XDG_STATE_HOME"/emacs
-
 export WINEPREFIX="$XDG_DATA_HOME"/wine
-export RLWRAP_HOME="$XDG_DATA_HOME"/rlwrap
 
  ## Development tools
 export GOPATH="$XDG_STATE_HOME"/go
@@ -40,7 +41,6 @@ export BUNDLE_USER_CACHE="$XDG_CACHE_HOME"/bundle
 export BUNDLE_USER_PLUGIN="$XDG_STATE_HOME"/bundle
 
 export PYTHONSTARTUP="$XDG_CONFIG_HOME"/pythonstartup.py
-export LESSHISTFILE="$XDG_STATE_HOME"/lesshst
 export KSCRIPT_CACHE_DIR="$XDG_CACHE_HOME"/kscript
 
  # Java & Android
@@ -65,6 +65,7 @@ mkdir -p "$XDG_STATE_HOME/zsh"
 # environment
 which nvim >/dev/null && export EDITOR='nvim' || export EDITOR='vim'
 export LESS="--RAW-CONTROL-CHARS --ignore-case --LONG-PROMPT --jump-target=5 $(test $(less --version | head -1 | cut -f2 -d' ') -ge 590 && echo --incsearch)"
+ # TODO put into config file and use --exclude-from
 export DIRS_GENERATED="-x generated -x .gradle -x cmake_build -x dist-newstyle -x node_modules -x __pycache__"
 export DIRS_IGNORE_SAFE="-x .sync -x .stfolder -x .cache -x *Cache -x .pyenv -x .local/cache -x share/baloo -x share/cabal -x share/cargo -x share/digikam -x share/JetBrains -x share/tldr -x share/syncthing -x share/Steam/ubuntu* -x share/virtualenv -x share/Zeal -x state/gradle -x state/android -x Ferdi/Partitions -x oh-my-zsh $DIRS_GENERATED"
 export DIRS_IGNORE="-x *build -x .git -x .idea -x out -x cache -x Partitions $DIRS_IGNORE_SAFE"
@@ -93,10 +94,11 @@ alt-enter:execute(test -O {} && $EDITOR {} || sudoedit {})
 alt-bspace:execute(gio trash {})
 double-click:execute(xdg-open {})
 ctrl-a:select-all
-ctrl-h:kill-line
+ctrl-l:kill-line
 alt-a:select-all
 alt-c:yank
 alt-w:toggle-preview-wrap
+ctrl-alt-h:backward-kill-word
 $($_fzf_latest && echo "shift-down:preview-half-page-down,shift-up:preview-half-page-up
 alt-j:preview-half-page-down,alt-k:preview-half-page-up
 alt-shift-down:preview-down,alt-shift-up:preview-up,esc:close")
diff --git a/README.org b/README.org
index be126b8..30e136f 100644
--- a/README.org
+++ b/README.org
@@ -30,11 +30,12 @@ and configuration for ~less~ and ~fzf~.
 : pacman -Qe | cut -d\  -f1 | xclip -selection clipboard
 # Use org-yank-visible
 - essentials :: curl git zsh bat neovim man-db
-- basic tools :: tree wget texinfo man-pages base-devel fzf topgrade expect zoxide
-  fd ripgrep zsh-completions python-pynvim unrar mlocate
+- basic tools :: tree wget texinfo fzf expect zoxide mlocate
+- arch basics :: fd ripgrep zsh-completions python-pynvim unrar man-pages base-devel  topgrade
 - dotfiles :: yadm
-  : yadm clone git@git.jfischer.org:xeruf/dotfiles.git
-  : yadm clone https://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
+  Run ~bootstrap~ after starting ZSH
 ** Applications
 - utilities :: youtube-dl dos2unix
 - powertools :: hexedit hexyl [[https://lftp.yar.ru/][lftp]] glances zsh-doc pacman-contrib
@@ -59,7 +60,7 @@ makepkg -si
 - needs extra setup :: rdictcc-git
 - experiments :: kakoune
 ** Graphical
-- office :: libreoffice-fresh
+- office :: libreoffice-fresh zathura zathura-pdf-poppler zathura-djvu zathura-ps
 - fonts :: fontpreview noto-fonts noto-fonts-emoji ttf-dejavu adobe-source-code-pro-fonts texlive-myriadpro-git
 - video :: [[https://github.com/phw/peek][peek]] vlc obs-studio kdenlive
 - music management :: puddletag beets picard ffmpegthumbnailer sox
@@ -104,11 +105,3 @@ yays clion clion-jre cmake gdb python-pre-commit
 : yays android-udev android-tools adbfs-rootless-git android-studio
 After running android-studio setup, accept licenses:
 : $ANDROID_SDK_ROOT/tools/bin/sdkmanager --licenses
-** Server (Debian)
-Setup systemd-resolved and systemd-networkd
-- tools :: fd-find locate
-- rust :: cargo install zoxide diffr
-  : curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-- ssh (Ubuntu) :: lemonade openssh
-- webserver :: sudo apt install snapd nginx && snap install certbot
-- social :: pleroma-bin postgresql caddy