diff --git a/.bash_aliases b/.bash_aliases
index f99bbc7..fcd24ef 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -6,14 +6,14 @@ fi
 alias ,git='git config --global user.name "Shaun Reed" && git config --global user.email "shaunrd0@gmail.com"'
 # Some aliases don't make sense in the docker image, like shortcuts to fix plasmashell.
 if [ -f /.dockerenv ]; then
-  export DOT_PACKAGES='git stow vim tmux ranger clang wget curl'
+  export DOT_PACKAGES='git stow vim tmux ranger clang wget curl golang-go'
   alias ,update='apt update -y && apt upgrade -y && apt upgrade --fix-broken --fix-missing --auto-remove'
-  alias ,init='apt update -y && apt install $DOT_PACKAGES -y'
+  alias ,init='apt update -y && apt install -y $DOT_PACKAGES'
   alias ,swap='swapoff -a && swapon -a'
 else
-  export DOT_PACKAGES='git stow vim xsel xclip tmux ranger clang yakuake wget curl'
+  export DOT_PACKAGES='git stow vim vim-gtk3 xsel xclip tmux ranger clang yakuake wget curl golang-go'
   alias ,update='sudo apt update -y && sudo apt upgrade -y && sudo apt upgrade --fix-broken --fix-missing --auto-remove'
-  alias ,init='sudo apt update -y && sudo apt install $DOT_PACKAGES'
+  alias ,init='sudo apt update -y && sudo apt install -y $DOT_PACKAGES'
   # Clear kscreen cached settings
   alias ,kscreen='rm -rf ~/.local/share/kscreen/*'
   # Restart plasmashell
@@ -25,11 +25,6 @@ fi
 # colored GCC warnings and errors
 #export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert
 alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
@@ -104,3 +99,12 @@ if ! [ command -v conda &>/dev/null ] && [ -e ~/Code/Clones/mambaforge/bin/conda
   source ~/.bashrc
 fi
 
+# For shared systems where history is not desired.
+# ln -sf /dev/null ~/.bash_history
+# HISTFILE=/dev/null
+
+# Avoid duplicates in bash history.
+HISTCONTROL=ignoredups:erasedups
+# When the shell exits, append to the history file instead of overwriting it.
+shopt -s histappend
+
diff --git a/.gitignore b/.gitignore
index b666a81..d9cea87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-.bashrc
 .bash_secrets
 .vim/.netrwhist
 .idea/
diff --git a/.inputrc b/.inputrc
new file mode 100644
index 0000000..8638ed5
--- /dev/null
+++ b/.inputrc
@@ -0,0 +1,2 @@
+"\e[A": history-search-backward
+"\e[B": history-search-forward
diff --git a/.stow-local-ignore b/.stow-local-ignore
index 94748c0..94a514a 100644
--- a/.stow-local-ignore
+++ b/.stow-local-ignore
@@ -1,3 +1,6 @@
+.git
+.gitmodules
+.gitignore
 README.md
 setup.sh
 Dockerfile
diff --git a/.tmux/.tmux-gui.conf b/.tmux/.tmux-gui.conf
index 9655efe..140b750 100644
--- a/.tmux/.tmux-gui.conf
+++ b/.tmux/.tmux-gui.conf
@@ -11,7 +11,6 @@ set -g mouse on
 bind -n MouseDown2Pane run "tmux set-buffer -b primary_selection \"$(xsel -o)\"; tmux paste-buffer -b primary_selection; tmux delete-buffer -b primary_selection"
 
 # List of plugins and their settings
-set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'nhdaly/tmux-better-mouse-mode'
 set -g @scroll-speed-num-lines-per-scroll 2
 set -g @plugin 'tmux-plugins/tpm'
diff --git a/.vimrc b/.vimrc
index e067ee8..bd23f8b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -25,7 +25,7 @@ set directory=~/.vim/swap//,~/tmp/,/var/tmp/,/tmp/,.
 set backupdir=~/.vim/backup//,~/tmp/,/var/tmp/,/tmp/,.
 " Persistant undo
 " :help undo-persistence
-set undodir=~/.vim/undo//,~/tmp/,/var/tmp/,/tmp/,.
+set undodir=~/.vim/undodir//,~/tmp/,/var/tmp/,/tmp/,.
 set undofile
 
 " Combine vim clipboard with global clipboard buffer
@@ -141,7 +141,7 @@ nmap <silent> <C-j> <Plug>(ale_next_wrap)
 "let g:colorizer_colornames = 0 " Don't color literal names, like red, green, etc
 let g:colorizer_auto_color = 0
 ""let g:colorizer_skip_comments = 1
-""let g:colorizer_auto_filetype ='css,html,vim'
+let g:colorizer_auto_filetype ='css,html,qml'
 nnoremap <C-c> :ColorToggle<CR>
 
 " Symbols important to vim / terminal layouts
diff --git a/Dockerfile b/Dockerfile
index 8d5750f..114e9b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:latest
 COPY . /dot
 ENV TERM=xterm-256color
 # Install additional packages we need
-RUN apt update -y && apt upgrade -y
-RUN apt install -y git stow vim tmux ranger clang wget curl golang-go
+RUN bash -c '. /dot/.bash_aliases && apt update -y && apt install -y $DOT_PACKAGES fontconfig'
+RUN apt upgrade -y
 RUN go install github.com/arl/gitmux@latest
 # Update submodules for plugins
 RUN cd /dot && git submodule update --init && cp .gitmux.conf.docker .gitmux.conf
diff --git a/setup.sh b/setup.sh
index f35961f..9d7f067 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,23 +1,6 @@
 #!/usr/bin/env bash
-
 git submodule update --init
-
-sudo apt update
-
-sudo apt install -y \
-  git \
-  stow \
-  vim \
-  vim-gtk3 \
-  xsel \
-  xclip \
-  tmux \
-  ranger \
-  clang \
-  yakuake \
-  wget \
-  curl \
-  golang-go
-
+# Use alias for installing packages so we don't maintain several dependency lists.
+. .bash_aliases
+,init
 go install github.com/arl/gitmux@latest
-