diff --git a/.config/shell/bm-files b/.config/shell/bm-files
index f7f301ab..641a129f 100644
--- a/.config/shell/bm-files
+++ b/.config/shell/bm-files
@@ -1,23 +1,18 @@
 # These files automatically update when edited/saved in vim:
-
-# keys  filename        description
-bf  ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-files  # This file, a list of bookmarked files
-bd  ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-dirs   # A list of bookmarked directories similar to this file
-cfx ${XDG_CONFIG_HOME:-$HOME/.config}/x11/xresources  # Colors, themes and variables for X11
-cfb ${XDG_HOME:-$HOME}/.local/src/dwmblocks/config.h  # dwmblocks: the status bar for dwm
-
+# 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:
-
-cfv ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/init.vim   # vim/neovim config
-cfz $ZDOTDIR/.zshrc           # zsh (shell) config
-cfa ${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc   # aliases used by zsh (and potentially other shells)
-cfp ${XDG_CONFIG_HOME:-$HOME/.config}/shell/profile   # profile file for login settings for zsh
-cfm ${XDG_CONFIG_HOME:-$HOME/.config}/mutt/muttrc     # mutt (email client) config
-cfn ${XDG_CONFIG_HOME:-$HOME/.config}/newsboat/config # newsboat (RSS reader)
-cfu ${XDG_CONFIG_HOME:-$HOME/.config}/newsboat/urls   # RSS urls for newsboat
-cfmb  ${XDG_CONFIG_HOME:-$HOME/.config}/ncmpcpp/bindings  # ncmpcpp (music player) keybinds file
-cfmc  ${XDG_CONFIG_HOME:-$HOME/.config}/ncmpcpp/config  # ncmpcpp (music player) config
-cfl ${XDG_CONFIG_HOME:-$HOME/.config}/lf/lfrc         # lf (file browser) config
-cfL ${XDG_CONFIG_HOME:-$HOME/.config}/lf/scope        # lf's scope/preview file
-cfX ${XDG_CONFIG_HOME:-$HOME/.config}/sxiv/exec/key-handler # sxiv (image viewer) key/script handler
+# 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/.config/shell/shortcutrc b/.config/shell/shortcutrc
index 7c6b0afc..a977da34 100644
--- a/.config/shell/shortcutrc
+++ b/.config/shell/shortcutrc
@@ -15,16 +15,13 @@ dot="cd /home/luca/.local/share/dotfiles && tput cuu1;tput el" \
 bf="$EDITOR /home/luca/.config/shell/bm-files" \
 bd="$EDITOR /home/luca/.config/shell/bm-dirs" \
 cfx="$EDITOR /home/luca/.config/x11/xresources" \
+cfX="$EDITOR /home/luca/.config/x11/xprofile" \
 cfb="$EDITOR /home/luca/.local/src/dwmblocks/config.h" \
-cfv="$EDITOR /home/luca/.config/nvim/init.vim" \
+cfk="$EDITOR /home/luca/.config/kitty/kitty.conf" \
+cfK="$EDITOR /home/luca/.config/kitty/kittyfullscreen.conf" \
+cfv="$EDITOR /home/luca/.config/lvim/config.lua" \
 cfz="$EDITOR /home/luca/.config/zsh/.zshrc" \
 cfa="$EDITOR /home/luca/.config/shell/aliasrc" \
 cfp="$EDITOR /home/luca/.config/shell/profile" \
-cfm="$EDITOR /home/luca/.config/mutt/muttrc" \
-cfn="$EDITOR /home/luca/.config/newsboat/config" \
-cfu="$EDITOR /home/luca/.config/newsboat/urls" \
-cfmb="$EDITOR /home/luca/.config/ncmpcpp/bindings" \
-cfmc="$EDITOR /home/luca/.config/ncmpcpp/config" \
 cfl="$EDITOR /home/luca/.config/lf/lfrc" \
-cfL="$EDITOR /home/luca/.config/lf/scope" \
-cfX="$EDITOR /home/luca/.config/sxiv/exec/key-handler" \
+cfL="$EDITOR /home/luca/.config/lf/preview" \
diff --git a/.config/shell/zshnameddirrc b/.config/shell/zshnameddirrc
index 7e4b9271..5a4518c7 100644
--- a/.config/shell/zshnameddirrc
+++ b/.config/shell/zshnameddirrc
@@ -14,16 +14,13 @@ hash -d dot=/home/luca/.local/share/dotfiles
 hash -d bf=/home/luca/.config/shell/bm-files 
 hash -d bd=/home/luca/.config/shell/bm-dirs 
 hash -d cfx=/home/luca/.config/x11/xresources 
+hash -d cfX=/home/luca/.config/x11/xprofile 
 hash -d cfb=/home/luca/.local/src/dwmblocks/config.h 
-hash -d cfv=/home/luca/.config/nvim/init.vim 
+hash -d cfk=/home/luca/.config/kitty/kitty.conf 
+hash -d cfK=/home/luca/.config/kitty/kittyfullscreen.conf 
+hash -d cfv=/home/luca/.config/lvim/config.lua 
 hash -d cfz=/home/luca/.config/zsh/.zshrc 
 hash -d cfa=/home/luca/.config/shell/aliasrc 
 hash -d cfp=/home/luca/.config/shell/profile 
-hash -d cfm=/home/luca/.config/mutt/muttrc 
-hash -d cfn=/home/luca/.config/newsboat/config 
-hash -d cfu=/home/luca/.config/newsboat/urls 
-hash -d cfmb=/home/luca/.config/ncmpcpp/bindings 
-hash -d cfmc=/home/luca/.config/ncmpcpp/config 
 hash -d cfl=/home/luca/.config/lf/lfrc 
-hash -d cfL=/home/luca/.config/lf/scope 
-hash -d cfX=/home/luca/.config/sxiv/exec/key-handler 
+hash -d cfL=/home/luca/.config/lf/preview