diff --git a/.config/shell/shortcutrc b/.config/shell/shortcutrc
new file mode 100644
index 0000000..e442566
--- /dev/null
+++ b/.config/shell/shortcutrc
@@ -0,0 +1,40 @@
+# vim: filetype=sh
+alias cac="cd /home/chris/.cache && ls -a" \
+cf="cd /home/chris/.config && ls -a" \
+D="cd /home/chris/Downloads && ls -a" \
+d="cd /home/chris/Tower/Documents && ls -a" \
+dt="cd /home/chris/.local/share && ls -a" \
+h="cd /home/chris && ls -a" \
+l="cd /home/chris/Tower/Library && ls -a" \
+r="cd /home/chris/Tower/Resources && ls -a" \
+m="cd /home/chris/Tower/Music && ls -a" \
+mn="cd /mnt && ls -a" \
+pp="cd /home/chris/Tower/Pictures && ls -a" \
+sc="cd /home/chris/.local/bin && ls -a" \
+src="cd /home/chris/.local/src && ls -a" \
+vv="cd /home/chris/Tower/Videos && ls -a" \
+c="cd /home/chris/Code && ls -a" \
+cp="cd /home/chris/Code/PHP && ls -a" \
+cw="cd /home/chris/Code/Websites && ls -a" \
+cj="cd /home/chris/Code/JavaScript && ls -a" \
+co="cd /home/chris/Code/DevOps && ls -a" \
+cr="cd /home/chris/Code/Rust && ls -a" \
+cm="cd /home/chris/Code/MobileApps && ls -a" \
+cs="cd /home/chris/Code/Scala && ls -a" \
+ct="cd /home/chris/Code/Tutorials && ls -a" \
+bf="$EDITOR /home/chris/.config/shell/bm-files" \
+bd="$EDITOR /home/chris/.config/shell/bm-dirs" \
+cfx="$EDITOR /home/chris/.config/x11/xresources" \
+cfb="$EDITOR ~/.local/src/dwmblocks/config.h" \
+cfv="$EDITOR /home/chris/.config/nvim/init.vim" \
+cfz="$EDITOR /home/chris/.config/zsh/.zshrc" \
+cfa="$EDITOR /home/chris/.config/shell/aliasrc" \
+cfp="$EDITOR /home/chris/.config/shell/profile" \
+cfm="$EDITOR /home/chris/.config/mutt/muttrc" \
+cfn="$EDITOR /home/chris/.config/newsboat/config" \
+cfu="$EDITOR /home/chris/.config/newsboat/urls" \
+cfmb="$EDITOR /home/chris/.config/ncmpcpp/bindings" \
+cfmc="$EDITOR /home/chris/.config/ncmpcpp/config" \
+cfl="$EDITOR /home/chris/.config/lf/lfrc" \
+cfL="$EDITOR /home/chris/.config/lf/scope" \
+cfX="$EDITOR /home/chris/.config/sxiv/exec/key-handler" \
diff --git a/.config/shell/zshnameddirrc b/.config/shell/zshnameddirrc
new file mode 100644
index 0000000..15d1844
--- /dev/null
+++ b/.config/shell/zshnameddirrc
@@ -0,0 +1,39 @@
+hash -d cac=/home/chris/.cache 
+hash -d cf=/home/chris/.config 
+hash -d D=/home/chris/Downloads 
+hash -d d=/home/chris/Tower/Documents 
+hash -d dt=/home/chris/.local/share 
+hash -d h=/home/chris 
+hash -d l=/home/chris/Tower/Library 
+hash -d r=/home/chris/Tower/Resources 
+hash -d m=/home/chris/Tower/Music 
+hash -d mn=/mnt 
+hash -d pp=/home/chris/Tower/Pictures 
+hash -d sc=/home/chris/.local/bin 
+hash -d src=/home/chris/.local/src 
+hash -d vv=/home/chris/Tower/Videos 
+hash -d c=/home/chris/Code 
+hash -d cp=/home/chris/Code/PHP 
+hash -d cw=/home/chris/Code/Websites 
+hash -d cj=/home/chris/Code/JavaScript 
+hash -d co=/home/chris/Code/DevOps 
+hash -d cr=/home/chris/Code/Rust 
+hash -d cm=/home/chris/Code/MobileApps 
+hash -d cs=/home/chris/Code/Scala 
+hash -d ct=/home/chris/Code/Tutorials 
+hash -d bf=/home/chris/.config/shell/bm-files 
+hash -d bd=/home/chris/.config/shell/bm-dirs 
+hash -d cfx=/home/chris/.config/x11/xresources 
+hash -d cfb=~/.local/src/dwmblocks/config.h 
+hash -d cfv=/home/chris/.config/nvim/init.vim 
+hash -d cfz=/home/chris/.config/zsh/.zshrc 
+hash -d cfa=/home/chris/.config/shell/aliasrc 
+hash -d cfp=/home/chris/.config/shell/profile 
+hash -d cfm=/home/chris/.config/mutt/muttrc 
+hash -d cfn=/home/chris/.config/newsboat/config 
+hash -d cfu=/home/chris/.config/newsboat/urls 
+hash -d cfmb=/home/chris/.config/ncmpcpp/bindings 
+hash -d cfmc=/home/chris/.config/ncmpcpp/config 
+hash -d cfl=/home/chris/.config/lf/lfrc 
+hash -d cfL=/home/chris/.config/lf/scope 
+hash -d cfX=/home/chris/.config/sxiv/exec/key-handler 
diff --git a/.config/shell/zshrc b/.config/shell/zshrc
deleted file mode 100644
index 89bb02f..0000000
--- a/.config/shell/zshrc
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/zsh
-
-export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
-
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index d5c3cfa..5a1258f 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -25,6 +25,10 @@ setopt hist_ignore_space # Allow using a space to not add the line to the histor
 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc"
 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/zshnameddirrc"
 
+# Load nvm if it is installed
+export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+
 # Basic auto/tab complete:
 autoload -U compinit
 zstyle ':completion:*' menu select
diff --git a/.zshrc b/.zshrc
deleted file mode 120000
index f8ddb17..0000000
--- a/.zshrc
+++ /dev/null
@@ -1 +0,0 @@
-.config/shell/zshrc
\ No newline at end of file