diff --git a/vim/vimrc b/vim/vimrc
index 3c974f1..4039e87 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -13,7 +13,10 @@ runtime! debian.vim
 " Uncomment the next line to make Vim more Vi-compatible
 " NOTE: debian.vim sets 'nocompatible'.  Setting 'compatible' changes numerous
 " options, so any other options should be set AFTER setting 'compatible'.
-"set compatible
+if &compatible
+  set nocompatible
+endif
+
 
 " Vim5 and later versions support syntax highlighting. Uncommenting the next
 " line enables syntax highlighting by default.
@@ -45,7 +48,6 @@ set smartcase		" Do smart case matching
 set incsearch		" Incremental search
 set autowrite		" Automatically save before commands like :next and :make
 set hidden             " Hide buffers when they are abandoned
-set mouse=a		" Enable mouse usage (all modes)
 set autoread
 set number
 
@@ -192,40 +194,45 @@ nmap <Leader>v :e $MYVIMRC <CR>
 
 set clipboard=unnamedplus
 
+" -------------------------------------------------
+" Start Dein scripts
+" https://github.com/Shougo/dein.vim
+"--------------------------------------------------
 "
-""""""""""""""""""""""""""""""""
-" => NeoBUndle
-""""""""""""""""""""""""
+" Add the dein installation directory into runtimepath
+set runtimepath+=~/.cache/dein/repos/github.com/Shougo/dein.vim
 
-"NeoBundle Scripts-----------------------------
-if has('vim_starting')
-  set nocompatible               " Be iMproved
 
-  " Required:
-  set runtimepath+=~/.vim/bundle/neobundle.vim/
+if dein#load_state('~/.cache/dein')
+  call dein#begin('~/.cache/dein')
+
+  call dein#add('~/.cache/dein/repos/github.com/Shougo/dein.vim')
+  call dein#add('Shougo/deoplete.nvim')
+  if !has('nvim')
+    call dein#add('roxma/nvim-yarp')
+    call dein#add('roxma/vim-hug-neovim-rpc')
+  endif
+
+  call dein#end()
+  call dein#save_state()
 endif
 
-" Required:
-call neobundle#begin(expand('~/.vim/bundle'))
 
-" Let NeoBundle manage NeoBundle
-" Required:
-NeoBundleFetch 'Shougo/neobundle.vim'
 
 " My Bundles here:
-NeoBundle 'terryma/vim-expand-region'
+call dein#add('terryma/vim-expand-region')
 vmap v <Plug>(expand_region_expand)
 vmap <C-v> <Plug>(expand_region_shrink)
 
-NeoBundle 'Shougo/neosnippet.vim'
-NeoBundle 'Shougo/neosnippet-snippets'
-NeoBundle 'tpope/vim-git'
-NeoBundle 'tpope/vim-fugitive'
-NeoBundle 'kien/ctrlp.vim'
-NeoBundle 'flazz/vim-colorschemes'
-NeoBundleLazy 'nathanaelkane/vim-indent-guides' " color indentation
-NeoBundle 'scrooloose/nerdtree'
-"NeoBundle 'Valloric/YouCompleteMe', {
+call dein#add('Shougo/neosnippet.vim')
+call dein#add('Shougo/neosnippet-snippets')
+call dein#add('tpope/vim-git')
+call dein#add('tpope/vim-fugitive')
+call dein#add('kien/ctrlp.vim')
+call dein#add('flazz/vim-colorschemes')
+call dein#add('nathanaelkane/vim-indent-guides') " color indentation
+call dein#add('scrooloose/nerdtree')
+"call dein#add('Valloric/YouCompleteMe'), {
 ""     \ 'build' : {
 ""     \     'mac' : './install.sh --clang-completer --system-libclang --omnisharp-completer',
 ""     \     'unix' : './install.sh --clang-completer --system-libclang --omnisharp-completer',
@@ -233,67 +240,86 @@ NeoBundle 'scrooloose/nerdtree'
 ""     \     'cygwin' : './install.sh --clang-completer --system-libclang --omnisharp-completer'
 ""     \    }
 ""     \ }
-"NeoBundle 'Valloric/YouCompleteMe', {
+"call dein#add('Valloric/YouCompleteMe'), {
 "      \ 'build' : {
 "      \     'mac' : './install.sh',
 "      \    },
 "      \ }
 " Syntax checker
-NeoBundle 'scrooloose/syntastic'
-NeoBundle 'vim-ruby/vim-ruby' "Ruby
-NeoBundle 'tpope/vim-endwise' "Add endif, end and other stuff
+call dein#add('scrooloose/syntastic')
+call dein#add('vim-ruby/vim-ruby' ,{ 'on_ft': 'ruby'}) "Ruby
+call dein#add('tpope/vim-endwise') "Add endif, end and other stuff
 ""NeoBundleLazy 'masudaK/vim-python'
-NeoBundle 'klen/python-mode'
+call dein#add('klen/python-mode' ,{'on_ft': 'python'})
 
 " Show gitdiff
-NeoBundle 'airblade/vim-gitgutter'
+call dein#add('airblade/vim-gitgutter')
 " Disable plugins for LargeFile
-NeoBundle 'vim-scripts/LargeFile'
-NeoBundle 'vim-scripts/DoxygenToolkit.vim' "Generate doxygen
-NeoBundle 'davidhalter/jedi-vim' "Generate doxygen
-NeoBundle 'ervandew/supertab' "SuperTab
-NeoBundle 'sukima/xmledit.git' "xmledit
-NeoBundle 'yuroyoro/vim-autoclose'
-NeoBundle 'tpope/vim-endwise'
-NeoBundle 'scrooloose/nerdcommenter' "Comment out lines or blocks
-NeoBundle 'nathanaelkane/vim-indent-guides' "Shows indents
-NeoBundle 'nelstrom/vim-visual-star-search' "Search for visual with *
-NeoBundle 'vim-airline/vim-airline' "For the status line
-NeoBundle 'vim-airline/vim-airline-themes' "For the status line
-NeoBundle 'bling/vim-bufferline'
-"NeoBundle 'fholgado/minibufexpl.vim'
-NeoBundle 'altercation/vim-colors-solarized'
-NeoBundle 'ujihisa/unite-colorscheme'
-NeoBundle 'docunext/closetag.vim.git'
-NeoBundle 'skammer/vim-css-color'
-NeoBundle 'StanAngeloff/php.vim'
-NeoBundle 'mattn/emmet-vim/'
-NeoBundle 'vim-scripts/keepcase.vim'
+call dein#add('vim-scripts/LargeFile')
+call dein#add('vim-scripts/DoxygenToolkit.vim') "Generate doxygen
+call dein#add('davidhalter/jedi-vim', {
+    \ 'if': has('pythonx'),
+    \ 'on_cmd': 'JediClearCache',
+    \ 'on_ft': 'python',
+    \ })
+call dein#add('ervandew/supertab') "SuperTab
+call dein#add('sukima/xmledit.git' ,{'on_ft': 'xml'}) "xmledit
+call dein#add('yuroyoro/vim-autoclose')
+call dein#add('tpope/vim-endwise')
+call dein#add('scrooloose/nerdcommenter') "Comment out lines or blocks
+call dein#add('nathanaelkane/vim-indent-guides') "Shows indents
+call dein#add('nelstrom/vim-visual-star-search') "Search for visual with *
+call dein#add('vim-airline/vim-airline') "For the status line
+call dein#add('vim-airline/vim-airline-themes') "For the status line
+call dein#add('bling/vim-bufferline')
+"call dein#add('fholgado/minibufexpl.vim')
+call dein#add('altercation/vim-colors-solarized')
+call dein#add('ujihisa/unite-colorscheme')
+call dein#add('docunext/closetag.vim.git')
+call dein#add('skammer/vim-css-color' ,{'on_ft': 'css'})
+call dein#add('StanAngeloff/php.vim' ,{'on_ft': 'php'})
+call dein#add('mattn/emmet-vim/')
+call dein#add('vim-scripts/keepcase.vim')
 " Javascript
-NeoBundle 'othree/yajs.vim'
-NeoBundle 'othree/javascript-libraries-syntax.vim'
-NeoBundle 'bigfish/vim-js-context-coloring'
-NeoBundle 'vim-scripts/SyntaxComplete'
+call dein#add('othree/yajs.vim' ,{'on_ft': 'js'})
+call dein#add('othree/javascript-libraries-syntax.vim' ,{'on_ft': 'js'})
+call dein#add('bigfish/vim-js-context-coloring' ,{'on_ft': 'js'})
+call dein#add('vim-scripts/SyntaxComplete')
 " Arduino
-NeoBundle 'sudar/vim-arduino-syntax'
-""NeoBundle 'Lokaltog/powerline',  {'rtp': 'powerline/bindings/vim/'} " For the line in the bottom
+call dein#add('sudar/vim-arduino-syntax' ,{'on_ft': 'ino'})
+""call dein#add('Lokaltog/powerline',  {'rtp': 'powerline/bindings/vim/')} " For the line in the bottom
 " You can specify revision/branch/tag.
-NeoBundle 'Shougo/vimshell', { 'rev' : '3787e5' }
+call dein#add('Shougo/vimshell')
 
 " Ctags"
-NeoBundle 'xolox/vim-easytags'
-NeoBundle 'majutsushi/tagbar'
-NeoBundle 'xolox/vim-misc'
+if system("command -v ctags") != '' || system("command -v global") != ''
+
+  call dein#add('xolox/vim-easytags' ,{'on_ft': ['c', 'cpp', 'h']})
+  call dein#add('majutsushi/tagbar')
+  call dein#add('xolox/vim-misc')
+  """"""""""""""""""""""""""""""""
+  " => Easytags
+  """"""""""""""""""""""""
+  set tags=./tags;,tags;
+  let g:easytags_file = '~/.vim/tags'
+  let g:easytags_dynamic_files = 0
+  let g:easytags_always_enabled = 0
+
+
+
+  """"""""""""""""""""""""""""""""
+  " => Tagbar
+  """"""""""""""""""""""""
+  nmap <F7> :TagbarToggle<CR>
+
+endif
 
-" Required:
-call neobundle#end()
 
 " Required:
 filetype plugin indent on
 
 " If there are uninstalled bundles found on startup,
 " this will conveniently prompt you to install them.
-NeoBundleCheck
 "End NeoBundle Scripts-------------------------
 
 "let g:pydiction_location = '~/.vim/bundle/pydiction/complete-dict'
@@ -304,23 +330,6 @@ nnoremap <buffer> <F9> :exec '!python' shellescape(@%, 1)<cr>
 """"""""""""""""""""""""
 let g:used_javascript_libs = 'angularjs,angularui,underscore'
 
-
-""""""""""""""""""""""""""""""""
-" => Easytags
-""""""""""""""""""""""""
-set tags=./tags;,tags;
-let g:easytags_file = '~/.vim/tags'
-let g:easytags_dynamic_files = 0
-let g:easytags_always_enabled = 0
-
-
-
-""""""""""""""""""""""""""""""""
-" => Tagbar
-""""""""""""""""""""""""
-nmap <F7> :TagbarToggle<CR>
-
-
 """"""""""""""""""""""""""""""""
 " => GitGutter
 """"""""""""""""""""""""