diff --git a/vimrc b/vimrc
index 1b50375..9406289 100644
--- a/vimrc
+++ b/vimrc
@@ -1,3 +1,4 @@
+set background=dark
 syntax on
 filetype plugin indent on
 
@@ -58,12 +59,12 @@ set shortmess+=I
 set pastetoggle=<f2>
 " See :help thesaurus
 set thesaurus=$HOME/Documents/thesaurus/thesaurus_pkg/thesaurus.txt
-set completeopt=menu,menuone,popup,longest
-set completepopup=width:100,height:50,align:menu,border:off
+set pumheight=200
+set completeopt=menu,menuone,popup,longest,noselect,noinsert
+set completepopup=width:300,height:50,align:item,border:off
 
 " Colour scheme:
 colorscheme iceberg
-set background=dark
 
 " Automatically load/save views on files.
 " https://vi.stackexchange.com/posts/13874/revisions
@@ -164,9 +165,6 @@ let g:go_fmt_options = {
       \ }
 autocmd BufNewFile,BufRead *.gohtml set syntax=gohtmltmpl
 autocmd BufNewFile,BufRead *.go nmap <silent> <leader>g6 :GoAlternate!<cr>
-" https://github.com/golang/tools/blob/master/gopls/doc/vim.md#vim-go
-let g:go_def_mode='gopls'
-let g:go_info_mode='gopls'
 
 " Vim-Rust configuration:
 let g:rustfmt_autosave = 1