diff --git a/.gitignore b/.gitignore
index dfd180c..a280ccf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-bundle/
+plugged/
 spell/
diff --git a/coc-settings.json b/coc-settings.json
new file mode 100644
index 0000000..2c63c08
--- /dev/null
+++ b/coc-settings.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/init.vim b/init.vim
index 84061dd..5cc1129 100644
--- a/init.vim
+++ b/init.vim
@@ -1,25 +1,23 @@
 set nocompatible
 filetype off
-set rtp+=~/.config/nvim/bundle/Vundle.vim
-call vundle#begin('~/.config/nvim/bundle')
-Plugin 'VundleVim/Vundle.vim'
-Plugin 'tpope/vim-fugitive'
-Plugin 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
-Plugin 'scrooloose/nerdcommenter'
-Plugin 'ervandew/supertab'
-Plugin 'javier-lopez/sprunge.vim'
-"Plugin 'vim-syntastic/syntastic'
-Plugin 'vim-scripts/Trailer-Trash'
-Plugin 'vim-scripts/bad-whitespace'
-Plugin 'alvan/vim-closetag'
-Plugin 'aklt/plantuml-syntax'
-Plugin 'danro/rename.vim'
-Plugin 'ciaranm/detectindent'
-Plugin 'jiangmiao/auto-pairs'
-Plugin 'antoyo/vim-licenses'
-Plugin 'altercation/vim-colors-solarized'
-call vundle#end()
+call plug#begin("~/.config/nvim/plugged")
+Plug 'tpope/vim-fugitive'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+Plug 'scrooloose/nerdcommenter'
+"Plug 'ervandew/supertab'
+Plug 'javier-lopez/sprunge.vim'
+Plug 'vim-scripts/Trailer-Trash'
+Plug 'vim-scripts/bad-whitespace'
+Plug 'alvan/vim-closetag'
+Plug 'aklt/plantuml-syntax'
+Plug 'danro/rename.vim'
+Plug 'ciaranm/detectindent'
+Plug 'jiangmiao/auto-pairs'
+Plug 'antoyo/vim-licenses'
+Plug 'altercation/vim-colors-solarized'
+Plug 'neoclide/coc.nvim', {'branch': 'release'}
+call plug#end()
 filetype plugin indent on
 " to ignore plugin indent changes, instead use:
 "filetype plugin on
@@ -46,6 +44,15 @@ set foldmethod=syntax
 set foldlevel=0
 set foldnestmax=1
 
+" CoC settings
+"inoremap <silent><expr> <TAB>
+			"\ pumvisible() ? "\<C-n>" :
+			"\ <SID>check_back_space() ? "\<TAB>" :
+			"\ coc#refresh()
+"inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
+inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
+inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
+
 " syntax highlighting
 syntax on
 set background=dark
@@ -91,17 +98,6 @@ let g:airline_symbols.whitespace = 'Ξ'
 let g:airline#extensions#whitespace#mixed_indent_algo = 2
 let g:airline#extensions#whitespace#checks = [ 'indent', 'long']
 
-" syntastic
-"set statusline+=%#warningmsg#
-"set statusline+=%{SyntasticStatuslineFlag()}
-"set statusline+=%*
-
-"let g:syntastic_cpp_checkers = [ "g++" ]
-"let g:syntastic_always_populate_loc_list = 1
-"let g:syntastic_auto_loc_list = 1
-"let g:syntastic_check_on_open = 1
-"let g:syntastic_check_on_wq = 0
-
 " vim-licenses
 let g:licenses_copyright_holders_name = 'Ortega Froysa, Nicolás <nicolas@ortegas.org>'
 let g:licenses_authors_name = 'Ortega Froysa, Nicolás <nicolas@ortegas.org>'