diff --git a/bash/bash_aliases b/bash/bash_aliases
index 092b243d5..96ba8e76f 100644
--- a/bash/bash_aliases
+++ b/bash/bash_aliases
@@ -9,7 +9,7 @@ alias i="vim -c 'startinsert'"
 # shortcuts
 alias c="clear"
 alias t="date +%T"
-alias ll='ls -alh'
+alias ll="ls -alh"
 alias fuck='sudo "$BASH" -c "$(history -p !!)"'
 
 # OS functions (TODO: should be broken out and pulled in based on OS)
@@ -18,18 +18,18 @@ alias rpm-all="rpm-ostree upgrade"
 alias pip-upgrade="pip3 list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 pip3 install -U"
 
 # Legacy mappings
-alias ifconfig='ip addr'
+alias ifconfig="ip addr"
 
 # SSH hop script
-alias pgen='ssh -A -t -i ~/.ssh/no_pass 10.10.0.1 ~/bin/pgen'
-alias spgen='ssh -A -t -i ~/.ssh/no_pass 10.10.0.1 ~/bin/spgen'
+alias pgen="ssh -A -t -i ~/.ssh/no_pass 10.10.0.1 ~/bin/pgen"
+alias spgen="ssh -A -t -i ~/.ssh/no_pass 10.10.0.1 ~/bin/spgen"
 
 # Prefer a Vim in a new terminal over gVim
 alias gvim="/usr/bin/urxvt -e /bin/bash -c vim -i"
 
 # Startup scripts
-alias startsway='${HOME}/scripts/sway/startsway.sh'
-alias starti3='${HOME}/scripts/i3/starti3.sh'
+alias startsway="${HOME}/scripts/sway/startsway.sh"
+alias starti3="${HOME}/scripts/i3/starti3.sh"
 
 # Web shortcuts
 alias papillon="/usr/bin/chromium --app='https://papillon.john.me.tz/hud.php?refresh=3600&theme=dark'"
@@ -39,4 +39,4 @@ alias pip="pip3"
 alias python="python3"
 
 # Backlight control
-alias blc='${HOME}/scripts/thinkpad/blc.pl --notify'
+alias blc="${HOME}/scripts/thinkpad/blc.pl --notify"
diff --git a/bash/bashrc b/bash/bashrc
index ef25e72b1..22bec62b5 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -12,7 +12,7 @@ export SSH_AUTH_SOCK=~/.ssh/ssh-agent.sock
 # agetty is set to automatically log me in on tty1
 # Automatically launch GUI on tty1 after login
 if [ "$(tty)" == '/dev/tty1' ]; then
-    . ${HOME}/.bash_login
+    . ${HOME}/.dotfiles/bash/bash_login
     LAST_GUI=`cat ${HOME}/.spool/last_login_gui 2>/dev/null`
     if [ -f "${HOME}/.spool/last_login_gui" ]; then
         ${HOME}/scripts/${LAST_GUI}/start${LAST_GUI}.sh