diff --git a/.config/nvim b/.config/nvim
index 4f6f50c..ca6e708 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit 4f6f50cd6f50553c42686bb21ae5e92eaaa2f03b
+Subproject commit ca6e7089fac3bfe26f14380e8bb6f66f0c6a9060
diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index b880087..734b43e 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -211,6 +211,8 @@ alias \
     gm="git merge" \
     gp="git push" \
     grb="git rebase" \
+    grba="git rebase --abort" \
+    grbc="git rebase --continue" \
     gsb="git status -sb" \
     gsh="git show" \
     gsps="git show --pretty=short --show-signature" \
diff --git a/.config/shell/bm-dirs b/.config/shell/bm-dirs
index bc518d8..56e32af 100644
--- a/.config/shell/bm-dirs
+++ b/.config/shell/bm-dirs
@@ -1,5 +1,6 @@
 cac ${XDG_CACHE_HOME:-$HOME/.cache}
 cf  ${XDG_CONFIG_HOME:-$HOME/.config}
+nv  ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/lua
 D   ${XDG_DOWNLOAD_DIR:-$HOME/Downloads}
 d   ${XDG_DOCUMENTS_DIR:-$HOME/Tower/Documents}
 dt  ${XDG_DATA_HOME:-$HOME/.local/share}
diff --git a/.config/shell/bm-files b/.config/shell/bm-files
index b5f23c7..8d8dc20 100644
--- a/.config/shell/bm-files
+++ b/.config/shell/bm-files
@@ -1,7 +1,7 @@
 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
-cfv   ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/init.vim
+cfv   ${XDG_CONFIG_HOME:-$HOME/.config}/nvim/init.lua
 cfz   $ZDOTDIR/.zshrc
 cfa   ${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc
 cfp   ${XDG_CONFIG_HOME:-$HOME/.config}/shell/profile
diff --git a/.config/shell/shortcutrc b/.config/shell/shortcutrc
index e442566..ab26ec0 100644
--- a/.config/shell/shortcutrc
+++ b/.config/shell/shortcutrc
@@ -1,32 +1,32 @@
 # 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" \
+alias cac="cd /home/chris/.cache && ls" \
+cf="cd /home/chris/.config && ls" \
+nv="cd /home/chris/.config/nvim/lua && ls" \
+D="cd /home/chris/Downloads && ls" \
+d="cd /home/chris/Tower/Documents && ls" \
+dt="cd /home/chris/.local/share && ls" \
+h="cd /home/chris && ls" \
+l="cd /home/chris/Tower/Library && ls" \
+r="cd /home/chris/Tower/Resources && ls" \
+m="cd /home/chris/Tower/Music && ls" \
+mn="cd /mnt && ls" \
+pp="cd /home/chris/Tower/Pictures && ls" \
+sc="cd /home/chris/.local/bin && ls" \
+src="cd /home/chris/.local/src && ls" \
+vv="cd /home/chris/Tower/Videos && ls" \
+c="cd /home/chris/Code && ls" \
+cp="cd /home/chris/Code/PHP && ls" \
+cw="cd /home/chris/Code/Websites && ls" \
+cj="cd /home/chris/Code/JavaScript && ls" \
+co="cd /home/chris/Code/DevOps && ls" \
+cr="cd /home/chris/Code/Rust && ls" \
+cm="cd /home/chris/Code/MobileApps && ls" \
+cs="cd /home/chris/Code/Scala && ls" \
+ct="cd /home/chris/Code/Tutorials && ls" \
 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" \
+cfv="$EDITOR /home/chris/.config/nvim/init.lua" \
 cfz="$EDITOR /home/chris/.config/zsh/.zshrc" \
 cfa="$EDITOR /home/chris/.config/shell/aliasrc" \
 cfp="$EDITOR /home/chris/.config/shell/profile" \
diff --git a/.config/shell/zshnameddirrc b/.config/shell/zshnameddirrc
index 15d1844..6c19746 100644
--- a/.config/shell/zshnameddirrc
+++ b/.config/shell/zshnameddirrc
@@ -1,5 +1,6 @@
 hash -d cac=/home/chris/.cache 
 hash -d cf=/home/chris/.config 
+hash -d nv=/home/chris/.config/nvim/lua 
 hash -d D=/home/chris/Downloads 
 hash -d d=/home/chris/Tower/Documents 
 hash -d dt=/home/chris/.local/share 
@@ -24,8 +25,7 @@ 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 cfv=/home/chris/.config/nvim/init.lua 
 hash -d cfz=/home/chris/.config/zsh/.zshrc 
 hash -d cfa=/home/chris/.config/shell/aliasrc 
 hash -d cfp=/home/chris/.config/shell/profile