diff --git a/nvim/colors/dotfiles.vim b/nvim/colors/dotfiles.vim
index 0a69a98..270e8e1 100644
--- a/nvim/colors/dotfiles.vim
+++ b/nvim/colors/dotfiles.vim
@@ -54,7 +54,7 @@
   hi! link Directory Title
   call s:hi('Conceal',    0xC,  'NONE', '',          '')
   call s:hi('NonText',    0x3,  '',     '',          '')
-  hi! link SpecialKey NonText
+  hi! link SpecialKey Special
   call s:hi('MatchParen', 'fg', 0x3,    '',          '')
 
   call s:hi('Keyword', 0xE, '', '', '')
diff --git a/nvim/dotfiles/plugins-list.vim b/nvim/dotfiles/plugins-list.vim
index 7e94fa2..cb6c36c 100644
--- a/nvim/dotfiles/plugins-list.vim
+++ b/nvim/dotfiles/plugins-list.vim
@@ -55,6 +55,7 @@
 " }}}
 
 " Programming {{{
+  let g:polyglot_disabled = ['sensible']
   Plug 'sheerun/vim-polyglot'
   Plug 'chikamichi/mediawiki.vim'
   Plug 'ron-rs/ron.vim'
diff --git a/nvim/plugin/editing.vim b/nvim/plugin/editing.vim
index 8b2ec27..3b825ba 100644
--- a/nvim/plugin/editing.vim
+++ b/nvim/plugin/editing.vim
@@ -31,6 +31,13 @@ set commentstring=//%s
   let g:indentLine_showFirstIndentLevel = 1
   let g:indentLine_fileTypeExclude = ['text', 'help', 'tutor', 'man']
 
+  augroup vimrc-indentlines-disable
+    autocmd!
+    autocmd TermOpen * IndentLinesDisable
+    " <https://github.com/Yggdroot/indentLine/issues/315#issuecomment-734535963>
+    autocmd VimEnter * if bufname('%') == '' | IndentLinesDisable | endif
+  augroup END
+
   let g:detectindent_max_lines_to_analyse = 128
   let g:detectindent_check_comment_syntax = 1
 
@@ -51,7 +58,7 @@ set commentstring=//%s
 
 " Invisible characters {{{
   set list
-  let &listchars = "tab:\u2192 ,extends:>,precedes:<,eol:\u00ac,trail:\u00b7"
+  let &listchars = "tab:\u2192 ,extends:>,precedes:<,eol:\u00ac,trail:\u00b7,nbsp:+"
   let &showbreak = '>'
   set display+=uhex
 " }}}
diff --git a/nvim/plugin/interface.vim b/nvim/plugin/interface.vim
index 48619e1..11671da 100644
--- a/nvim/plugin/interface.vim
+++ b/nvim/plugin/interface.vim
@@ -137,12 +137,4 @@ endif
 " }}}
 
 
-" Terminal {{{
-  augroup vimrc-terminal
-    autocmd!
-    autocmd TermOpen * IndentLinesDisable
-  augroup END
-" }}}
-
-
 nnoremap <silent> <F9> <Cmd>make<CR>