diff --git a/.vimrc b/.vimrc
index cf19559..e2bd5ce 100644
--- a/.vimrc
+++ b/.vimrc
@@ -37,7 +37,7 @@ set undolevels=1000
 set undoreload=10000
 set undofile
 
-let &colorcolumn="80,".join(range(120,999),",")
+let &colorcolumn="80,120"
 " }}}
 
 " Shortcuts {{{
@@ -70,6 +70,8 @@ map <Leader>H :s/:\([^ ]*\)\(\s*\)=>/\1:/g<CR>
 
 call plug#begin('~/.vim/plugged')
 
+Plug 'sheerun/vim-polyglot'
+
 " Autocomplete {{{
 Plug 'Valloric/YouCompleteMe'
 "
@@ -92,6 +94,7 @@ Plug 'jpo/vim-railscasts-theme'
 Plug 'dkprice/vim-easygrep'
 
 Plug 'nathanaelkane/vim-indent-guides', { 'on': 'IndentGuidesToggle' }
+Plug 'Yggdroot/indentLine'
 
 Plug 'exu/pgsql.vim', { 'for': 'sql' }
 
@@ -137,8 +140,12 @@ set laststatus=2
 Plug 'kien/ctrlp.vim', { 'on': 'CtrlP' }
 set wildignore+=*/.gem/*,*/vendor/Plug/*,*/tmp/*,log/*,*/tmp/*,*/public/system*,*.orig,*.o,*/public/assets*
 
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+
 Plug 'wikitopian/hardmode'
 
+Plug 'tpope/vim-dispatch'
+
 " RAILS {{{
 Plug 'kchmck/vim-coffee-script'
 Plug 'slim-template/vim-slim', { 'for': 'slim' }
@@ -150,9 +157,11 @@ Plug 'tpope/vim-cucumber'
 Plug 'thoughtbot/vim-rspec'
 Plug 'benmills/vimux'
 
-let g:rspec_command = 'call VimuxRunCommand("bundle exec spring rspec {spec}")'
+let g:rspec_command = 'call VimuxRunCommand("docker-compose run web rspec {spec}")'
 map <Leader>t :call RunCurrentSpecFile()<CR>
-map <Leader>t :call RunAllSpecs()<CR>
+map <Leader>s :call RunNearestSpec()<CR>
+map <Leader>l :call RunLastSpec()<CR>
+map <Leader>a :call RunAllSpecs()<CR>
 
 " }}}
 
@@ -168,9 +177,14 @@ Plug 'mattn/webapi-vim', { 'on': 'Gist' }
 call plug#end()
 filetype plugin indent on
 
+" set Vim-specific sequences for RGB colors
+let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+
 let g:solarized_termcolors=256
-colorscheme railscasts
+set termguicolors
 set background=dark
+colorscheme railscasts
 
 " VIM Flod {{{
 augroup vimrc
diff --git a/nvim.vim b/nvim.vim
new file mode 100644
index 0000000..3bf6f93
--- /dev/null
+++ b/nvim.vim
@@ -0,0 +1,77 @@
+" config
+
+" syntax on
+set ruler
+set ts=2 sts=2 sw=2
+" set nocompatible
+set autoindent
+set number
+set backspace=2
+set ignorecase
+set incsearch
+set cursorline
+set expandtab
+set wildmenu
+set hid
+set lazyredraw
+set autoread
+set history=700
+"set relativenumber
+
+let &colorcolumn="80,120"
+
+" config end
+
+let mapleader = ','
+
+map H :tabp<CR>
+map L :tabn<CR>
+
+map <Leader>S :exec 'Ag' expand('<cword>')<CR>
+
+call plug#begin('~/.nvim/plugged')
+
+Plug 'wikitopian/hardmode'
+autocmd VimEnter,BufNewFile,BufReadPost * silent! call HardMode()
+
+Plug 'jpo/vim-railscasts-theme'
+
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+Plug 'junegunn/fzf.vim'
+
+map <C-p> :FZF<CR>
+map <Leader>g :GFiles?<CR>
+map <Leader>c :BCommits<CR>
+
+Plug 'tpope/vim-fugitive'
+
+Plug 'sheerun/vim-polyglot'
+
+" Completion
+Plug 'roxma/nvim-completion-manager'
+inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
+inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+" pip3 install --user neovim jedi mistune psutil setproctitle
+
+Plug 'Shougo/neco-syntax'
+
+Plug 'SirVer/ultisnips'
+Plug 'honza/vim-snippets'
+let g:UltiSnipsExpandTrigger="<c-l>"
+
+
+Plug 'bling/vim-airline'
+let g:airline#extensions#tabline#enabled = 1
+let g:airline_powerline_fonts = 1
+set laststatus=2
+
+Plug 'Shougo/context_filetype.vim'
+Plug 'joker1007/vim-ruby-heredoc-syntax'
+
+Plug 'neomake/neomake'
+autocmd! BufWritePost * Neomake
+
+call plug#end()
+
+set background=dark
+colorscheme railscasts