diff --git a/bin/backup.sh b/bin/backup.sh
index 2e5c80a..d55657e 100755
--- a/bin/backup.sh
+++ b/bin/backup.sh
@@ -26,4 +26,5 @@ function verify_dest {
 
 verify_dest "$DEST"
 
-rsync -Hax --delete-before --exclude-from="$HOME/.rsync_ignore" "${HOME}/" "$DEST"
+rsync -Hax --delete-before --exclude-from="$HOME/.rsync_ignore" \
+  --delete-excluded "${HOME}/" "$DEST"
diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 966596a..1eba29e 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -1,15 +1,45 @@
 [user]
   name = David Tomaschik
   email = david@systemoverlord.com
-[push]
-  default = current
+  signingKey = 0x5DEA789B
+
 [core]
   excludesfile = ~/.gitignore
+  editor = vim
+  whitespace = trailing-space,space-before-tab
+
+[color]
+  diff = auto
+  status = auto
+
+[diff]
+  tool = vimdiff
+
+[difftool]
+  prompt = false
+
+[alias]
+  st = status
+
+[push]
+  default = current
+
 [web]
   browser = chrome
+
 [github]
   user = matir
+
+# Site specific config
 [url "https://github.com/"]
   insteadOf = github://
+
 [url "ssh://git@github.com/"]
   pushInsteadOf = github://
+
+[url "git://gist.github.com/"]
+	insteadOf = "gist:"
+
+[url "git@gist.github.com:"]
+	pushInsteadOf = "gist:"
+	pushInsteadOf = "git://gist.github.com/"
diff --git a/dotfiles/profile b/dotfiles/profile
index bc9ee28..7d66484 100644
--- a/dotfiles/profile
+++ b/dotfiles/profile
@@ -23,7 +23,7 @@ export DEBFULLNAME="David Tomaschik"
 export LESS="-MR"
 
 EXTRA_PATHS=("$HOME/.gce/google-cloud-sdk/bin" "$HOME/bin/genymotion"
-  "$HOME/bin/genymotion/tools" )
+  "$HOME/bin/genymotion/tools" "$HOME/bin/go_appengine" )
 for p in "${EXTRA_PATHS[@]}" ; do 
   if [ -d "$p" ] ; then
     export PATH="$PATH:$p"
@@ -31,10 +31,6 @@ for p in "${EXTRA_PATHS[@]}" ; do
 done
 unset EXTRA_PATHS
 
-# Disable stty ctrl-s/ctrl-q behavior
-stty stop undef
-stty start undef
-
 # Setup GPG Agent
 GPG_AGENT_INFO_PATH=$HOME/.gnupg/gpg-agent-info-`hostname`
 if test -f $GPG_AGENT_INFO_PATH && kill -0 `cut -d: -f 2 $GPG_AGENT_INFO_PATH` 2>/dev/null ; then
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index e67a20e..5e17935 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -2,7 +2,7 @@ HISTFILE=~/.histfile
 HISTSIZE=1000
 SAVEHIST=1000
 setopt appendhistory autocd autopushd extendedglob nohup nomatch histignorespace histlexwords histverify cbases
-unsetopt beep
+unsetopt beep histbeep listbeep flowcontrol
 bindkey -e
 
 # Completion
diff --git a/dotfiles/zshrc.d/afk.zsh b/dotfiles/zshrc.d/afk.zsh
new file mode 100644
index 0000000..95ebbaa
--- /dev/null
+++ b/dotfiles/zshrc.d/afk.zsh
@@ -0,0 +1,11 @@
+function afk {
+  # Note, may fail if multiple users are logged in with different desktop
+  # environments.
+  if pidof cinnamon-screensaver >/dev/null ; then
+    cinnamon-screensaver-command -l
+  elif pidof gnome-screensaver >/dev/null ; then
+    gnome-screensaver-command -l
+  else
+    echo 'No screensaver found...' >&2
+  fi
+}
diff --git a/install.sh b/install.sh
index a9aa438..145d339 100755
--- a/install.sh
+++ b/install.sh
@@ -13,6 +13,8 @@ if [ ! -d $BASEDIR ] ; then
   exit 1
 fi
 
+HAVE_X=`dpkg-query -s xserver-xorg | grep -c 'Status.*installed'`
+
 function prerequisites {
   # Prerequisites require git
   if ! which git > /dev/null ; then
@@ -158,6 +160,7 @@ function install_apt_pkgs {
     ( echo "Can't run apt-get commands" >&2 && \
       return 1 )
   run_as_root apt-get -y install `cat ${BASEDIR}/packages`
+  (( $HAVE_X )) && run_as_root apt-get -y install `cat ${BASEDIR}/packages.X`
 }
 
 
diff --git a/packages b/packages
index 172ad51..1e25d08 100644
--- a/packages
+++ b/packages
@@ -7,3 +7,13 @@ ack-grep
 tmux
 gnupg2
 gnupg-agent
+curl
+strace
+ltrace
+traceroute
+tshark
+tcpdump
+gnupg-curl
+gdb
+sqlite3
+radare2
diff --git a/packages.X b/packages.X
new file mode 100644
index 0000000..c3bdb08
--- /dev/null
+++ b/packages.X
@@ -0,0 +1,4 @@
+fonts-inconsolata
+wireshark
+keepassx
+vim-gtk