diff --git a/files/.vimrc b/files/.vimrc
index 6dbf412..a463f65 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -14,9 +14,18 @@ set ttimeoutlen=100
 set scrolloff=5
 set tw=79
 
+" Tab completion
+set wildmode=longest,list,full
+set wildmenu
+
 set exrc
 set secure
 
+if has("autocmd")
+  au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
+    \| exe "normal! g'\"" | endif
+endif
+
 """""""""""""""""" Vundle
 set nocompatible
 filetype off
@@ -37,15 +46,18 @@ Plugin 'tpope/vim-git'
 Plugin 'fs111/pydoc.vim'
 Plugin 'vim-syntastic/syntastic'
 Plugin 'itchyny/vim-haskell-indent'
+Plugin 'junegunn/goyo.vim'
+Plugin 'vim-airline/vim-airline'
+Plugin 'vim-airline/vim-airline-themes'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
 
 
 """""""""""""""""" Syntastic
-set statusline+=%#warningmsg#
-set statusline+=%{SyntasticStatuslineFlag()}
-set statusline+=%*
+" set statusline+=%#warningmsg#
+" set statusline+=%{SyntasticStatuslineFlag()}
+" set statusline+=%*
 let g:syntastic_always_populate_loc_list = 1
 "let g:syntastic_auto_loc_list = 1
 let g:syntastic_check_on_open = 1
@@ -65,7 +77,8 @@ let g:syntastic_cpp_compiler_options = '-std=c++14 -Wall -Wextra'
 
 "" Disabled languages
 "let g:syntastic_mode_map = { 'passive_filetypes': ['python'] }
-let g:syntastic_python_checkers = ['pep8']
+let g:syntastic_python_checkers = ['flake8']
+" let g:syntastic_ignore_files = []
 
 """"""""""""""""" OCaml
 let g:opamshare = substitute(system('opam config var share'),'\n$','','''')
@@ -75,6 +88,11 @@ let g:syntastic_ocaml_checkers = ['merlin']
 """" Ocp-indent (OCaml indentation)
 set rtp^=g:opamshare."/ocp-indent/vim"
 
+""""""""""""""""" Airline
+set laststatus=2
+let g:airline_powerline_fonts = 1
+set noshowmode
+
 """"""""""""""""" Trailing whitespaces
 fun! TrimWhitespace()
     let l:save_cursor = getpos('.')
@@ -105,3 +123,7 @@ noremap <Up> <NOP>
 noremap <Down> <NOP>
 noremap <Left> <NOP>
 noremap <Right> <NOP>
+
+noremap <K> i<CR><Esc>
+xnoremap <leader>b <esc>:'<,'>:w !
+xnoremap <Leader>x <esc>:'<,'>:w !xclip -selection clipboard<CR><esc>