diff --git a/scripts/fasd.sh b/applications/fasd.sh
similarity index 100%
rename from scripts/fasd.sh
rename to applications/fasd.sh
diff --git a/scripts/ffmpeg.sh b/applications/ffmpeg.sh
similarity index 100%
rename from scripts/ffmpeg.sh
rename to applications/ffmpeg.sh
diff --git a/scripts/reptyr.sh b/applications/reptyr.sh
similarity index 100%
rename from scripts/reptyr.sh
rename to applications/reptyr.sh
diff --git a/scripts/vim.sh b/applications/vim.sh
similarity index 100%
rename from scripts/vim.sh
rename to applications/vim.sh
diff --git a/applications/wemux.sh b/applications/wemux.sh
new file mode 100644
index 0000000..05f91bb
--- /dev/null
+++ b/applications/wemux.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+SUDO=""
+if command -v sudo 2>&1 /dev/null; then
+  SUDO="$(where sudo)"
+fi
+echo "Installing wemux..."
+test -d /usr/local/share/wemux || $SUDO git clone git://github.com/zolrath/wemux.git /usr/local/share/wemux && $SUDO git --git-dir=/usr/local/share/wemux pull
+$SUDO rm -r /usr/local/bin/wemux /usr/local/etc/wemux.conf
+$SUDO ln -s /usr/local/share/wemux/wemux /usr/local/bin/wemux
+$SUDO mkdir -p /usr/local/etc
+$SUDO cp /usr/local/share/wemux/wemux.conf.example /usr/local/etc/wemux.conf
+printf 'options="-u2"\n' | $SUDO tee -a /usr/local/etc/wemux.conf >/dev/null
+printf "host_list=(root $USER)\n" | $SUDO tee -a /usr/local/etc/wemux.conf >/dev/null
diff --git a/scripts/youcompleteme.sh b/applications/youcompleteme.sh
similarity index 100%
rename from scripts/youcompleteme.sh
rename to applications/youcompleteme.sh
diff --git a/i3/config b/i3/config
index 64b19f5..892ce95 100644
--- a/i3/config
+++ b/i3/config
@@ -170,7 +170,7 @@ exec --no-startup-id "zsh -c 'xrandr --output LVDS1 --primary || xrandr --output
 exec --no-startup-id "~/.i3/run.sh wall"
 # Keyboard
 exec --no-startup-id xmodmap ~/.xmodmap
-exec --no-startup-id /home/stonewareslord/xmodmap.sh
+exec --no-startup-id ~/xmodmap.sh
 # Misc
 exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/urxvtc'
 exec --no-startup-id /usr/bin/shutter --min_at_startup
diff --git a/scripts/desktop.txt b/scripts/desktop.txt
deleted file mode 100644
index c16781f..0000000
--- a/scripts/desktop.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-#synapse
-#IN STARTUP ITEMS: gtk-redshift -l 36.3:-80.3 -t 6500:4000
-#sudo add-apt-repository ppa:caffeine-developers/ppa;update;install caffeine
-#variety
-#openjdk7-jre
-#python3.2
-#ffmpeg
-#owncloud-client
-synaptic
-python-glade2
-compiz-plugins-extra
-compizconfig-settings-manager
-ntp
-cplay
-ubuntu-restricted-extras
-gparted
-mysql-workbench
-wireshark
-unetbootin
-#exiv2
-xdotool
-htop
-#wicd-daemon
-#wicd-curses
-kvpnc
-sqlitebrowser
-lsb
-python-tk
-xinit
-suckless-tools
-pm-utils
-alsa-utils
-numlockx
-#virtualbox
-x11vnc
-xvnc4viewer
-ntop
-powermanagement-interface
-mpd mpc ncmpcpp
-
-# Standard Desktop Applications
-#firefox thunderbird
-meld filezilla
-audacity vlc gimp winff blender banshee kdenlive
-libnotify-bin xterm xdm i3-wm i3status i3lock feh nitrogen xautolock
-libreoffice libreoffice-templates gnome-dictionary shutter
-diodon synergy
-ark thunar okular tdfsb baobab
-gtk-redshift
-network-manager
-midori
-k3b
-icedtea-7-plugin
-systemsettings
-gtk-theme-switch
-qtcurve
diff --git a/scripts/mini.txt b/scripts/mini.txt
deleted file mode 100644
index f8280e5..0000000
--- a/scripts/mini.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-sudo
-lynx-cur
-unzip
-curl
-wget
-parted
-openssh-server
-python-pip
-screen
-sshfs
-tmux
-git
-lm-sensors
-openvpn
-nload
-zsh
-trash-cli
-multitail
-gdebi
-libpam-google-authenticator
-macchanger
-sshuttle
-w3m
-aircrack-ng
-pv
-tshark
-secure-delete
-ncdu
-nmap
-traceroute
diff --git a/scripts/pip.txt b/scripts/pip.txt
deleted file mode 100644
index 9bb6215..0000000
--- a/scripts/pip.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-argparse
-twisted
-matplotlib
-numpy
-tornado
-mps-youtube
-# Swap monitors
-i3-py
-# Go to window
-quickswitch-i3
-# https://github.com/nojhan/colout
-colout
diff --git a/scripts/ppas.txt b/scripts/ppas.txt
deleted file mode 100644
index a808049..0000000
--- a/scripts/ppas.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-ppa:vincent-c/ponysay
-ppa:danielrichter2007/grub-customizer
-ppa:jerzy-kozera/zeal-ppa
-ppa:glennric/dolphin-emu
-ppa:byteit101/frc-toolchain
diff --git a/scripts/server.txt b/scripts/server.txt
deleted file mode 100644
index b53468f..0000000
--- a/scripts/server.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-#sudo add-apt-repository ppa:vincent-c/ponysay
-sudo
-software-properties-common
-tasksel
-#tasksel install lamp-server
-bum
-openssh-server
-lynx-cur
-unzip
-curl
-wget
-parted
-#libpython2.6
-python-simplejson
-#vim Gotta compile this manually now...
-python-pip
-subversion
-orpie
-aptitude
-screen
-tmux
-git
-#ffmpeg
-sshfs
-wine
-bum
-alien
-lm-sensors
-openvpn
-autojump
-nload
-sox
-libsox-fmt-mp3
-multitail
-zsh
-cups-pdf
-trash-cli
-irssi
-mutt
-gdebi
-ncdu
-nmap
-traceroute
-openjdk-7-jdk
-fdupes
-libssl-dev
-libavahi-client-dev
-libasound2-dev
-libpam-google-authenticator
-iodine
-macchanger
-#mysql-server
-#apache2
-#php5
-#php5-gd
-#php5-curl
-#php-soap
-#php5-json
-#php5-gd
-#php-soap
-#libapache2-mod-php5
-node
-npm
-bsdgames
-sshuttle
-nethogs
-#w3m
-aircrack-ng
-tshark
-secure-delete
-fsniper
-cryptsetup
-pv
-mplayer
-minimodem
-hfsutils
-hfsprogs
-vifm
-git-annex
-ranger
-pwgen
diff --git a/scripts/sync.sh b/scripts/sync.sh
index f8f70aa..07064f3 100755
--- a/scripts/sync.sh
+++ b/scripts/sync.sh
@@ -1,50 +1,21 @@
 ABSPATH=$(\cd "$(dirname "$0")/.."; pwd)
 echo $ABSPATH
-while getopts ":hbsdpcw" VALUE "$@"; do
+while getopts ":shbc" VALUE "$@"; do
   if [ "$VALUE" = "h" ] ; then
     echo "sync.sh syncs configuration files, applications, and Vim bundles between computers"
     echo "    -h Shows this help"
     echo "    -b Syncs Vim bundles"
-    echo "    -s Syncs computer with server applications in server.txt"
-    echo "    -d Syncs computer with desktop applications in desktop.txt"
-    echo "    -p Syncs computer with pip applications in pip.txt"
-    echo "    -c Syncs other configuration files"
-    echo "    -w Installs wemux [requires vim]"
+    echo "    -s Use this if you don't want custom stonewareslord settings (use after -s)"
+    echo "    -c Sync configuration files"
+  fi
+  if [ "$VALUE" = "s" ] ; then
+    sed -i'' -e '/email = stonewareslord@gmail.com/d' -e '/user = Austen Adler/d' -e '/\[user\]/d' -e '/signingkey = CCDFE3F1/d' ~/.gitconfig
   fi
   if [ "$VALUE" = "b" ] ; then
     trash ~/.vimrc || rm ~/.vimrc 
     ln -s $ABSPATH/vim/vimrc ~/.vimrc
     vim +"silent! call Initialize()" +q
   fi
-  if [ "$VALUE" = "s" ] ; then
-    if [ "$(uname)" != "Darwin" ]; then
-      echo "Installing server applications:"
-      echo $(grep -vE "^\s*#" $ABSPATH/scripts/server.txt | tr "\n" " ")
-      sudo apt-get install $(grep -vE "^\s*#" $ABSPATH/scripts/server.txt | tr "\n" " ")
-    else
-      if [ -d "/usr/local/Library/Taps/phinze/homebrew-cask" ] ; then
-        brew install caskroom/cask/brew-cask
-        brew cask
-      fi
-      brew cask install gimp inkscape adium vlc iterm2 steam adobe-reader spectacle xquartz
-    fi
-  fi
-  if [ "$VALUE" = "d" ] ; then
-    echo "Installing desktop applications"
-    if [ "$(uname)" != "Darwin" ]; then
-      echo $(grep -vE "^\s*#" $ABSPATH/scripts/server.txt | tr "\n" " ") $(grep -vE "^\s*#" $ABSPATH/scripts/desktop.txt | tr "\n" " ")
-      sudo apt-get install $(grep -vE "^\s*#" $ABSPATH/scripts/server.txt | tr "\n" " ") $(grep -vE "^\s*#" $ABSPATH/scripts/desktop.txt | tr "\n" " ")
-    else
-      brew install macvim --with-cscope --with-lua --HEAD
-      brew install vim --with-lua
-      brew install ncdu htop youtube-dl tree sshfs ircii imagemagick node ffmpeg wget lua libconfig readline meld
-    fi
-  fi
-  if [ "$VALUE" = "p" ] ; then
-    echo "Installing pip applications"
-    echo $(grep -vE "^\s*#" $ABSPATH/scripts/pip.txt | tr "\n" " ")
-    sudo pip install $(grep -vE "^\s*#" $ABSPATH/scripts/pip.txt | tr "\n" " ")
-  fi
   if [ "$VALUE" = "c" ] ; then
     if [ "$2" = "-f" ] ; then
       # Reinstall antigen
@@ -103,19 +74,10 @@ while getopts ":hbsdpcw" VALUE "$@"; do
       mkdir -p ~/.config/synapse
       ln -s $ABSPATH/i3/gtkrc ~/.config/synapse/gtkrc
       ln -s $ABSPATH/shells/Xresources ~/.Xresources
-      xrdb ~/.Xresources
+      if command -v xrdb 2>&1 >/dev/null; then
+        xrdb ~/.Xresources
+      fi
     fi
   fi
-  if [ "$VALUE" = "w" ] ; then
-    echo "Installing wemux..."
-    sudo git clone git://github.com/zolrath/wemux.git /usr/local/share/wemux
-    sudo rm -r /usr/local/bin/wemux
-    sudo rm -r /usr/local/etc/wemux.conf
-    sudo ln -s /usr/local/share/wemux/wemux /usr/local/bin/wemux
-    sudo mkdir -p /usr/local/etc
-    sudo cp /usr/local/share/wemux/wemux.conf.example /usr/local/etc/wemux.conf
-    sudo vim `which wemux` +"execute \"normal gg/tmux\<CR>nnnea -2\<Esc>nea -2\<Esc>ggZZ\""
-    sudo vim /usr/local/etc/wemux.conf +":execute \"normal gg/host_list\<CR>nnww\""
-  fi
 done
 echo "Done syncing"
diff --git a/shells/bashrc b/shells/bashrc
index bfacba3..18621b8 100644
--- a/shells/bashrc
+++ b/shells/bashrc
@@ -1,4 +1,2 @@
-export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/home/stonewareslord/tmp/ucpp/ucpp/:/home/stonewareslord/tmp/ucpp/ucpp/:/home/stonewareslord/hitchhikers/bin/ucpp/ucpp:/home/stonewareslord/hitchhikers/bin/ucpp/ucpp
+export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
 PS1="$ "
-
-[ -f ~/.fzf.bash ] && source ~/.fzf.bash
diff --git a/shells/zshrc b/shells/zshrc
index ac2c47d..f51ec9c 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -255,9 +255,9 @@ ctar(){
 }
 offline(){
   if [ ! -z "$@" ] ; then
-    sudo unshare -n -- sudo -u stonewareslord zsh -c "$@"
+    sudo unshare -n -- sudo -u $USER zsh -c "$@"
   else
-    sudo unshare -n -- sudo -u stonewareslord LP_MARK_PREFIX=" $(tput setaf 1)(offline)$(tput sgr0) " zsh
+    sudo unshare -n -- sudo -u $USER LP_MARK_PREFIX=" $(tput setaf 1)(offline)$(tput sgr0) " zsh
   fi
 }
 dnstest(){
@@ -455,8 +455,7 @@ fi
 #if command -v greadlink 2>&1 >/dev/null; then
 #  alias readlink='greadlink'
 #fi
-#alias adk='/home/stonewareslord/Applications/adk/bin/studio.sh & disown'
-#alias steamo='sudo kill -9 `pidof steam`;sudo unshare -n -- sh -c "ifconfig lo up;sudo -u stonewareslord steam" > /dev/null 2>&1 & disown'
+#alias steamo='sudo kill -9 `pidof steam`;sudo unshare -n -- sh -c "ifconfig lo up;sudo -u $USER steam" > /dev/null 2>&1 & disown'
 #alias bat='upower -i /org/freedesktop/UPower/devices/battery_BAT0| grep -E "state|to\ full|percentage"'
 #alias aoeu='setxkbmap -layout us -option "'
 #alias asdf='setxkbmap -layout dvorak -option ""'
diff --git a/vim/vimrc b/vim/vimrc
index 6a3fcda..3929b93 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -213,7 +213,7 @@ let g:formatter_php = ['formatdef_my_custom_php']
 " These flags don't work for some reason
 " -xn -xc -xl -S
 "Syntastic
-let g:syntastic_java_javac_classpath = "/home/stonewareslord/applications/java/junit-4.12.jar:/home/stonewareslord/applications/java/hamcrest-core-1.3.jar:~/wpilib/java/current/lib/WPILib.jar:~/wpilib/java/current/lib/NetworkTables.jar:~/git/ford-java/src"
+let g:syntastic_java_javac_classpath = "~/applications/java/junit-4.12.jar:~/applications/java/hamcrest-core-1.3.jar:~/wpilib/java/current/lib/WPILib.jar:~/wpilib/java/current/lib/NetworkTables.jar:~/git/ford-java/src"
 "IndentGuides
 let g:indent_guides_start_level=1
 let g:indent_guides_guide_size=1
diff --git a/zsh/config.zsh b/zsh/config.zsh
index c964f27..66e77dd 100644
--- a/zsh/config.zsh
+++ b/zsh/config.zsh
@@ -7,11 +7,12 @@ secure_ssh() {
   echo "Copying script over..."
   ssh $* 'cat > /tmp/script.sh' <<'EOF'
 cp /etc/ssh/sshd_config /etc/ssh/sshd_config.bak
+sed -ri'' 's/^(\s*IgnoreRhosts\s)/#\1/gI' /etc/ssh/sshd_config
 sed -ri'' 's/^(\s*Protocol\s)/#\1/gI' /etc/ssh/sshd_config
 sed -ri'' 's/^(\s*UseDNS\s)/#\1/gI' /etc/ssh/sshd_config
 sed -ri'' 's/^(\s*PermitEmptyPasswords\s)/#\1/gI' /etc/ssh/sshd_config
 sed -ri'' 's/^(\s*PermitRootLogin\s)/#\1/gI' /etc/ssh/sshd_config
-(echo -e "Protocol 2\nUseDNS no\nPermitEmptyPasswords no\nPermitRootLogin no";cat /etc/ssh/sshd_config)>/tmp/sshd_config
+(echo -e "Protocol 2\nUseDNS no\nPermitEmptyPasswords no\nPermitRootLogin no\nIgnoreRhosts yes";cat /etc/ssh/sshd_config)>/tmp/sshd_config
 mv /tmp/sshd_config /etc/ssh/sshd_config
 diff -urN /etc/ssh/sshd_config.bak /etc/ssh/sshd_config
 sshd -t