Merge pull request #35 from fnune/change-default-keyword

Use ! instead of default and support Neovim 0.6

182 files changed, 22022 insertions, 18200 deletions

diff --git a/colors/base16-3024.vim b/colors/base16-3024.vim
index 3848760..5ae9e40 100644
--- a/colors/base16-3024.vim
+++ b/colors/base16-3024.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-apathy.vim b/colors/base16-apathy.vim
index f903cc8..e94507e 100644
--- a/colors/base16-apathy.vim
+++ b/colors/base16-apathy.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-apprentice.vim b/colors/base16-apprentice.vim
index d57bea1..7166d46 100644
--- a/colors/base16-apprentice.vim
+++ b/colors/base16-apprentice.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-ashes.vim b/colors/base16-ashes.vim
index 8e6f385..6a8bf3b 100644
--- a/colors/base16-ashes.vim
+++ b/colors/base16-ashes.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-cave-light.vim b/colors/base16-atelier-cave-light.vim
index ab051a1..02e873d 100644
--- a/colors/base16-atelier-cave-light.vim
+++ b/colors/base16-atelier-cave-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-cave.vim b/colors/base16-atelier-cave.vim
index 9795aa6..1c17d54 100644
--- a/colors/base16-atelier-cave.vim
+++ b/colors/base16-atelier-cave.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-dune-light.vim b/colors/base16-atelier-dune-light.vim
index 3d5a721..afcf9f7 100644
--- a/colors/base16-atelier-dune-light.vim
+++ b/colors/base16-atelier-dune-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-dune.vim b/colors/base16-atelier-dune.vim
index 28d5510..259ceac 100644
--- a/colors/base16-atelier-dune.vim
+++ b/colors/base16-atelier-dune.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-estuary-light.vim b/colors/base16-atelier-estuary-light.vim
index 1607591..30edb81 100644
--- a/colors/base16-atelier-estuary-light.vim
+++ b/colors/base16-atelier-estuary-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-estuary.vim b/colors/base16-atelier-estuary.vim
index 48605bc..c26f136 100644
--- a/colors/base16-atelier-estuary.vim
+++ b/colors/base16-atelier-estuary.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-forest-light.vim b/colors/base16-atelier-forest-light.vim
index a0a7183..f7223b7 100644
--- a/colors/base16-atelier-forest-light.vim
+++ b/colors/base16-atelier-forest-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-forest.vim b/colors/base16-atelier-forest.vim
index eec7dd2..8a5ac0d 100644
--- a/colors/base16-atelier-forest.vim
+++ b/colors/base16-atelier-forest.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-heath-light.vim b/colors/base16-atelier-heath-light.vim
index e2bb52d..f9e95b4 100644
--- a/colors/base16-atelier-heath-light.vim
+++ b/colors/base16-atelier-heath-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-heath.vim b/colors/base16-atelier-heath.vim
index 0f6355c..e0f0a6d 100644
--- a/colors/base16-atelier-heath.vim
+++ b/colors/base16-atelier-heath.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-lakeside-light.vim b/colors/base16-atelier-lakeside-light.vim
index 2da12d9..1e3a8f0 100644
--- a/colors/base16-atelier-lakeside-light.vim
+++ b/colors/base16-atelier-lakeside-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-lakeside.vim b/colors/base16-atelier-lakeside.vim
index b195781..6322d32 100644
--- a/colors/base16-atelier-lakeside.vim
+++ b/colors/base16-atelier-lakeside.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-plateau-light.vim b/colors/base16-atelier-plateau-light.vim
index 313e7d3..99def27 100644
--- a/colors/base16-atelier-plateau-light.vim
+++ b/colors/base16-atelier-plateau-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-plateau.vim b/colors/base16-atelier-plateau.vim
index 78a47ed..a005ec3 100644
--- a/colors/base16-atelier-plateau.vim
+++ b/colors/base16-atelier-plateau.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-savanna-light.vim b/colors/base16-atelier-savanna-light.vim
index 9d8d912..7832fa5 100644
--- a/colors/base16-atelier-savanna-light.vim
+++ b/colors/base16-atelier-savanna-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-savanna.vim b/colors/base16-atelier-savanna.vim
index cd91078..5469e9b 100644
--- a/colors/base16-atelier-savanna.vim
+++ b/colors/base16-atelier-savanna.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-seaside-light.vim b/colors/base16-atelier-seaside-light.vim
index b005190..f1041d4 100644
--- a/colors/base16-atelier-seaside-light.vim
+++ b/colors/base16-atelier-seaside-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-seaside.vim b/colors/base16-atelier-seaside.vim
index 284ebf2..d0064f4 100644
--- a/colors/base16-atelier-seaside.vim
+++ b/colors/base16-atelier-seaside.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-sulphurpool-light.vim b/colors/base16-atelier-sulphurpool-light.vim
index d91066f..a73b766 100644
--- a/colors/base16-atelier-sulphurpool-light.vim
+++ b/colors/base16-atelier-sulphurpool-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atelier-sulphurpool.vim b/colors/base16-atelier-sulphurpool.vim
index a89a3f5..6129a34 100644
--- a/colors/base16-atelier-sulphurpool.vim
+++ b/colors/base16-atelier-sulphurpool.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-atlas.vim b/colors/base16-atlas.vim
index bef8336..6c42503 100644
--- a/colors/base16-atlas.vim
+++ b/colors/base16-atlas.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-bespin.vim b/colors/base16-bespin.vim
index 302224f..eb4be7f 100644
--- a/colors/base16-bespin.vim
+++ b/colors/base16-bespin.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-black-metal-bathory.vim b/colors/base16-black-metal-bathory.vim
index 57aa8ea..ba1fea1 100644
--- a/colors/base16-black-metal-bathory.vim
+++ b/colors/base16-black-metal-bathory.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-black-metal-burzum.vim b/colors/base16-black-metal-burzum.vim
index b78f7c6..2033043 100644
--- a/colors/base16-black-metal-burzum.vim
+++ b/colors/base16-black-metal-burzum.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-black-metal-dark-funeral.vim b/colors/base16-black-metal-dark-funeral.vim
index d79fd92..3f801ad 100644
--- a/colors/base16-black-metal-dark-funeral.vim
+++ b/colors/base16-black-metal-dark-funeral.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-black-metal-gorgoroth.vim b/colors/base16-black-metal-gorgoroth.vim
index ca6ab7b..b3e4ab7 100644
--- a/colors/base16-black-metal-gorgoroth.vim
+++ b/colors/base16-black-metal-gorgoroth.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-black-metal-immortal.vim b/colors/base16-black-metal-immortal.vim
index 8603400..0b5dbfc 100644
--- a/colors/base16-black-metal-immortal.vim
+++ b/colors/base16-black-metal-immortal.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-black-metal-khold.vim b/colors/base16-black-metal-khold.vim
index fdeb484..d114c34 100644
--- a/colors/base16-black-metal-khold.vim
+++ b/colors/base16-black-metal-khold.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-black-metal-marduk.vim b/colors/base16-black-metal-marduk.vim
index b2585e3..d1fc442 100644
--- a/colors/base16-black-metal-marduk.vim
+++ b/colors/base16-black-metal-marduk.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-black-metal-mayhem.vim b/colors/base16-black-metal-mayhem.vim
index e25ac72..a7311b5 100644
--- a/colors/base16-black-metal-mayhem.vim
+++ b/colors/base16-black-metal-mayhem.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-black-metal-nile.vim b/colors/base16-black-metal-nile.vim
index cb007f6..d133fe3 100644
--- a/colors/base16-black-metal-nile.vim
+++ b/colors/base16-black-metal-nile.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-black-metal-venom.vim b/colors/base16-black-metal-venom.vim
index 27aab78..0087c5e 100644
--- a/colors/base16-black-metal-venom.vim
+++ b/colors/base16-black-metal-venom.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-black-metal.vim b/colors/base16-black-metal.vim
index a477f0b..f5a4bf4 100644
--- a/colors/base16-black-metal.vim
+++ b/colors/base16-black-metal.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-brewer.vim b/colors/base16-brewer.vim
index 4180229..5702087 100644
--- a/colors/base16-brewer.vim
+++ b/colors/base16-brewer.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-bright.vim b/colors/base16-bright.vim
index 3ab749f..b3685ed 100644
--- a/colors/base16-bright.vim
+++ b/colors/base16-bright.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-brogrammer.vim b/colors/base16-brogrammer.vim
index 111da64..5396e1a 100644
--- a/colors/base16-brogrammer.vim
+++ b/colors/base16-brogrammer.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-brushtrees-dark.vim b/colors/base16-brushtrees-dark.vim
index 9b37f7f..6950715 100644
--- a/colors/base16-brushtrees-dark.vim
+++ b/colors/base16-brushtrees-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-brushtrees.vim b/colors/base16-brushtrees.vim
index 3398def..bbac2d1 100644
--- a/colors/base16-brushtrees.vim
+++ b/colors/base16-brushtrees.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-chalk.vim b/colors/base16-chalk.vim
index fcca61e..466fb42 100644
--- a/colors/base16-chalk.vim
+++ b/colors/base16-chalk.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-circus.vim b/colors/base16-circus.vim
index 6ec5117..4120c9a 100644
--- a/colors/base16-circus.vim
+++ b/colors/base16-circus.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-classic-dark.vim b/colors/base16-classic-dark.vim
index 5d84bbc..cd5211c 100644
--- a/colors/base16-classic-dark.vim
+++ b/colors/base16-classic-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-classic-light.vim b/colors/base16-classic-light.vim
index 9ba57af..9de8fa5 100644
--- a/colors/base16-classic-light.vim
+++ b/colors/base16-classic-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-codeschool.vim b/colors/base16-codeschool.vim
index e7e1228..5d298b3 100644
--- a/colors/base16-codeschool.vim
+++ b/colors/base16-codeschool.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-colors.vim b/colors/base16-colors.vim
index d10dbd9..daa1ff7 100644
--- a/colors/base16-colors.vim
+++ b/colors/base16-colors.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-cupcake.vim b/colors/base16-cupcake.vim
index b6936d5..640f672 100644
--- a/colors/base16-cupcake.vim
+++ b/colors/base16-cupcake.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-cupertino.vim b/colors/base16-cupertino.vim
index a2d1848..e83fa0b 100644
--- a/colors/base16-cupertino.vim
+++ b/colors/base16-cupertino.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-danqing.vim b/colors/base16-danqing.vim
index 718ef5d..6f8dfd1 100644
--- a/colors/base16-danqing.vim
+++ b/colors/base16-danqing.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-darcula.vim b/colors/base16-darcula.vim
index 2397ace..0474e8f 100644
--- a/colors/base16-darcula.vim
+++ b/colors/base16-darcula.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-darkmoss.vim b/colors/base16-darkmoss.vim
index 93eb528..b4399dd 100644
--- a/colors/base16-darkmoss.vim
+++ b/colors/base16-darkmoss.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-darktooth.vim b/colors/base16-darktooth.vim
index c66f5fc..6a60bd0 100644
--- a/colors/base16-darktooth.vim
+++ b/colors/base16-darktooth.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-darkviolet.vim b/colors/base16-darkviolet.vim
index a6402c8..d0172b4 100644
--- a/colors/base16-darkviolet.vim
+++ b/colors/base16-darkviolet.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-decaf.vim b/colors/base16-decaf.vim
index 4c0590b..c9e8dba 100644
--- a/colors/base16-decaf.vim
+++ b/colors/base16-decaf.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-default-dark.vim b/colors/base16-default-dark.vim
index 9a31ac2..bdd7f3e 100644
--- a/colors/base16-default-dark.vim
+++ b/colors/base16-default-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-default-light.vim b/colors/base16-default-light.vim
index a6064d1..b62a884 100644
--- a/colors/base16-default-light.vim
+++ b/colors/base16-default-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-dirtysea.vim b/colors/base16-dirtysea.vim
index 6bfbda9..20a655d 100644
--- a/colors/base16-dirtysea.vim
+++ b/colors/base16-dirtysea.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-dracula.vim b/colors/base16-dracula.vim
index 9ccab2c..72bbac5 100644
--- a/colors/base16-dracula.vim
+++ b/colors/base16-dracula.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-edge-dark.vim b/colors/base16-edge-dark.vim
index aaf42f6..e694550 100644
--- a/colors/base16-edge-dark.vim
+++ b/colors/base16-edge-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-edge-light.vim b/colors/base16-edge-light.vim
index c2f6d81..df781b4 100644
--- a/colors/base16-edge-light.vim
+++ b/colors/base16-edge-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-eighties.vim b/colors/base16-eighties.vim
index a1b8cb6..408c892 100644
--- a/colors/base16-eighties.vim
+++ b/colors/base16-eighties.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-embers.vim b/colors/base16-embers.vim
index 558a725..a6c7534 100644
--- a/colors/base16-embers.vim
+++ b/colors/base16-embers.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-equilibrium-dark.vim b/colors/base16-equilibrium-dark.vim
index 586b9d4..0a730a1 100644
--- a/colors/base16-equilibrium-dark.vim
+++ b/colors/base16-equilibrium-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-equilibrium-gray-dark.vim b/colors/base16-equilibrium-gray-dark.vim
index 87368f8..e69557e 100644
--- a/colors/base16-equilibrium-gray-dark.vim
+++ b/colors/base16-equilibrium-gray-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-equilibrium-gray-light.vim b/colors/base16-equilibrium-gray-light.vim
index 9dc1625..12f0bf1 100644
--- a/colors/base16-equilibrium-gray-light.vim
+++ b/colors/base16-equilibrium-gray-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-equilibrium-light.vim b/colors/base16-equilibrium-light.vim
index c2d53cf..50ed22e 100644
--- a/colors/base16-equilibrium-light.vim
+++ b/colors/base16-equilibrium-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-espresso.vim b/colors/base16-espresso.vim
index 10e0b02..4b234be 100644
--- a/colors/base16-espresso.vim
+++ b/colors/base16-espresso.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-eva-dim.vim b/colors/base16-eva-dim.vim
index 234beea..11a63d2 100644
--- a/colors/base16-eva-dim.vim
+++ b/colors/base16-eva-dim.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-eva.vim b/colors/base16-eva.vim
index f148596..fe430db 100644
--- a/colors/base16-eva.vim
+++ b/colors/base16-eva.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-flat.vim b/colors/base16-flat.vim
index 6b77bcf..3ea3cc7 100644
--- a/colors/base16-flat.vim
+++ b/colors/base16-flat.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-framer.vim b/colors/base16-framer.vim
index 75fe29d..853a9e5 100644
--- a/colors/base16-framer.vim
+++ b/colors/base16-framer.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-fruit-soda.vim b/colors/base16-fruit-soda.vim
index 8ae54cc..04dbb15 100644
--- a/colors/base16-fruit-soda.vim
+++ b/colors/base16-fruit-soda.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-gigavolt.vim b/colors/base16-gigavolt.vim
index 934dbb8..09105a1 100644
--- a/colors/base16-gigavolt.vim
+++ b/colors/base16-gigavolt.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-github.vim b/colors/base16-github.vim
index 736d7f7..8144b85 100644
--- a/colors/base16-github.vim
+++ b/colors/base16-github.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-google-dark.vim b/colors/base16-google-dark.vim
index feb5a05..cccb71a 100644
--- a/colors/base16-google-dark.vim
+++ b/colors/base16-google-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-google-light.vim b/colors/base16-google-light.vim
index 5106dac..da40515 100644
--- a/colors/base16-google-light.vim
+++ b/colors/base16-google-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-grayscale-dark.vim b/colors/base16-grayscale-dark.vim
index 5196a2f..b2dc07a 100644
--- a/colors/base16-grayscale-dark.vim
+++ b/colors/base16-grayscale-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-grayscale-light.vim b/colors/base16-grayscale-light.vim
index 1b661db..012a67b 100644
--- a/colors/base16-grayscale-light.vim
+++ b/colors/base16-grayscale-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-greenscreen.vim b/colors/base16-greenscreen.vim
index 3d73192..6a327f6 100644
--- a/colors/base16-greenscreen.vim
+++ b/colors/base16-greenscreen.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-gruvbox-dark-hard.vim b/colors/base16-gruvbox-dark-hard.vim
index 139a0ec..555af44 100644
--- a/colors/base16-gruvbox-dark-hard.vim
+++ b/colors/base16-gruvbox-dark-hard.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-gruvbox-dark-medium.vim b/colors/base16-gruvbox-dark-medium.vim
index a020f60..b85d4a2 100644
--- a/colors/base16-gruvbox-dark-medium.vim
+++ b/colors/base16-gruvbox-dark-medium.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-gruvbox-dark-pale.vim b/colors/base16-gruvbox-dark-pale.vim
index de4dbdf..32f983d 100644
--- a/colors/base16-gruvbox-dark-pale.vim
+++ b/colors/base16-gruvbox-dark-pale.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-gruvbox-dark-soft.vim b/colors/base16-gruvbox-dark-soft.vim
index f7695d2..fa4cccb 100644
--- a/colors/base16-gruvbox-dark-soft.vim
+++ b/colors/base16-gruvbox-dark-soft.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-gruvbox-light-hard.vim b/colors/base16-gruvbox-light-hard.vim
index d164557..694eb7b 100644
--- a/colors/base16-gruvbox-light-hard.vim
+++ b/colors/base16-gruvbox-light-hard.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-gruvbox-light-medium.vim b/colors/base16-gruvbox-light-medium.vim
index c41d673..b59efdc 100644
--- a/colors/base16-gruvbox-light-medium.vim
+++ b/colors/base16-gruvbox-light-medium.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-gruvbox-light-soft.vim b/colors/base16-gruvbox-light-soft.vim
index bb50fd0..bc11cb2 100644
--- a/colors/base16-gruvbox-light-soft.vim
+++ b/colors/base16-gruvbox-light-soft.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-hardcore.vim b/colors/base16-hardcore.vim
index 782a0e4..b7575c9 100644
--- a/colors/base16-hardcore.vim
+++ b/colors/base16-hardcore.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-harmonic-dark.vim b/colors/base16-harmonic-dark.vim
index 8e773f7..28fd594 100644
--- a/colors/base16-harmonic-dark.vim
+++ b/colors/base16-harmonic-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-harmonic-light.vim b/colors/base16-harmonic-light.vim
index 6e9d82e..842057a 100644
--- a/colors/base16-harmonic-light.vim
+++ b/colors/base16-harmonic-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-heetch-light.vim b/colors/base16-heetch-light.vim
index 4a0007a..48e7ecf 100644
--- a/colors/base16-heetch-light.vim
+++ b/colors/base16-heetch-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-heetch.vim b/colors/base16-heetch.vim
index def5b67..cb6d7fb 100644
--- a/colors/base16-heetch.vim
+++ b/colors/base16-heetch.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-helios.vim b/colors/base16-helios.vim
index 2741518..8e61453 100644
--- a/colors/base16-helios.vim
+++ b/colors/base16-helios.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-hopscotch.vim b/colors/base16-hopscotch.vim
index fcccd94..9ac90ed 100644
--- a/colors/base16-hopscotch.vim
+++ b/colors/base16-hopscotch.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-horizon-dark.vim b/colors/base16-horizon-dark.vim
index 4929cb1..6e6c791 100644
--- a/colors/base16-horizon-dark.vim
+++ b/colors/base16-horizon-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-horizon-light.vim b/colors/base16-horizon-light.vim
index 5c1e099..26411df 100644
--- a/colors/base16-horizon-light.vim
+++ b/colors/base16-horizon-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-horizon-terminal-dark.vim b/colors/base16-horizon-terminal-dark.vim
index f217ed5..3af260a 100644
--- a/colors/base16-horizon-terminal-dark.vim
+++ b/colors/base16-horizon-terminal-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-horizon-terminal-light.vim b/colors/base16-horizon-terminal-light.vim
index a070745..66a34d9 100644
--- a/colors/base16-horizon-terminal-light.vim
+++ b/colors/base16-horizon-terminal-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-humanoid-dark.vim b/colors/base16-humanoid-dark.vim
index db27fc9..ded82ba 100644
--- a/colors/base16-humanoid-dark.vim
+++ b/colors/base16-humanoid-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-humanoid-light.vim b/colors/base16-humanoid-light.vim
index 60d9560..a562969 100644
--- a/colors/base16-humanoid-light.vim
+++ b/colors/base16-humanoid-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-ia-dark.vim b/colors/base16-ia-dark.vim
index feebb2f..123eb89 100644
--- a/colors/base16-ia-dark.vim
+++ b/colors/base16-ia-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-ia-light.vim b/colors/base16-ia-light.vim
index 403c2c0..bc47d62 100644
--- a/colors/base16-ia-light.vim
+++ b/colors/base16-ia-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-icy.vim b/colors/base16-icy.vim
index bde906b..797014a 100644
--- a/colors/base16-icy.vim
+++ b/colors/base16-icy.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-irblack.vim b/colors/base16-irblack.vim
index 82522f9..bab4594 100644
--- a/colors/base16-irblack.vim
+++ b/colors/base16-irblack.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-isotope.vim b/colors/base16-isotope.vim
index 60c6996..67b0d4f 100644
--- a/colors/base16-isotope.vim
+++ b/colors/base16-isotope.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-kimber.vim b/colors/base16-kimber.vim
index bb20401..9a74af8 100644
--- a/colors/base16-kimber.vim
+++ b/colors/base16-kimber.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-macintosh.vim b/colors/base16-macintosh.vim
index b8cb167..98fc52b 100644
--- a/colors/base16-macintosh.vim
+++ b/colors/base16-macintosh.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-marrakesh.vim b/colors/base16-marrakesh.vim
index a3f0cd0..f591a33 100644
--- a/colors/base16-marrakesh.vim
+++ b/colors/base16-marrakesh.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-materia.vim b/colors/base16-materia.vim
index 2cc53eb..2c65a4e 100644
--- a/colors/base16-materia.vim
+++ b/colors/base16-materia.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-material-darker.vim b/colors/base16-material-darker.vim
index e24807a..772c095 100644
--- a/colors/base16-material-darker.vim
+++ b/colors/base16-material-darker.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-material-lighter.vim b/colors/base16-material-lighter.vim
index 2ba623e..7be65b5 100644
--- a/colors/base16-material-lighter.vim
+++ b/colors/base16-material-lighter.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-material-palenight.vim b/colors/base16-material-palenight.vim
index 3c7939a..fc25fd6 100644
--- a/colors/base16-material-palenight.vim
+++ b/colors/base16-material-palenight.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-material-vivid.vim b/colors/base16-material-vivid.vim
index 78bc7a4..451efe6 100644
--- a/colors/base16-material-vivid.vim
+++ b/colors/base16-material-vivid.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-material.vim b/colors/base16-material.vim
index 58025bf..bdbcd85 100644
--- a/colors/base16-material.vim
+++ b/colors/base16-material.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-mellow-purple.vim b/colors/base16-mellow-purple.vim
index 5e73048..2667919 100644
--- a/colors/base16-mellow-purple.vim
+++ b/colors/base16-mellow-purple.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-mexico-light.vim b/colors/base16-mexico-light.vim
index 0646091..d22e6f0 100644
--- a/colors/base16-mexico-light.vim
+++ b/colors/base16-mexico-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-mocha.vim b/colors/base16-mocha.vim
index 56eb651..8d22387 100644
--- a/colors/base16-mocha.vim
+++ b/colors/base16-mocha.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-monokai.vim b/colors/base16-monokai.vim
index 2847498..30fec40 100644
--- a/colors/base16-monokai.vim
+++ b/colors/base16-monokai.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-nebula.vim b/colors/base16-nebula.vim
index e922aa6..f523498 100644
--- a/colors/base16-nebula.vim
+++ b/colors/base16-nebula.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-nord.vim b/colors/base16-nord.vim
index 2d6422b..1470159 100644
--- a/colors/base16-nord.vim
+++ b/colors/base16-nord.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-nova.vim b/colors/base16-nova.vim
index 772facb..2425fcc 100644
--- a/colors/base16-nova.vim
+++ b/colors/base16-nova.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-ocean.vim b/colors/base16-ocean.vim
index dffeaed..6787efe 100644
--- a/colors/base16-ocean.vim
+++ b/colors/base16-ocean.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-oceanicnext.vim b/colors/base16-oceanicnext.vim
index 3ea0288..1b75db6 100644
--- a/colors/base16-oceanicnext.vim
+++ b/colors/base16-oceanicnext.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-one-light.vim b/colors/base16-one-light.vim
index bd3e0c0..d9b7e61 100644
--- a/colors/base16-one-light.vim
+++ b/colors/base16-one-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-onedark.vim b/colors/base16-onedark.vim
index 89667cc..c2a4dc0 100644
--- a/colors/base16-onedark.vim
+++ b/colors/base16-onedark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-outrun-dark.vim b/colors/base16-outrun-dark.vim
index 802fc62..96fcdba 100644
--- a/colors/base16-outrun-dark.vim
+++ b/colors/base16-outrun-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-papercolor-dark.vim b/colors/base16-papercolor-dark.vim
index ca5de78..75f5124 100644
--- a/colors/base16-papercolor-dark.vim
+++ b/colors/base16-papercolor-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-papercolor-light.vim b/colors/base16-papercolor-light.vim
index 5d16f93..8b98f24 100644
--- a/colors/base16-papercolor-light.vim
+++ b/colors/base16-papercolor-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-paraiso.vim b/colors/base16-paraiso.vim
index 4de0b13..d26d0fc 100644
--- a/colors/base16-paraiso.vim
+++ b/colors/base16-paraiso.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-pasque.vim b/colors/base16-pasque.vim
index dd3b2ea..093bb15 100644
--- a/colors/base16-pasque.vim
+++ b/colors/base16-pasque.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-phd.vim b/colors/base16-phd.vim
index e655071..d31dcd9 100644
--- a/colors/base16-phd.vim
+++ b/colors/base16-phd.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-pico.vim b/colors/base16-pico.vim
index f5efbaf..3b4f7a3 100644
--- a/colors/base16-pico.vim
+++ b/colors/base16-pico.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-pinky.vim b/colors/base16-pinky.vim
index 078d81a..2f72ae8 100644
--- a/colors/base16-pinky.vim
+++ b/colors/base16-pinky.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-pop.vim b/colors/base16-pop.vim
index dc48489..a1c9b94 100644
--- a/colors/base16-pop.vim
+++ b/colors/base16-pop.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-porple.vim b/colors/base16-porple.vim
index 7f0a8af..cb8128d 100644
--- a/colors/base16-porple.vim
+++ b/colors/base16-porple.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-qualia.vim b/colors/base16-qualia.vim
index aa08b9b..3582a2f 100644
--- a/colors/base16-qualia.vim
+++ b/colors/base16-qualia.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-railscasts.vim b/colors/base16-railscasts.vim
index 4dc50f5..ecf8aad 100644
--- a/colors/base16-railscasts.vim
+++ b/colors/base16-railscasts.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-rebecca.vim b/colors/base16-rebecca.vim
index 17c9118..7ab213b 100644
--- a/colors/base16-rebecca.vim
+++ b/colors/base16-rebecca.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-rose-pine-dawn.vim b/colors/base16-rose-pine-dawn.vim
index 3f3b019..942efd0 100644
--- a/colors/base16-rose-pine-dawn.vim
+++ b/colors/base16-rose-pine-dawn.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-rose-pine-moon.vim b/colors/base16-rose-pine-moon.vim
index c8c247d..b2bde1c 100644
--- a/colors/base16-rose-pine-moon.vim
+++ b/colors/base16-rose-pine-moon.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-rose-pine.vim b/colors/base16-rose-pine.vim
index 12d9d40..fff8ae6 100644
--- a/colors/base16-rose-pine.vim
+++ b/colors/base16-rose-pine.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-sagelight.vim b/colors/base16-sagelight.vim
index 4db6245..bf9576c 100644
--- a/colors/base16-sagelight.vim
+++ b/colors/base16-sagelight.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-sakura.vim b/colors/base16-sakura.vim
index c3c2242..e3202b1 100644
--- a/colors/base16-sakura.vim
+++ b/colors/base16-sakura.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-sandcastle.vim b/colors/base16-sandcastle.vim
index 023c3f5..de6f77b 100644
--- a/colors/base16-sandcastle.vim
+++ b/colors/base16-sandcastle.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-seti.vim b/colors/base16-seti.vim
index 1bce575..c1a3457 100644
--- a/colors/base16-seti.vim
+++ b/colors/base16-seti.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-shades-of-purple.vim b/colors/base16-shades-of-purple.vim
index e1bb346..1d2152b 100644
--- a/colors/base16-shades-of-purple.vim
+++ b/colors/base16-shades-of-purple.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-shapeshifter.vim b/colors/base16-shapeshifter.vim
index 7a5270c..2cae2e1 100644
--- a/colors/base16-shapeshifter.vim
+++ b/colors/base16-shapeshifter.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-silk-dark.vim b/colors/base16-silk-dark.vim
index 18f158e..3e01e51 100644
--- a/colors/base16-silk-dark.vim
+++ b/colors/base16-silk-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-silk-light.vim b/colors/base16-silk-light.vim
index 0598c00..bae0a36 100644
--- a/colors/base16-silk-light.vim
+++ b/colors/base16-silk-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-snazzy.vim b/colors/base16-snazzy.vim
index 53c55a0..44d4361 100644
--- a/colors/base16-snazzy.vim
+++ b/colors/base16-snazzy.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-solarflare-light.vim b/colors/base16-solarflare-light.vim
index 42d90c1..cb4f7c1 100644
--- a/colors/base16-solarflare-light.vim
+++ b/colors/base16-solarflare-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-solarflare.vim b/colors/base16-solarflare.vim
index 040e452..d6178d0 100644
--- a/colors/base16-solarflare.vim
+++ b/colors/base16-solarflare.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-solarized-dark.vim b/colors/base16-solarized-dark.vim
index 579936a..93df42b 100644
--- a/colors/base16-solarized-dark.vim
+++ b/colors/base16-solarized-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-solarized-light.vim b/colors/base16-solarized-light.vim
index 9c0f9f1..990e616 100644
--- a/colors/base16-solarized-light.vim
+++ b/colors/base16-solarized-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-spacemacs.vim b/colors/base16-spacemacs.vim
index 501678a..d1e76c1 100644
--- a/colors/base16-spacemacs.vim
+++ b/colors/base16-spacemacs.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-summercamp.vim b/colors/base16-summercamp.vim
index b999aeb..6a26a7f 100644
--- a/colors/base16-summercamp.vim
+++ b/colors/base16-summercamp.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-summerfruit-dark.vim b/colors/base16-summerfruit-dark.vim
index 055a839..26f1e94 100644
--- a/colors/base16-summerfruit-dark.vim
+++ b/colors/base16-summerfruit-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-summerfruit-light.vim b/colors/base16-summerfruit-light.vim
index 0bf47e2..31ae59f 100644
--- a/colors/base16-summerfruit-light.vim
+++ b/colors/base16-summerfruit-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-synth-midnight-dark.vim b/colors/base16-synth-midnight-dark.vim
index eaa58ba..a9cf946 100644
--- a/colors/base16-synth-midnight-dark.vim
+++ b/colors/base16-synth-midnight-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-synth-midnight-light.vim b/colors/base16-synth-midnight-light.vim
index 2a65e1f..a049216 100644
--- a/colors/base16-synth-midnight-light.vim
+++ b/colors/base16-synth-midnight-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-tango.vim b/colors/base16-tango.vim
index eb4b994..44c236c 100644
--- a/colors/base16-tango.vim
+++ b/colors/base16-tango.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-tender.vim b/colors/base16-tender.vim
index e12ef99..428ac4e 100644
--- a/colors/base16-tender.vim
+++ b/colors/base16-tender.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-tomorrow-night-eighties.vim b/colors/base16-tomorrow-night-eighties.vim
index 170ffaf..9bbbd04 100644
--- a/colors/base16-tomorrow-night-eighties.vim
+++ b/colors/base16-tomorrow-night-eighties.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-tomorrow-night.vim b/colors/base16-tomorrow-night.vim
index 7d8dc56..b3cb434 100644
--- a/colors/base16-tomorrow-night.vim
+++ b/colors/base16-tomorrow-night.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-tomorrow.vim b/colors/base16-tomorrow.vim
index 81160eb..0a97ac8 100644
--- a/colors/base16-tomorrow.vim
+++ b/colors/base16-tomorrow.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-tube.vim b/colors/base16-tube.vim
index d90eb9b..fe34ea5 100644
--- a/colors/base16-tube.vim
+++ b/colors/base16-tube.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-twilight.vim b/colors/base16-twilight.vim
index 208ea6a..b7ed748 100644
--- a/colors/base16-twilight.vim
+++ b/colors/base16-twilight.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-unikitty-dark.vim b/colors/base16-unikitty-dark.vim
index b6aeb7c..08b667c 100644
--- a/colors/base16-unikitty-dark.vim
+++ b/colors/base16-unikitty-dark.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-unikitty-light.vim b/colors/base16-unikitty-light.vim
index 9a3f6f0..a6f58ee 100644
--- a/colors/base16-unikitty-light.vim
+++ b/colors/base16-unikitty-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-vulcan.vim b/colors/base16-vulcan.vim
index 7490ea7..d8162f0 100644
--- a/colors/base16-vulcan.vim
+++ b/colors/base16-vulcan.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-windows-10-light.vim b/colors/base16-windows-10-light.vim
index 7f70c09..15228bb 100644
--- a/colors/base16-windows-10-light.vim
+++ b/colors/base16-windows-10-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-windows-10.vim b/colors/base16-windows-10.vim
index c3b3a27..1731817 100644
--- a/colors/base16-windows-10.vim
+++ b/colors/base16-windows-10.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-windows-95-light.vim b/colors/base16-windows-95-light.vim
index 4b3392c..c5a5a9c 100644
--- a/colors/base16-windows-95-light.vim
+++ b/colors/base16-windows-95-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-windows-95.vim b/colors/base16-windows-95.vim
index 0dd190a..f690525 100644
--- a/colors/base16-windows-95.vim
+++ b/colors/base16-windows-95.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-windows-highcontrast-light.vim b/colors/base16-windows-highcontrast-light.vim
index b348f4a..9f1dbf1 100644
--- a/colors/base16-windows-highcontrast-light.vim
+++ b/colors/base16-windows-highcontrast-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-windows-highcontrast.vim b/colors/base16-windows-highcontrast.vim
index 6eb08ae..70c42f1 100644
--- a/colors/base16-windows-highcontrast.vim
+++ b/colors/base16-windows-highcontrast.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-windows-nt-light.vim b/colors/base16-windows-nt-light.vim
index 81df298..fe06a64 100644
--- a/colors/base16-windows-nt-light.vim
+++ b/colors/base16-windows-nt-light.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-windows-nt.vim b/colors/base16-windows-nt.vim
index 9f0340f..2cf248d 100644
--- a/colors/base16-windows-nt.vim
+++ b/colors/base16-windows-nt.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-woodland.vim b/colors/base16-woodland.vim
index b24a252..0dca7a1 100644
--- a/colors/base16-woodland.vim
+++ b/colors/base16-woodland.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-xcode-dusk.vim b/colors/base16-xcode-dusk.vim
index e820a15..9844d0e 100644
--- a/colors/base16-xcode-dusk.vim
+++ b/colors/base16-xcode-dusk.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting
diff --git a/colors/base16-zenburn.vim b/colors/base16-zenburn.vim
index b37fc29..fc55d2b 100644
--- a/colors/base16-zenburn.vim
+++ b/colors/base16-zenburn.vim
@@ -313,78 +313,78 @@ call <sid>hi("csContextualStatement",   s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("csNewDecleration",        s:gui08, "", s:cterm08, "", "", "")
 
 " Clap highlighting
-hi default link ClapInput             ColorColumn
-hi default link ClapSpinner           ColorColumn
-hi default link ClapDisplay           Default
-hi default link ClapPreview           ColorColumn
-hi default link ClapCurrentSelection  CursorLine
-hi default link ClapNoMatchesFound    ErrorFloat
+hi! link ClapInput             ColorColumn
+hi! link ClapSpinner           ColorColumn
+hi! link ClapDisplay           Default
+hi! link ClapPreview           ColorColumn
+hi! link ClapCurrentSelection  CursorLine
+hi! link ClapNoMatchesFound    ErrorFloat
 
 " Coc highlighting
-hi default link CocErrorSign         ErrorSign
-hi default link CocWarningSign       WarningSign
-hi default link CocInfoSign          InfoSign
-hi default link CocHintSign          HintSign
-
-hi default link CocErrorFloat        ErrorFloat
-hi default link CocWarningFloat      WarningFloat
-hi default link CocInfoFloat         InfoFloat
-hi default link CocHintFloat         HintFloat
-
-hi default link CocErrorHighlight    ErrorHighlight
-hi default link CocWarningHighlight  WarningHighlight
-hi default link CocInfoHighlight     InfoHighlight
-hi default link CocHintHighlight     HintHighlight
-
-hi default link CocSem_angle             Keyword
-hi default link CocSem_annotation        Keyword
-hi default link CocSem_attribute         Type
-hi default link CocSem_bitwise           Keyword
-hi default link CocSem_boolean           Boolean
-hi default link CocSem_brace             Normal
-hi default link CocSem_bracket           Normal
-hi default link CocSem_builtinAttribute  Type
-hi default link CocSem_builtinType       Type
-hi default link CocSem_character         String
-hi default link CocSem_class             Structure
-hi default link CocSem_colon             Normal
-hi default link CocSem_comma             Normal
-hi default link CocSem_comment           Comment
-hi default link CocSem_comparison        Keyword
-hi default link CocSem_concept           Keyword
-hi default link CocSem_constParameter    Identifier
-hi default link CocSem_dependent         Keyword
-hi default link CocSem_dot               Keyword
-hi default link CocSem_enum              Structure
-hi default link CocSem_enumMember        Constant
-hi default link CocSem_escapeSequence    Type
-hi default link CocSem_event             Identifier
-hi default link CocSem_formatSpecifier   Type
-hi default link CocSem_function          Function
-hi default link CocSem_interface         Type
-hi default link CocSem_keyword           Keyword
-hi default link CocSem_label             Keyword
-hi default link CocSem_logical           Keyword
-hi default link CocSem_macro             Macro
-hi default link CocSem_method            Function
-hi default link CocSem_modifier          Keyword
-hi default link CocSem_namespace         Identifier
-hi default link CocSem_number            Number
-hi default link CocSem_operator          Operator
-hi default link CocSem_parameter         Identifier
-hi default link CocSem_parenthesis       Normal
-hi default link CocSem_property          Identifier
-hi default link CocSem_punctuation       Keyword
-hi default link CocSem_regexp            Type
-hi default link CocSem_selfKeyword       Constant
-hi default link CocSem_semicolon         Normal
-hi default link CocSem_string            String
-hi default link CocSem_struct            Structure
-hi default link CocSem_type              Type
-hi default link CocSem_typeAlias         Type
-hi default link CocSem_typeParameter     Type
-hi default link CocSem_unknown           Normal
-hi default link CocSem_variable          Identifier
+hi! link CocErrorSign         ErrorSign
+hi! link CocWarningSign       WarningSign
+hi! link CocInfoSign          InfoSign
+hi! link CocHintSign          HintSign
+
+hi! link CocErrorFloat        ErrorFloat
+hi! link CocWarningFloat      WarningFloat
+hi! link CocInfoFloat         InfoFloat
+hi! link CocHintFloat         HintFloat
+
+hi! link CocErrorHighlight    ErrorHighlight
+hi! link CocWarningHighlight  WarningHighlight
+hi! link CocInfoHighlight     InfoHighlight
+hi! link CocHintHighlight     HintHighlight
+
+hi! link CocSem_angle             Keyword
+hi! link CocSem_annotation        Keyword
+hi! link CocSem_attribute         Type
+hi! link CocSem_bitwise           Keyword
+hi! link CocSem_boolean           Boolean
+hi! link CocSem_brace             Normal
+hi! link CocSem_bracket           Normal
+hi! link CocSem_builtinAttribute  Type
+hi! link CocSem_builtinType       Type
+hi! link CocSem_character         String
+hi! link CocSem_class             Structure
+hi! link CocSem_colon             Normal
+hi! link CocSem_comma             Normal
+hi! link CocSem_comment           Comment
+hi! link CocSem_comparison        Keyword
+hi! link CocSem_concept           Keyword
+hi! link CocSem_constParameter    Identifier
+hi! link CocSem_dependent         Keyword
+hi! link CocSem_dot               Keyword
+hi! link CocSem_enum              Structure
+hi! link CocSem_enumMember        Constant
+hi! link CocSem_escapeSequence    Type
+hi! link CocSem_event             Identifier
+hi! link CocSem_formatSpecifier   Type
+hi! link CocSem_function          Function
+hi! link CocSem_interface         Type
+hi! link CocSem_keyword           Keyword
+hi! link CocSem_label             Keyword
+hi! link CocSem_logical           Keyword
+hi! link CocSem_macro             Macro
+hi! link CocSem_method            Function
+hi! link CocSem_modifier          Keyword
+hi! link CocSem_namespace         Identifier
+hi! link CocSem_number            Number
+hi! link CocSem_operator          Operator
+hi! link CocSem_parameter         Identifier
+hi! link CocSem_parenthesis       Normal
+hi! link CocSem_property          Identifier
+hi! link CocSem_punctuation       Keyword
+hi! link CocSem_regexp            Type
+hi! link CocSem_selfKeyword       Constant
+hi! link CocSem_semicolon         Normal
+hi! link CocSem_string            String
+hi! link CocSem_struct            Structure
+hi! link CocSem_type              Type
+hi! link CocSem_typeAlias         Type
+hi! link CocSem_typeParameter     Type
+hi! link CocSem_unknown           Normal
+hi! link CocSem_variable          Identifier
 
 call <sid>hi("CocHighlightRead",   s:gui0B, s:gui01,  s:cterm0B, s:cterm01, "", "")
 call <sid>hi("CocHighlightText",   s:gui0A, s:gui01,  s:cterm0A, s:cterm01, "", "")
@@ -427,10 +427,10 @@ call <sid>hi("gitcommitDiscardedFile",  s:gui08, "", s:cterm08, "", "bold", "")
 call <sid>hi("gitcommitSelectedFile",   s:gui0B, "", s:cterm0B, "", "bold", "")
 
 " GitGutter highlighting
-hi default link GitGutterAdd            GitAddSign
-hi default link GitGutterChange         GitChangeSign  
-hi default link GitGutterDelete         GitDeleteSign
-hi default link GitGutterChangeDelete   GitChangeDeleteSign
+hi! link GitGutterAdd            GitAddSign
+hi! link GitGutterChange         GitChangeSign  
+hi! link GitGutterDelete         GitDeleteSign
+hi! link GitGutterChangeDelete   GitChangeDeleteSign
 
 " HTML highlighting
 call <sid>hi("htmlBold",    s:gui05, "", s:cterm0A, "", "bold", "")
@@ -507,9 +507,9 @@ call <sid>hi("sassMixing",     s:gui0E, "", s:cterm0E, "", "", "")
 call <sid>hi("sassMixinName",  s:gui0D, "", s:cterm0D, "", "", "")
 
 " Signify highlighting
-hi default link SignifySignAdd    GitAddSign
-hi default link SignifySignChange GitChangeSign
-hi default link SignifySignDelete GitDeleteSign
+hi! link SignifySignAdd    GitAddSign
+hi! link SignifySignChange GitChangeSign
+hi! link SignifySignDelete GitDeleteSign
 
 " Startify highlighting
 call <sid>hi("StartifyBracket",  s:gui03, "", s:cterm03, "", "", "")
@@ -531,29 +531,50 @@ endif
 
 " LSP highlighting
 if has("nvim")
-  hi default link LspDiagnosticsSignError    ErrorSign
-  hi default link LspDiagnosticsSignWarning  WarningSign
-  hi default link LspDiagnosticsSignInfo     InfoSign
-  hi default link LspDiagnosticsSignHint     HintSign
-
-  hi default link LspDiagnosticsVirtualTextError    ErrorSign
-  hi default link LspDiagnosticsVirtualTextWarning  WarningSign
-  hi default link LspDiagnosticsVirtualTextInfo     InfoSign
-  hi default link LspDiagnosticsVirtualTextHint     HintSign
-
-  hi default link LspDiagnosticsFloatingError    ErrorFloat
-  hi default link LspDiagnosticsFloatingWarning  WarningFloat
-  hi default link LspDiagnosticsFloatingInfo     InfoFloat
-  hi default link LspDiagnosticsFloatingHint     HintFloat
-
-  hi default link LspDiagnosticsUnderlineError    ErrorHighlight
-  hi default link LspDiagnosticsUnderlineWarning  WarningHighlight
-  hi default link LspDiagnosticsUnderlineInfo     InfoHighlight
-  hi default link LspDiagnosticsUnderlineHint     HintHighlight
-
-  hi default link LspReferenceText   ReferenceText
-  hi default link LspReferenceRead   ReferenceRead
-  hi default link LspReferenceWrite  ReferenceWrite
+  hi! link DiagnosticError  ErrorSign
+  hi! link DiagnosticWarn   WarningSign
+  hi! link DiagnosticInfo   InfoSign
+  hi! link DiagnosticHint   HintSign
+
+  hi! link DiagnosticFloatingError  ErrorFloat
+  hi! link DiagnosticFloatingWarn   WarningFloat
+  hi! link DiagnosticFloatingInfo   InfoFloat
+  hi! link DiagnosticFloatingHint   HintFloat
+
+  hi! link DiagnosticUnderlineError  ErrorHighlight
+  hi! link DiagnosticUnderlineWarn   WarningHighlight
+  hi! link DiagnosticUnderlineInfo   InfoHighlight
+  hi! link DiagnosticUnderlineHint   HintHighlight
+
+  hi! link DiagnosticsVirtualTextError    ErrorSign
+  hi! link DiagnosticsVirtualTextWarning  WarningSign
+  hi! link DiagnosticsVirtualTextInfo     InfoSign
+  hi! link DiagnosticsVirtualTextHint     HintSign
+
+  " Remove untill endif on next nvim release
+  hi! link LspDiagnosticsSignError    ErrorSign
+  hi! link LspDiagnosticsSignWarning  WarningSign
+  hi! link LspDiagnosticsSignInfo     InfoSign
+  hi! link LspDiagnosticsSignHint     HintSign
+
+  hi! link LspDiagnosticsVirtualTextError    ErrorSign
+  hi! link LspDiagnosticsVirtualTextWarning  WarningSign
+  hi! link LspDiagnosticsVirtualTextInfo     InfoSign
+  hi! link LspDiagnosticsVirtualTextHint     HintSign
+
+  hi! link LspDiagnosticsFloatingError    ErrorFloat
+  hi! link LspDiagnosticsFloatingWarning  WarningFloat
+  hi! link LspDiagnosticsFloatingInfo     InfoFloat
+  hi! link LspDiagnosticsFloatingHint     HintFloat
+
+  hi! link LspDiagnosticsUnderlineError    ErrorHighlight
+  hi! link LspDiagnosticsUnderlineWarning  WarningHighlight
+  hi! link LspDiagnosticsUnderlineInfo     InfoHighlight
+  hi! link LspDiagnosticsUnderlineHint     HintHighlight
+
+  hi! link LspReferenceText   ReferenceText
+  hi! link LspReferenceRead   ReferenceRead
+  hi! link LspReferenceWrite  ReferenceWrite
 endif
 
 " Java highlighting