diff --git a/i3/config b/i3/config
index 855adfe..cda9f45 100644
--- a/i3/config
+++ b/i3/config
@@ -5,6 +5,9 @@ assign [class=Firefox] 2
 #assign [class=Soffice] 3
 exec --no-startup-id "zsh -c 'xrandr --output LVDS1 --primary || xrandr --output HDMI3 --primary'"
 bindsym $mod+shift+d exec i3-input -F 'rename workspace to "%s"' -P 'Rename to: ' 
+bindsym $mod+semicolon exec quickswitch.py -d 'dmenu -b -i -l 20 -sf \#000000 -sb \#5a5a5a -nb \#121212'
+bindsym $mod+p exec dmenu_run -sf \#000000 -sb \#5a5a5a -nb \#121212 -p Run -l 5 -i # -f
+bindsym $mod+shift+p exec "~/.i3/run.sh pass"
 #exec xrandr --output HDMI3 --left-of HDMI1 &
 #exec xmodmap ~/.Xmodmap &
 
@@ -186,10 +189,9 @@ exec --no-startup-id "sleep 25;/usr/bin/owncloud"
 exec --no-startup-id /usr/bin/gtk-redshift -l 36.3:-80.3 -t 6500:4000
 exec --no-startup-id /usr/bin/parcellite
 exec --no-startup-id /usr/bin/numlockx
-bindsym $mod+p exec dmenu_run -sf \#000000 -sb \#5a5a5a -nb \#121212 -p Run -l 5 -i # -f
-bindsym $mod+shift+p exec "~/.i3/run.sh pass"
 #exec --no-startup-id /usr/bin/synapse -s
 exec --no-startup-id /usr/bin/zeal
 exec --no-startup-id xset -b
 exec --no-startup-id zsh -c 'pidof syncthing||screen -dmS syncthing /home/stonewareslord/applications/syncthing/syncthing '
+#smart_borders on
 # vim: ts=2:sw=2:et
diff --git a/i3/xsession b/i3/xsession
index 3a1f4b2..1be03d4 100644
--- a/i3/xsession
+++ b/i3/xsession
@@ -1,5 +1,3 @@
-exec i3
-exec xrandr --output HDMI1 --mode 1920x1080 --primary --output HDMI3 --mode 1920x1080 --left-of HDMI1&
-exec xrandr --output LVDS1 --primary&
+exec /usr/local/bin/i3
 exec numlockx&
 exec syndaemon -i .5 -d&
diff --git a/scripts/pip.txt b/scripts/pip.txt
index cbc5bf9..0de0a9c 100644
--- a/scripts/pip.txt
+++ b/scripts/pip.txt
@@ -4,3 +4,5 @@ matplotlib
 numpy
 tornado
 mps-youtube
+i3-py
+quickswitch-i3
diff --git a/vim/vimrc b/vim/vimrc
index 33d2f11..b82e5ad 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -22,12 +22,9 @@ smap <Expr>\ neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or
 nnoremap <C-w>\| <C-w>v<C-w>l
 nnoremap <C-w>- <C-w>s<C-w>j
 nnoremap <C-d> <C-w>q
-nnoremap <F3> :!make&&echo "Uploading robot code";wput ./PPC603gnu/src/Debug/src.out ftp://frc:frc@10.20.59.2/ni-rt/system/FRC_UserProgram.out<CR>
 nnoremap G G$
 vnoremap G G$
 nnoremap <F5> :GundoToggle<CR>
-nnoremap <F6> :argdo normal <CR>
-nnoremap <F8> :TagbarToggle<CR>
 nnoremap + <C-a>
 nnoremap - <C-x>
 nnoremap Q <Nop>
@@ -119,7 +116,8 @@ nnoremap <Down> <C-w>W
 nnoremap <Left> :bp<CR>
 nnoremap <Right> :bn<CR>
 nnoremap <C-w>z <C-w>_<C-w>\|
-nnoremap <Leader>bun G?Plug <CR>yyjp$hdi'"+gP0Wl3d/\/<CR>xjyyP$"+gp<Esc>:nohlsearch<CR>:up<CR>:PluginInstall
+"nnoremap <Leader>bun G?Plug <CR>yyjp$hdi'"+gP0Wl3d/\/<CR>xjyyP$"+gp<Esc>:nohlsearch<CR>:up<CR>:PluginInstall
+nnoremap <Leader>bun G?Plug <CR>yyjp$hdi'"+gPo  " \| <Esc>"+gp<Esc>:nohlsearch<CR>:up<CR>:PlugInstall
 nnoremap <Leader><C-p> :CtrlPFunky<CR>
 nnoremap <F2> :set invpaste<CR>
 "nnoremap <C-Up> [e
@@ -333,7 +331,10 @@ Plug 'vim-scripts/DoxygenToolkit.vim'
   "Doxygen | https://github.com/vim-scripts/DoxygenToolkit.vim
 Plug 'vim-scripts/SyntaxRange'
   "Range of syntaxes | https://github.com/vim-scripts/SyntaxRange
-  "DO NOT DELETE LINE ABOVE OR \bun WILL BREAK
+Plug 'PotatoesMaster/i3-vim-syntax'
+  "i3 syntax | https://github.com/PotatoesMaster/i3-vim-syntax
+Plug 'https://github.com/fatih/vim-go'
+  " | https://github.com/fatih/vim-go
 call plug#end()
 filetype plugin indent on
 if exists("+undofile")
diff --git a/vimperator/vimperatorrc b/vimperator/vimperatorrc
index 61a9528..bcd928c 100644
--- a/vimperator/vimperatorrc
+++ b/vimperator/vimperatorrc
@@ -31,7 +31,7 @@ vnoremap H ^
 noremap Y :js util.copyToClipboard(content.document.title, true)<CR>
 "set animations=true
 silent! colorscheme vimPgray
-set titlestring=
+set titlestring=Firefox
 set toolbars=noaddons,nobookmarks,nomenu,tabs,nonavigation
 set newtab=all
 "set complete=