diff --git a/colors/codedark.vim b/colors/codedark.vim
index d2291e7..322d869 100644
--- a/colors/codedark.vim
+++ b/colors/codedark.vim
@@ -245,63 +245,78 @@ call <sid>hi('SpellCap', s:cdRed, s:cdBack, 'undercurl', s:cdRed)
 call <sid>hi('SpellRare', s:cdRed, s:cdBack, 'undercurl', s:cdRed)
 call <sid>hi('SpellLocal', s:cdRed, s:cdBack, 'undercurl', s:cdRed)
 
+" Make neovim specific groups load only on Neovim
+if has("nvim")
+    " Neovim Treesitter:
+    call <sid>hiTS('@error', 'TSError', s:cdRed, {}, 'none', {})
+    call <sid>hiTS('@punctuation.delimiter', 'TSPunctDelimiter', s:cdFront, {}, 'none', {})
+    call <sid>hiTS('@punctuation.bracket', 'TSPunctBracket', s:cdFront, {}, 'none', {})
+    call <sid>hiTS('@punctuation.special', 'TSPunctSpecial', s:cdFront, {}, 'none', {})
+    " Constant
+    call <sid>hiTS('@constant', 'TSConstant', s:cdYellow, {}, 'none', {})
+    call <sid>hiTS('@constant.builtin', 'TSConstBuiltin', s:cdBlue, {}, 'none', {})
+    call <sid>hiTS('@constant.macro', 'TSConstMacro', s:cdBlueGreen, {}, 'none', {})
+    call <sid>hiTS('@string.regex', 'TSStringRegex', s:cdOrange, {}, 'none', {})
+    call <sid>hiTS('@string', 'TSString', s:cdOrange, {}, 'none', {})
+    call <sid>hiTS('@string.escape', 'TSStringEscape', s:cdYellowOrange, {}, 'none', {})
+    call <sid>hiTS('@character', 'TSCharacter', s:cdOrange, {}, 'none', {})
+    call <sid>hiTS('@number', 'TSNumber', s:cdLightGreen, {}, 'none', {})
+    call <sid>hiTS('@boolean', 'TSBoolean', s:cdBlue, {}, 'none', {})
+    call <sid>hiTS('@float', 'TSFloat', s:cdLightGreen, {}, 'none', {})
+    call <sid>hiTS('@annotation', 'TSAnnotation', s:cdYellow, {}, 'none', {})
+    call <sid>hiTS('@attribute', 'TSAttribute', s:cdBlueGreen, {}, 'none', {})
+    call <sid>hiTS('@namespace', 'TSNamespace', s:cdBlueGreen, {}, 'none', {})
+    " Functions
+    call <sid>hiTS('@function.builtin', 'TSFuncBuiltin', s:cdYellow, {}, 'none', {})
+    call <sid>hiTS('@function', 'TSFunction', s:cdYellow, {}, 'none', {})
+    call <sid>hiTS('@function.macro', 'TSFuncMacro', s:cdYellow, {}, 'none', {})
+    call <sid>hiTS('@parameter', 'TSParameter', s:cdLightBlue, {}, 'none', {})
+    call <sid>hiTS('@parameter.reference', 'TSParameterReference', s:cdLightBlue, {}, 'none', {})
+    call <sid>hiTS('@method', 'TSMethod', s:cdYellow, {}, 'none', {})
+    call <sid>hiTS('@field', 'TSField', s:cdLightBlue, {}, 'none', {})
+    call <sid>hiTS('@property', 'TSProperty', s:cdLightBlue, {}, 'none', {})
+    call <sid>hiTS('@constructor', 'TSConstructor', s:cdBlueGreen, {}, 'none', {})
+    " Keywords
+    call <sid>hiTS('@conditional', 'TSConditional', s:cdPink, {}, 'none', {})
+    call <sid>hiTS('@repeat', 'TSRepeat', s:cdPink, {}, 'none', {})
+    call <sid>hiTS('@label', 'TSLabel', s:cdLightBlue, {}, 'none', {})
+    call <sid>hiTS('@keyword', 'TSKeyword', s:cdBlue, {}, 'none', {})
+    call <sid>hiTS('@keyword.function', 'TSKeywordFunction', s:cdBlue, {}, 'none', {})
+    call <sid>hiTS('@keyword.operator', 'TSKeywordOperator', s:cdBlue, {}, 'none', {})
+    call <sid>hiTS('@operator', 'TSOperator', s:cdFront, {}, 'none', {})
+    call <sid>hiTS('@exception', 'TSException', s:cdPink, {}, 'none', {})
+    call <sid>hiTS('@type', 'TSType', s:cdBlueGreen, {}, 'none', {})
+    call <sid>hiTS('@type.builtin', 'TSTypeBuiltin', s:cdBlue, {}, 'none', {})
+    call <sid>hi('TSStructure', s:cdLightBlue, {}, 'none', {})
+    call <sid>hiTS('@include', 'TSInclude', s:cdPink, {}, 'none', {})
+    " Variable
+    call <sid>hiTS('@variable', 'TSVariable', s:cdLightBlue, {}, 'none', {})
+    call <sid>hiTS('@variable.builtin', 'TSVariableBuiltin', s:cdLightBlue, {}, 'none', {})
+    " Text
+    call <sid>hiTS('@text', 'TSText', s:cdYellowOrange, {}, 'none', {})
+    call <sid>hiTS('@text.strong', 'TSStrong', s:cdYellowOrange, {}, 'none', {})
+    call <sid>hiTS('@text.emphasis', 'TSEmphasis', s:cdYellowOrange, {}, 'none', {})
+    call <sid>hiTS('@text.underline', 'TSUnderline', s:cdYellowOrange, {}, 'none', {})
+    call <sid>hiTS('@text.title', 'TSTitle', s:cdYellowOrange, {}, 'none', {})
+    call <sid>hiTS('@text.literal', 'TSLiteral', s:cdYellowOrange, {}, 'none', {})
+    call <sid>hiTS('@text.uri', 'TSURI', s:cdYellowOrange, {}, 'none', {})
+    " Tags
+    call <sid>hiTS('@tag', 'TSTag', s:cdBlue, {}, 'none', {})
+    call <sid>hiTS('@tag.delimiter', 'TSTagDelimiter', s:cdGray, {}, 'none', {})
 
-" Neovim Treesitter:
-call <sid>hiTS('@error', 'TSError', s:cdRed, {}, 'none', {})
-call <sid>hiTS('@punctuation.delimiter', 'TSPunctDelimiter', s:cdFront, {}, 'none', {})
-call <sid>hiTS('@punctuation.bracket', 'TSPunctBracket', s:cdFront, {}, 'none', {})
-call <sid>hiTS('@punctuation.special', 'TSPunctSpecial', s:cdFront, {}, 'none', {})
-" Constant
-call <sid>hiTS('@constant', 'TSConstant', s:cdYellow, {}, 'none', {})
-call <sid>hiTS('@constant.builtin', 'TSConstBuiltin', s:cdBlue, {}, 'none', {})
-call <sid>hiTS('@constant.macro', 'TSConstMacro', s:cdBlueGreen, {}, 'none', {})
-call <sid>hiTS('@string.regex', 'TSStringRegex', s:cdOrange, {}, 'none', {})
-call <sid>hiTS('@string', 'TSString', s:cdOrange, {}, 'none', {})
-call <sid>hiTS('@string.escape', 'TSStringEscape', s:cdYellowOrange, {}, 'none', {})
-call <sid>hiTS('@character', 'TSCharacter', s:cdOrange, {}, 'none', {})
-call <sid>hiTS('@number', 'TSNumber', s:cdLightGreen, {}, 'none', {})
-call <sid>hiTS('@boolean', 'TSBoolean', s:cdBlue, {}, 'none', {})
-call <sid>hiTS('@float', 'TSFloat', s:cdLightGreen, {}, 'none', {})
-call <sid>hiTS('@annotation', 'TSAnnotation', s:cdYellow, {}, 'none', {})
-call <sid>hiTS('@attribute', 'TSAttribute', s:cdBlueGreen, {}, 'none', {})
-call <sid>hiTS('@namespace', 'TSNamespace', s:cdBlueGreen, {}, 'none', {})
-" Functions
-call <sid>hiTS('@function.builtin', 'TSFuncBuiltin', s:cdYellow, {}, 'none', {})
-call <sid>hiTS('@function', 'TSFunction', s:cdYellow, {}, 'none', {})
-call <sid>hiTS('@function.macro', 'TSFuncMacro', s:cdYellow, {}, 'none', {})
-call <sid>hiTS('@parameter', 'TSParameter', s:cdLightBlue, {}, 'none', {})
-call <sid>hiTS('@parameter.reference', 'TSParameterReference', s:cdLightBlue, {}, 'none', {})
-call <sid>hiTS('@method', 'TSMethod', s:cdYellow, {}, 'none', {})
-call <sid>hiTS('@field', 'TSField', s:cdLightBlue, {}, 'none', {})
-call <sid>hiTS('@property', 'TSProperty', s:cdLightBlue, {}, 'none', {})
-call <sid>hiTS('@constructor', 'TSConstructor', s:cdBlueGreen, {}, 'none', {})
-" Keywords
-call <sid>hiTS('@conditional', 'TSConditional', s:cdPink, {}, 'none', {})
-call <sid>hiTS('@repeat', 'TSRepeat', s:cdPink, {}, 'none', {})
-call <sid>hiTS('@label', 'TSLabel', s:cdLightBlue, {}, 'none', {})
-call <sid>hiTS('@keyword', 'TSKeyword', s:cdBlue, {}, 'none', {})
-call <sid>hiTS('@keyword.function', 'TSKeywordFunction', s:cdBlue, {}, 'none', {})
-call <sid>hiTS('@keyword.operator', 'TSKeywordOperator', s:cdBlue, {}, 'none', {})
-call <sid>hiTS('@operator', 'TSOperator', s:cdFront, {}, 'none', {})
-call <sid>hiTS('@exception', 'TSException', s:cdPink, {}, 'none', {})
-call <sid>hiTS('@type', 'TSType', s:cdBlueGreen, {}, 'none', {})
-call <sid>hiTS('@type.builtin', 'TSTypeBuiltin', s:cdBlue, {}, 'none', {})
-call <sid>hi('TSStructure', s:cdLightBlue, {}, 'none', {})
-call <sid>hiTS('@include', 'TSInclude', s:cdPink, {}, 'none', {})
-" Variable
-call <sid>hiTS('@variable', 'TSVariable', s:cdLightBlue, {}, 'none', {})
-call <sid>hiTS('@variable.builtin', 'TSVariableBuiltin', s:cdLightBlue, {}, 'none', {})
-" Text
-call <sid>hiTS('@text', 'TSText', s:cdYellowOrange, {}, 'none', {})
-call <sid>hiTS('@text.strong', 'TSStrong', s:cdYellowOrange, {}, 'none', {})
-call <sid>hiTS('@text.emphasis', 'TSEmphasis', s:cdYellowOrange, {}, 'none', {})
-call <sid>hiTS('@text.underline', 'TSUnderline', s:cdYellowOrange, {}, 'none', {})
-call <sid>hiTS('@text.title', 'TSTitle', s:cdYellowOrange, {}, 'none', {})
-call <sid>hiTS('@text.literal', 'TSLiteral', s:cdYellowOrange, {}, 'none', {})
-call <sid>hiTS('@text.uri', 'TSURI', s:cdYellowOrange, {}, 'none', {})
-" Tags
-call <sid>hiTS('@tag', 'TSTag', s:cdBlue, {}, 'none', {})
-call <sid>hiTS('@tag.delimiter', 'TSTagDelimiter', s:cdGray, {}, 'none', {})
+    " nvim-cmp
+    call <sid>hi('CmpItemAbbrDeprecated', s:cdGray, {}, 'none', {})
+    call <sid>hi('CmpItemAbbrMatch', s:cdBlue, {}, 'none', {})
+    call <sid>hi('CmpItemAbbrMatchFuzzy', s:cdBlue, {}, 'none', {})
+    call <sid>hi('CmpItemKindVariable', s:cdLightBlue, {}, 'none', {})
+    call <sid>hi('CmpItemKindInterface', s:cdLightBlue, {}, 'none', {})
+    call <sid>hi('CmpItemKindText', s:cdLightBlue, {}, 'none', {})
+    call <sid>hi('CmpItemKindFunction', s:cdPink, {}, 'none', {})
+    call <sid>hi('CmpItemKindMethod ', s:cdPink, {}, 'none', {})
+    call <sid>hi('CmpItemKindKeyword', s:cdFront, {}, 'none', {})
+    call <sid>hi('CmpItemKindProperty', s:cdFront, {}, 'none', {})
+    call <sid>hi('CmpItemKindUnit', s:cdFront, {}, 'none', {})
+endif
 
 " Markdown:
 call <sid>hi('markdownH1', s:cdBlue, {}, 'bold', {})
@@ -618,16 +633,3 @@ call <sid>hi('LspCxxHlSymNamespace', s:cdSilver, {}, 'none', {})
 " Coc Explorer:
 call <sid>hi('CocHighlightText', {}, s:cdSelection, 'none', {})
 call <sid>hi('CocExplorerIndentLine', s:cdCursorDark, {}, 'none', {})
-
-" nvim-cmp
-call <sid>hi('CmpItemAbbrDeprecated', s:cdGray, {}, 'none', {})
-call <sid>hi('CmpItemAbbrMatch', s:cdBlue, {}, 'none', {})
-call <sid>hi('CmpItemAbbrMatchFuzzy', s:cdBlue, {}, 'none', {})
-call <sid>hi('CmpItemKindVariable', s:cdLightBlue, {}, 'none', {})
-call <sid>hi('CmpItemKindInterface', s:cdLightBlue, {}, 'none', {})
-call <sid>hi('CmpItemKindText', s:cdLightBlue, {}, 'none', {})
-call <sid>hi('CmpItemKindFunction', s:cdPink, {}, 'none', {})
-call <sid>hi('CmpItemKindMethod ', s:cdPink, {}, 'none', {})
-call <sid>hi('CmpItemKindKeyword', s:cdFront, {}, 'none', {})
-call <sid>hi('CmpItemKindProperty', s:cdFront, {}, 'none', {})
-call <sid>hi('CmpItemKindUnit', s:cdFront, {}, 'none', {})