diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index 247de3d..d2bf678 100755
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -42,8 +42,10 @@ alias \
 	weath="less -S ${XDG_DATA_HOME:-$HOME/.local/share}/weatherreport" \
 	tmux="tmux -f ${XDG_CONFIG_HOME:-$HOME/.config}/tmux/tmux.conf" \
 	scrcpy="scrcpy --shortcut-mod=lctrl" \
-	ixpe="cd $HOME/IXPE_analysis/Code && clear && ls" \
-	foc="cd $HOME/FOC_reduction/Code && clear && ls" \
-    config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=/home/tibeuleu" \
-	hlup="wg-quick up artixbook" \
-	hldown="wg-quick down artixbook"
+	ixpe="cd $HOME/Projects/IXPE_Analysis && source .ixpe/bin/activate && clear && ls" \
+	foc="cd $HOME/Projects/FOC_Reduction && source .foc/bin/activate && clear && ls" \
+	mcmc="cd $HOME/Projects/SimLens && source .mcmc/bin/activate && clear && ls" \
+	dsu="cd $HOME/Projects/dsutils && source .dsu/bin/activate && clear && ls" \
+    config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME" \
+	hlup="wg-quick up homelab" \
+	hldown="wg-quick down homelab"
diff --git a/.config/shell/profile b/.config/shell/profile
index 2fd1ffb..d4ea6b1 100755
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -25,7 +25,7 @@ export LESSHISTFILE="-"
 export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc"
 export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/shell/inputrc"
 export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh"
-#export GNUPGHOME="$XDG_DATA_HOME/gnupg"
+export GNUPGHOME="${XDG_DATA_HOME:-$HOME/.local/share}/gnupg"
 export WINEPREFIX="${XDG_DATA_HOME:-$HOME/.local/share}/wineprefixes/default"
 export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store"
 export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
diff --git a/.config/shell/shortcutrc b/.config/shell/shortcutrc
index f2e24c1..2639922 100755
--- a/.config/shell/shortcutrc
+++ b/.config/shell/shortcutrc
@@ -1,35 +1,30 @@
 # vim: filetype=sh
 alias cac="cd ${XDG_CACHE_HOME:-$HOME/.cache} && ls -a" \
-    cf="cd ${XDG_CONFIG_HOME:-$HOME/.config} && ls -a" \
-    cl="cd ${XDG_LOCAL_HOME:-$HOME/.local} && ls -a" \
-    dt="cd ${XDG_DATA_HOME:-$HOME/.local/share} && ls -a" \
-    sc="cd ${XDG_LOCAL_HOME:-$HOME/.local}/bin && ls -a" \
-    src="cd ${XDG_LOCAL_HOME:-$HOME/.local}/src && ls -a" \
-    h="cd $HOME && ls -a" \
-    d="cd ${XDG_DOCUMENTS_DIR:-$HOME/Documents} && ls -a" \
-    D="cd ${XDG_DOWNLOAD_DIR:-$HOME/Downloads} && ls -a" \
-    m="cd ${XDG_MUSIC_DIR:-$HOME/Music} && ls -a" \
-    pp="cd ${XDG_PICTURES_DIR:-$HOME/Pictures} && ls -a" \
-    vv="cd ${XDG_VIDEOS_DIR:-$HOME/Videos} && ls -a" \
-    L="cd ${XDG_LATEX_DIR:-$HOME/Documents/LaTeX/}Projects && ls -a" \
-    t="cd ${XDG_THESIS_DIR:-$HOME/Documents/These} && ls -a" \
-    p="cd ${XDG_PAPERS_DIR:-$HOME/Documents/These/Papers} && ls -a" \
-    T="cd ${XDG_PAPERS_DIR:-$HOME/Documents/These/Papers/Thesis_Barnouin/} && vim ." \
-    P="cd ${XDG_PRESENTATIONS_DIR:-$HOME/Documents/These/Presentations} && ls -a" \
-    mn="cd /mnt && ls -a" \
-    bf="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-files" \
-    bd="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-dirs" \
-    cfi="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/i3/config" \
-    cfib="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/i3blocks/config" \
-    cfx="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/x11/Xresources" \
-    cfa="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" \
-    cfl="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/lf/lfrc" \
-    cfL="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/lf/scope" \
-    cfmb="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/ncmpcpp/bindings" \
-    cfmc="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/ncmpcpp/config" \
-    cfn="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/newsboat/config" \
-    cfp="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/shell/profile" \
-    cfu="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/newsboat/urls" \
-    cfX="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/sxiv/exec/key-handler" \
-    cfv="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/nvim" \
-    cfz="$EDITOR $ZDOTDIR/.zshrc" \
+cf="cd ${XDG_CONFIG_HOME:-$HOME/.config} && ls -a" \
+cfv="cd ${XDG_CONFIG_HOME:-$HOME/.config}/nvim && ls -a" \
+cl="cd ${XDG_LOCAL_HOME:-$HOME/.local} && ls -a" \
+dt="cd ${XDG_DATA_HOME:-$HOME/.local/share} && ls -a" \
+sc="cd ${XDG_LOCAL_HOME:-$HOME/.local}/bin && ls -a" \
+src="cd ${XDG_LOCAL_HOME:-$HOME/.local}/src && ls -a" \
+h="cd $HOME && ls -a" \
+d="cd ${XDG_DOCUMENTS_DIR:-$HOME/Documents} && ls -a" \
+D="cd ${XDG_DOWNLOAD_DIR:-$HOME/Downloads} && ls -a" \
+m="cd ${XDG_MUSIC_DIR:-$HOME/Music} && ls -a" \
+pp="cd ${XDG_PICTURES_DIR:-$HOME/Pictures} && ls -a" \
+vv="cd ${XDG_VIDEOS_DIR:-$HOME/Videos} && ls -a" \
+mn="cd /mnt && ls -a" \
+bf="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-files" \
+bd="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/shell/bm-dirs" \
+cfi="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/i3/config" \
+cfib="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/i3blocks/config" \
+cfx="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/x11/Xresources" \
+cfa="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" \
+cfl="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/lf/lfrc" \
+cfL="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/lf/scope" \
+cfmb="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/ncmpcpp/bindings" \
+cfmc="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/ncmpcpp/config" \
+cfn="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/newsboat/config" \
+cfp="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/shell/profile" \
+cfu="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/newsboat/urls" \
+cfX="$EDITOR ${XDG_CONFIG_HOME:-$HOME/.config}/sxiv/exec/key-handler" \
+cfz="$EDITOR $ZDOTDIR/.zshrc" \