diff --git a/commonshrc b/commonshrc
index 10a17e8..5f12d78 100644
--- a/commonshrc
+++ b/commonshrc
@@ -9,11 +9,11 @@ export USER=`whoami`
 alias ls='ls --color=auto'
 export EMAIL='gebner@gebner.org'
 test -x /usr/bin/lesspipe && eval `lesspipe`
-test -x /usr/bin/vim && export EDITOR=/usr/bin/vim
 
 export MPD_HOST=127.0.0.1 MPD_PORT=6600
 
-alias vi=vim
+export EDITOR="`which nvim || which vim || which vi`"
+alias vi="$EDITOR"
 
 # passc
 passc() {
diff --git a/screenrc b/screenrc
index a31e8cf..1f6ee5f 100644
--- a/screenrc
+++ b/screenrc
@@ -49,4 +49,4 @@ bind - resize -3
 # Mutt demands this
 # http://wiki.mutt.org/?MuttFaq/Appearance
  defbce on
- term screen-bce
+ term screen-256color-bce
diff --git a/vimrc b/vimrc
index 1aae346..cc431d3 100644
--- a/vimrc
+++ b/vimrc
@@ -22,10 +22,12 @@ Plug 'chrisbra/SudoEdit.vim'
 
 Plug 'majutsushi/tagbar'
 Plug 'bling/vim-airline'
-Plug 'scrooloose/syntastic'
 Plug 'tomtom/tcomment_vim'
 " Plug 'jalcine/cmake.vim' --slow
 
+Plug 'benekastah/neomake'
+Plug 'shougo/deoplete.nvim'
+
 Plug 'editorconfig/editorconfig-vim'
 " vim-sleuth?
 
@@ -166,7 +168,7 @@ function LedgerGeneratePostings()
   '<,'>s/\s\s\s+/  /g
 endfunction
 
-if &term == "screen" || &term == "screen-bce"
+if &term == "screen" || &term == "screen-256color-bce"
   set t_ts=k
   set t_fs=\
 endif