diff --git a/vimrc b/vimrc
index 0d4ebd4..be36bc3 100644
--- a/vimrc
+++ b/vimrc
@@ -50,7 +50,7 @@ set ttymouse=sgr
 set mouse=a
 set mousemodel=popup_setpos
 set lazyredraw
-set completeopt=menu,menuone,popup,longest
+set completeopt=menu,menuone,preview,longest
 set timeoutlen=600
 set ballooneval
 set balloonevalterm
@@ -118,6 +118,9 @@ endfunction
 map <Leader>* :call RequestGrep()<CR>
 map <Leader>8 :call RequestGrep()<CR>
 
+" deoplete configuration
+let g:deoplete#enable_at_startup = 1
+
 " vim-markdown configuration:
 let g:vim_markdown_conceal = 1
 
@@ -132,10 +135,6 @@ let g:CommandTGitScanSubmodules=1
 let g:CommandTGitIncludeUntracked=1
 let g:CommandTMatchWindowAtTop=0
 let g:CommandTMaxHeight=20
-" See :h command-t-faq
-if &term =~ "xterm" || &term =~ "screen"
-  let g:CommandTCancelMap = ['<ESC>', '<C-c>']
-end
 
 " Lightline configuration:
 set laststatus=2