diff --git a/.config/oni/config.js b/.config/oni/config.js
index b61fe74..23c8b89 100644
--- a/.config/oni/config.js
+++ b/.config/oni/config.js
@@ -27,7 +27,6 @@ exports.configuration = {
     "language.vue.languageServer.command":"vls",
     "experimental.indentLines.enabled": true,
     "oni.useDefaultConfig": true,
-    "tab.mode" : "tabs",
     "oni.bookmarks": ["~/Documents"],
     "editor.textMateHighlighting.enabled" : true,
     "editor.fontSize": "15px",
diff --git a/.oh-my-zsh b/.oh-my-zsh
index 315eb77..f88396e 160000
--- a/.oh-my-zsh
+++ b/.oh-my-zsh
@@ -1 +1 @@
-Subproject commit 315eb77336919d907adf1296ce234d8bc778c005
+Subproject commit f88396e3271b2459e92dfef37ed773fd01c446b8
diff --git a/.tmux.conf.local b/.tmux.conf.local
index 76a4af7..cfb2a3f 100644
--- a/.tmux.conf.local
+++ b/.tmux.conf.local
@@ -273,5 +273,3 @@ bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
 bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
 bind -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
 
-run-shell ~/.tmux/resurrect/resurrect.tmux
-
diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim
index fef1c2f..9a38216 160000
--- a/.vim/bundle/Vundle.vim
+++ b/.vim/bundle/Vundle.vim
@@ -1 +1 @@
-Subproject commit fef1c2f31862c44cf5295ef86c086efba4af20a9
+Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d
diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe
index e49f817..487b8ab 160000
--- a/.vim/bundle/YouCompleteMe
+++ b/.vim/bundle/YouCompleteMe
@@ -1 +1 @@
-Subproject commit e49f817bfe7a7400efcc0b6527188ff6395f996f
+Subproject commit 487b8ab2b4d5bcaece29a17a26818a62616e21b5
diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
index 15d06b6..808f5b2 160000
--- a/.vim/bundle/nerdtree
+++ b/.vim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 15d06b676dfcd92ac9a0bc375668d127f9822539
+Subproject commit 808f5b225b090bb4a94a2c47bb08d1bc1f7f8a4e
diff --git a/.vim/init.vim b/.vim/init.vim
index c051332..e7251b2 120000
--- a/.vim/init.vim
+++ b/.vim/init.vim
@@ -1 +1 @@
-/Users/George/.vimrc
\ No newline at end of file
+/home/george/dotfiles/.vim/../.vimrc
\ No newline at end of file
diff --git a/.vimrc b/.vimrc
index 557e9c6..3b17f85 100644
--- a/.vimrc
+++ b/.vimrc
@@ -14,34 +14,28 @@ Plugin 'gmarik/vundle'
 " Keep bundle commands between here and filetype plugin indent on.
 " scripts on GitHub repos
 if exists('g:gui_oni')
-  set noshowmode
-  set noruler
-  set laststatus=0
-  set noshowcmd
+    set noshowmode
+    set noruler
+    set laststatus=0
+    set noshowcmd
 else 
-  " Statements here
-  Plugin 'Valloric/YouCompleteMe' "This is just the client. Install server
-                                  "with ./<plugin location>/install.sh
-                                  " --clang-completer
-                                  "
-  Plugin 'jistr/vim-nerdtree-tabs'
-  "Configure ctrlp
-  "" Ignore some folders and files for CtrlP indexing
-  let g:ctrlp_custom_ignore = {
-  \ 'dir':  '\.git$\|\.yardoc\|node_modules\|vendor\|log\|tmp$',
-  \ 'file': '\.so$\|\.dat$|\.DS_Store$'
-  \ }
-  set runtimepath^=~/.vim/bundle/ctrlp.vim
-  Plugin 'vim-airline/vim-airline'
-  Plugin 'vim-airline/vim-airline-themes'
-  Plugin 'ctrlpvim/ctrlp.vim'
+    " Statements here
+    Plugin 'Valloric/YouCompleteMe' "This is just the client. Install server
+                                    "with ./<plugin location>/install.sh
+                                    " --clang-completer
+                                    "
+    Plugin 'jistr/vim-nerdtree-tabs'
+    "Configure ctrlp
+    set runtimepath^=~/.vim/bundle/ctrlp.vim
+    Plugin 'vim-airline/vim-airline'
+    Plugin 'vim-airline/vim-airline-themes'
+    Plugin 'ctrlpvim/ctrlp.vim'
 endif
 
 Plugin 'ap/vim-css-color'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-fireplace'
 Plugin 'tpope/vim-rails'
-Plugin 'tpope/vim-surround'
 Plugin 'altercation/vim-colors-solarized'
 Plugin 'scrooloose/nerdtree'
 Plugin 'airblade/vim-gitgutter'
@@ -99,9 +93,9 @@ if _curfile =~ "Makefile" || _curfile =~ "makefile" || _curfile =~ ".*\.mk"
     set noexpandtab
 else
     set expandtab
-    set tabstop=2
-    set shiftwidth=2
-    set softtabstop=2
+    set tabstop=4
+    set shiftwidth=4
+    set softtabstop=4
 endif
 
 "===================== Reselect visual block after indent/outdent ===========
diff --git a/.zshrc b/.zshrc
index b0dfbd4..4e3085f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -92,18 +92,27 @@ plugins=(
 
 source $ZSH/oh-my-zsh.sh
 
+fpath+=('/usr/local/lib/node_modules/pure-prompt/functions')
 fpath+=('/home/george/.npm-global/lib/node_modules/pure-prompt/functions')
+
 autoload -U promptinit; promptinit
 prompt pure
 
 compinit
+
+export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"
+export ANDROID_HOME="$HOME/Android/Sdk"
+export PATH="$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH"
+export PATH="$HOME/bin:$HOME/.local/bin:$PATH"
+export PATH="$HOME/.npm-global/bin/:$PATH"
+export PATH="$HOME/.local/kitty.app/bin:$PATH"
+
 # Completion for kitty
 #kitty + complete setup zsh | source /dev/stdin
 
 # User configuration
 
 bindkey "^P" up-line-or-search
-bindkey jk vi-cmd-mode
 setopt NO_NOMATCH
 
 export PATH=$HOME/Android/Sdk/tools/bin:$PATH
@@ -136,16 +145,10 @@ export PATH=$HOME/android-studio/bin:$PATH
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 alias dc="docker-compose"
 alias d="docker"
-alias psc="psc-package"
 
 ###-tns-completion-start-###
 if [ -f /home/george/.tnsrc ]; then 
     source /home/george/.tnsrc 
 fi
 
-export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"
-export ANDROID_HOME="$HOME/Android/Sdk"
-export PATH="$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH"
-export PATH="$HOME/bin:$HOME/.local/bin:$PATH"
-export PATH="$HOME/.npm-global/bin/:$PATH"
 ###-tns-completion-end-###