galaxyline will follow theme colors, still need themes that support these hl groups tho

3 files changed, 314 insertions, 280 deletions

diff --git a/colors/spacegray.vim b/colors/spacegray.vim
index 0bd60f5f..be065c28 100644
--- a/colors/spacegray.vim
+++ b/colors/spacegray.vim
@@ -1,263 +1,259 @@
-"Theme built with Lush.nvim, exported at Fri Jul  2 13:45:55 2021
-highlight SpecialKey guifg=#5486C0 guibg=NONE guisp=NONE gui=bold blend=NONE
-highlight Title guifg=#5486C0 guibg=NONE guisp=NONE gui=bold blend=NONE
-highlight! link Substitute Search
-highlight MoreMsg guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight Type guifg=#BF85C1 guibg=NONE guisp=NONE gui=NONE blend=NONE
+"Theme built with Lush.nvim, exported at Sun 04 Jul 2021 02:47:35 PM EDT
+highlight StatusLineLspDiagnosticsHint guifg=#4DC1FF guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight BufferInactive guifg=#858585 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight markdownCode guifg=#C67158 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link DiffviewStatusRenamed SignChange
 highlight! link StorageClass Type
-highlight! link Typedef Type
-highlight! link Statement Keyword
-highlight! link Repeat Keyword
-highlight! link Label Keyword
-highlight! link Exception Keyword
-highlight! link Macro PreProc
-highlight! link PreCondit PreProc
-highlight Special guifg=#C67158 guibg=NONE guisp=NONE gui=NONE blend=NONE
 highlight! link SpecialChar Character
-highlight Tag guifg=#7299EE guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight Debug guifg=#AF4B57 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight Delimiter guifg=#9092A2 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight SpecialComment guifg=#858585 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline blend=NONE
-highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic blend=NONE
-highlight Ignore guifg=#C7C8D1 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight Normal guifg=#C7C8D1 guibg=#212121 guisp=NONE gui=NONE blend=NONE
-highlight EndOfBuffer guifg=#212121 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight CursorLine guifg=NONE guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight VertSplit guifg=#393E46 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link CursorColumn CursorLine
+highlight FoldColumn guifg=#858585 guibg=#212121 guisp=NONE gui=NONE blend=NONE
+highlight TabLine guifg=#C7C8D1 guibg=#292929 guisp=NONE gui=NONE blend=NONE
 highlight TelescopeSelection guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight TelescopeMatching guifg=#AF4B57 guibg=NONE guisp=NONE gui=bold blend=NONE
-highlight TelescopeBorder guifg=#858585 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight NvimTreeNormal guifg=#B1B3BE guibg=#292929 guisp=NONE gui=NONE blend=NONE
 highlight NvimTreeGitDelete guifg=#93151B guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight NvimTreeVertSplit guifg=#292929 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight TabLine guifg=#C7C8D1 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight TabLineFill guifg=#C7C8D1 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight! link LspDiagnosticsError LspDiagnosticsSignError
-highlight! link LspDiagnosticsWarning LspDiagnosticsSignWarning
-highlight! link LspDiagnosticsInformation LspDiagnosticsSignInformation
-highlight! link LspDiagnosticsHint LspDiagnosticsSignHint
-highlight BufferVisible guifg=NONE guibg=#212121 guisp=NONE gui=NONE blend=NONE
-highlight BufferVisibleIndex guifg=NONE guibg=#212121 guisp=NONE gui=NONE blend=NONE
-highlight BufferVisibleMod guifg=#FFCC66 guibg=#212121 guisp=NONE gui=NONE blend=NONE
-highlight BufferVisibleSign guifg=#FFCC66 guibg=#212121 guisp=NONE gui=NONE blend=NONE
-highlight BufferVisibleTarget guifg=#AF4B57 guibg=#212121 guisp=NONE gui=bold blend=NONE
-highlight BufferInactiveIndex guifg=#858585 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight BufferInactiveMod guifg=#FFCC66 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight BufferInactiveSign guifg=#858585 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight BufferInactiveTarget guifg=#AF4B57 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight! link htmlH1 Title
-highlight mkdLink guifg=#64A6C4 guibg=NONE guisp=NONE gui=underline blend=NONE
-highlight mkdLineBreak guifg=NONE guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight mkdHeading guifg=#C7C8D1 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link TSKeyword Keyword
-highlight mkdUnderline guifg=#858585 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link TSKeywordFunction Keyword
-highlight markdownCode guifg=#C67158 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link markdownLinkTextDelimiter Delimiter
-highlight! link TSLabel Label
 highlight! link TSMethod Function
-highlight TSNamespace guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Identifier guifg=#C7C8D1 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight NvimTreeRootFolder guifg=#3B6AA0 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight GitSignsChange guifg=#0C7D9D guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link TSLabel Label
+highlight! link TSComment Comment
+highlight! link LspDiagnosticsWarning LspDiagnosticsSignWarning
+highlight SignAdd guifg=#5A7D0C guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link IncSearch Search
+highlight WhichKey guifg=#BF85C1 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link TSLiteral String
+highlight BufferCurrent guifg=NONE guibg=#212121 guisp=NONE gui=NONE blend=NONE
+highlight Todo guifg=#AF4B57 guibg=NONE guisp=NONE gui=bold blend=NONE
+highlight! link TSParameterReference TSParameter
+highlight NvimTreeOpenedFolderName guifg=#4E99BC guibg=NONE guisp=NONE gui=italic blend=NONE
+highlight! link MsgSeparator Normal
+highlight! link TermCursor Cursor
+highlight LspDiagnosticsFloatingHint guifg=#4DC1FF guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link TSConstBuiltin Constant
+highlight TSStrike guifg=NONE guibg=NONE guisp=NONE gui=strikethrough blend=NONE
+highlight Number guifg=#AF4B57 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link WildMenu PmenuSel
+highlight DiffText guifg=NONE guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight SignDelete guifg=#93151B guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Normal guifg=#C7C8D1 guibg=#212121 guisp=NONE gui=NONE blend=NONE
+highlight LspDiagnosticsSignInformation guifg=#FFCC66 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Type guifg=#BF85C1 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Float guifg=#AF4B57 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight CompeDocumentation guifg=NONE guibg=#393E46 guisp=NONE gui=NONE blend=NONE
+highlight Ignore guifg=#C7C8D1 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight GitSignsDelete guifg=#93151B guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link TSConstant Constant
+highlight StatusLineSeparator guifg=NONE guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight! link TSConstructor Type
+highlight! link Substitute Search
+highlight StatusLineGitDelete guifg=#AF4B57 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight LspDiagnosticsSignError guifg=#F44848 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight StatusLineLspDiagnosticsError guifg=#F44848 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight WhichKeyFloat guifg=NONE guibg=#292929 guisp=NONE gui=NONE blend=NONE
 highlight markdownItalic guifg=NONE guibg=NONE guisp=NONE gui=italic blend=NONE
-highlight! link TSNumber Number
+highlight Pmenu guifg=#C7C8D1 guibg=#393E46 guisp=NONE gui=NONE blend=NONE
+highlight! link TabLineWarning LspDiagnosticsSignWarning
+highlight PmenuSel guifg=#262626 guibg=#67899E guisp=NONE gui=NONE blend=NONE
+highlight! link Typedef Type
+highlight! link Define PreProc
+highlight TSError guifg=NONE guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Directory guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight DashboardFooter guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight WhichKeyGroup guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link TermCursorNC Cursor
+highlight MatchParen guifg=NONE guibg=#292929 guisp=NONE gui=NONE blend=NONE
 highlight! link TSOperator Operator
-highlight StatusLineDeco guifg=#EEBA59 guibg=#393E46 guisp=NONE gui=NONE blend=NONE
+highlight TSVariableBuiltin guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight NvimTreeGitDirty guifg=#5A7D0C guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight BufferVisibleIndex guifg=NONE guibg=#212121 guisp=NONE gui=NONE blend=NONE
+highlight LspDiagnosticsFloatingError guifg=#F44848 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight WarningMsg guifg=#AF4B57 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight DashboardCenter guifg=#BF85C1 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Conceal guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight NvimTreeVertSplit guifg=#292929 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight LspDiagnosticsSignWarning guifg=#FF8800 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight LspDiagnosticsUnderlineHint guifg=NONE guibg=NONE guisp=#87B479 gui=underline blend=NONE
+highlight Visual guifg=NONE guibg=#2C2F35 guisp=NONE gui=NONE blend=NONE
+highlight Tag guifg=#7299EE guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight TelescopeMatching guifg=#AF4B57 guibg=NONE guisp=NONE gui=bold blend=NONE
+highlight LspDiagnosticsDefaultInformation guifg=#FFCC66 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight WhichKeySeperator guifg=#87B479 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link htmlH1 Title
 highlight! link TSParameter TSField
-highlight StatusLineLColAlt guifg=#C7C8D1 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight! link TSParameterReference TSParameter
-highlight StatusLineFTAlt guifg=#C7C8D1 guibg=#393E46 guisp=NONE gui=NONE blend=NONE
-highlight TSProperty guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight StatusLineGitAlt guifg=#212121 guibg=#858585 guisp=NONE gui=NONE blend=NONE
-highlight! link TSPunctDelimiter Delimiter
-highlight StatusLineFileName guifg=#C7C8D1 guibg=#292929 guisp=NONE gui=bold blend=NONE
-highlight! link TSPunctBracket Delimiter
-highlight! link TabLineError LspDiagnosticsSignError
+highlight! link LspDiagnosticsVirtualTextWarning LspDiagnosticsDefaultWarning
+highlight! link TSTagDelimiter Delimiter
+highlight BufferInactiveTarget guifg=#AF4B57 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight! link LspDiagnosticsVirtualTextInformation LspDiagnosticsDefaultInformation
+highlight StatusLineLspDiagnosticsWarning guifg=#FF8800 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight! link CursorIM Cursor
+highlight! link TSFloat Float
+highlight! link markdownIdDelimiter Delimiter
+highlight BufferCurrentMod guifg=#FFCC66 guibg=#212121 guisp=NONE gui=NONE blend=NONE
+highlight Whitespace guifg=#575757 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link Repeat Keyword
+highlight NvimTreeIndentMarker guifg=#858585 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Character guifg=#B1D67A guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight NvimTreeGitRenamed guifg=#0C7D9D guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight BufferInactiveMod guifg=#FFCC66 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight! link DiffviewFilePanelDeletion SignDelete
+highlight StatusLineTreeSitter guifg=#87B479 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight SpecialKey guifg=#5486C0 guibg=NONE guisp=NONE gui=bold blend=NONE
+highlight DiffAdd guifg=NONE guibg=#5A7D0C guisp=NONE gui=NONE blend=NONE
+highlight CursorLine guifg=NONE guibg=#292929 guisp=NONE gui=NONE blend=NONE
 highlight! link TSPunctSpecial Delimiter
+highlight! link QuickFixLine CursorLine
+highlight! link Label Keyword
+highlight TSEmphasis guifg=NONE guibg=NONE guisp=NONE gui=italic blend=NONE
+highlight Error guifg=#F44848 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link TSWarning Todo
+highlight! link TSNumber Number
+highlight BufferVisible guifg=NONE guibg=#212121 guisp=NONE gui=NONE blend=NONE
+highlight SpellRare guifg=#C7C8D1 guibg=NONE guisp=#5486C0 gui=underline blend=NONE
+highlight LspDiagnosticsDefaultError guifg=#F44848 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link Question MoreMsg
+highlight Operator guifg=#67899E guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Cursor guifg=NONE guibg=NONE guisp=NONE gui=reverse blend=NONE
+highlight BufferCurrentIndex guifg=#64A6C4 guibg=#212121 guisp=NONE gui=NONE blend=NONE
+highlight! link CursorColumn CursorLine
+highlight! link TSType Type
+highlight StatusLine guifg=#C7C8D1 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight LspDiagnosticsUnderlineInformation guifg=NONE guibg=NONE guisp=#5486C0 gui=underline blend=NONE
+highlight! link NormalNC Normal
 highlight! link TSRepeat Repeat
-highlight! link TSString String
-highlight WhichKey guifg=#BF85C1 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight NvimTreeNormal guifg=#B1B3BE guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight ErrorMsg guifg=#F44848 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight NvimTreeGitMerge guifg=#0C7D9D guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight mkdLineBreak guifg=NONE guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight NvimTreeGitNew guifg=#5A7D0C guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link LspDiagnosticsHint LspDiagnosticsSignHint
+highlight! link DiffviewNormal NvimTreeNormal
+highlight! link PreCondit PreProc
+highlight! link Macro PreProc
+highlight NormalFloat guifg=NONE guibg=#292D32 guisp=NONE gui=NONE blend=NONE
 highlight! link TSStringRegex TSString
-highlight WhichKeyDesc guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link TSStringEscape Character
-highlight! link TSSymbol Identifier
-highlight! link TSTag Tag
+highlight FlutterWidgetGuides guifg=#919191 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Debug guifg=#AF4B57 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight TSAttribute guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight BufferInactiveIndex guifg=#858585 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight! link TSKeyword Keyword
+highlight mkdHeading guifg=#C7C8D1 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link LspDiagnosticsVirtualTextError LspDiagnosticsDefaultError
+highlight Function guifg=#EEBA59 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight StatusLineNC guifg=#C7C8C0 guibg=#292929 guisp=NONE gui=NONE blend=NONE
 highlight! link DiffviewStatusAdded SignAdd
-highlight! link TSTagDelimiter Delimiter
+highlight! link TSString String
 highlight TSText guifg=#C7C8D1 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link DiffviewStatusDeleted SignDelete
 highlight! link DiffviewFilePanelInsertion SignAdd
-highlight! link DiffviewFilePanelDeletion SignDelete
-highlight TSEmphasis guifg=NONE guibg=NONE guisp=NONE gui=italic blend=NONE
-highlight Directory guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link TSTag Tag
+highlight! link LspDiagnosticsInformation LspDiagnosticsSignInformation
+highlight! link TSKeywordFunction Keyword
+highlight LspDiagnosticsDefaultHint guifg=#4DC1FF guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link DiffviewStatusModified SignChange
+highlight DiffviewVertSplit guifg=#858585 guibg=#212121 guisp=NONE gui=NONE blend=NONE
+highlight NvimTreeGitStaged guifg=#5A7D0C guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link NonText EndOfBuffer
+highlight NvimTreeSpecialFile guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight SpecialComment guifg=#858585 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link Exception Keyword
+highlight PreProc guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link markdownUrl mkdLink
+highlight LspDiagnosticsFloatingWarning guifg=#FF8800 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight TSNamespace guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight VertSplit guifg=#393E46 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight BufferVisibleTarget guifg=#AF4B57 guibg=#212121 guisp=NONE gui=bold blend=NONE
+highlight FloatBorder guifg=#858585 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight! link TabLineHint LspDiagnosticsSignHint
+highlight BufferVisibleSign guifg=#FFCC66 guibg=#212121 guisp=NONE gui=NONE blend=NONE
+highlight BufferVisibleMod guifg=#FFCC66 guibg=#212121 guisp=NONE gui=NONE blend=NONE
 highlight TSUnderline guifg=NONE guibg=NONE guisp=NONE gui=underline blend=NONE
-highlight TSStrike guifg=NONE guibg=NONE guisp=NONE gui=strikethrough blend=NONE
-highlight! link TSTitle Title
-highlight! link TSLiteral String
-highlight TSURI guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link TSWarning Todo
-highlight! link TSType Type
-highlight! link TSTypeBuiltin Type
-highlight TSVariable guifg=#C7C8D1 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight TSVariableBuiltin guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link Define PreProc
-highlight Character guifg=#B1D67A guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight Float guifg=#AF4B57 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight Identifier guifg=#C7C8D1 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link Conditional Keyword
-highlight Keyword guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight LspTroubleIndent guifg=#919191 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight EndOfBuffer guifg=#212121 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link TabLineError LspDiagnosticsSignError
+highlight! link LspDiagnosticsVirtualTextHint LspDiagnosticsDefaultHint
 highlight! link Structure Type
-highlight! link Include Keyword
-highlight WhichKeySeperator guifg=#87B479 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight luaTSConstructor guifg=#9092A2 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight DiffAdd guifg=NONE guibg=#5A7D0C guisp=NONE gui=NONE blend=NONE
-highlight TSAnnotation guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight TSAttribute guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link TSBoolean Boolean
-highlight! link TSCharacter Character
-highlight! link TSComment Comment
-highlight! link TSConditional Conditional
-highlight! link TSConstant Constant
-highlight! link TSConstBuiltin Constant
-highlight GitSignsChange guifg=#0C7D9D guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link TSConstructor Type
-highlight GitSignsDelete guifg=#93151B guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link TSException Exception
-highlight TSField guifg=#C7C8D1 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight Search guifg=#C7C8D1 guibg=#67899E guisp=NONE gui=NONE blend=NONE
-highlight! link TSFunction Function
+highlight CodiVirtualText guifg=#4DC1FF guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link DiffviewStatusDeleted SignDelete
 highlight! link TSFuncBuiltin Function
-highlight LspDiagnosticsDefaultHint guifg=#4DC1FF guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight LspDiagnosticsDefaultError guifg=#F44848 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight LspDiagnosticsDefaultWarning guifg=#FF8800 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight LspDiagnosticsDefaultInformation guifg=#FFCC66 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link LspDiagnosticsVirtualTextHint LspDiagnosticsDefaultHint
-highlight! link LspDiagnosticsVirtualTextError LspDiagnosticsDefaultError
-highlight! link LspDiagnosticsVirtualTextWarning LspDiagnosticsDefaultWarning
-highlight! link LspDiagnosticsVirtualTextInformation LspDiagnosticsDefaultInformation
-highlight LspDiagnosticsUnderlineHint guifg=NONE guibg=NONE guisp=#87B479 gui=underline blend=NONE
-highlight LspDiagnosticsUnderlineError guifg=NONE guibg=NONE guisp=#AF4B57 gui=underline blend=NONE
-highlight LspDiagnosticsUnderlineWarning guifg=NONE guibg=NONE guisp=#EEBA59 gui=underline blend=NONE
-highlight LspDiagnosticsUnderlineInformation guifg=NONE guibg=NONE guisp=#5486C0 gui=underline blend=NONE
-highlight LspDiagnosticsFloatingHint guifg=#4DC1FF guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight LspDiagnosticsFloatingError guifg=#F44848 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight LspDiagnosticsFloatingWarning guifg=#FF8800 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight LspDiagnosticsFloatingInformation guifg=#FFCC66 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight GitSignsAdd guifg=#5A7D0C guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight PreProc guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight Constant guifg=#C67158 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight BufferInactive guifg=#858585 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight Operator guifg=#67899E guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight BufferCurrent guifg=NONE guibg=#212121 guisp=NONE gui=NONE blend=NONE
-highlight String guifg=#87B479 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight Number guifg=#AF4B57 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight Boolean guifg=#AF4B57 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight DiffChange guifg=NONE guibg=#0C7D9D guisp=NONE gui=NONE blend=NONE
-highlight Error guifg=#F44848 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link lCursor Cursor
 highlight DiffDelete guifg=NONE guibg=#93151B guisp=NONE gui=NONE blend=NONE
-highlight! link NonText EndOfBuffer
-highlight LspDiagnosticsSignError guifg=#F44848 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight LspDiagnosticsSignWarning guifg=#FF8800 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight LspDiagnosticsSignHint guifg=#4DC1FF guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight LspDiagnosticsSignInformation guifg=#FFCC66 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight WarningMsg guifg=#AF4B57 guibg=NONE guisp=NONE gui=NONE blend=NONE
-" highlight LspReferenceText guifg=NONE guibg=#292929 guisp=NONE gui=underline blend=NONE
-" highlight LspReferenceRead guifg=NONE guibg=#292929 guisp=NONE gui=underline blend=NONE
-" highlight LspReferenceWrite guifg=NONE guibg=#292929 guisp=NONE gui=underline blend=NONE
-highlight NvimTreeGitStaged guifg=#5A7D0C guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight NvimTreeGitDirty guifg=#5A7D0C guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight NvimTreeGitNew guifg=#5A7D0C guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight NvimTreeGitMerge guifg=#0C7D9D guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight NvimTreeGitRenamed guifg=#0C7D9D guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight NvimTreeRootFolder guifg=#3B6AA0 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight NvimTreeIndentMarker guifg=#858585 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight NvimTreeFolderName guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight NvimTreeOpenedFolderName guifg=#4E99BC guibg=NONE guisp=NONE gui=italic blend=NONE
-highlight NvimTreeSpecialFile guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight NvimTreeExecFile guifg=#87B479 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight markdownLinkText guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link TSTypeBuiltin Type
+highlight! link TSFuncMacro Macro
+highlight BufferCurrentTarget guifg=#AF4B57 guibg=#212121 guisp=NONE gui=bold blend=NONE
+highlight! link TSPunctDelimiter Delimiter
+highlight! link TSException Exception
+highlight TSProperty guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
 highlight NvimTreeImageFile guifg=#BF85C1 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight Comment guifg=#858585 guibg=NONE guisp=NONE gui=italic blend=NONE
-highlight CodiVirtualText guifg=#4DC1FF guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight ErrorMsg guifg=#F44848 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight IndentBlanklineContextChar guifg=#6B6B6B guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight DashboardFooter guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight DashboardCenter guifg=#BF85C1 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight TSVariable guifg=#C7C8D1 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight LspDiagnosticsUnderlineWarning guifg=NONE guibg=NONE guisp=#EEBA59 gui=underline blend=NONE
 highlight DashboardHeader guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight DiffviewVertSplit guifg=#858585 guibg=#212121 guisp=NONE gui=NONE blend=NONE
-highlight! link DiffviewStatusRenamed SignChange
-highlight! link DiffviewStatusModified SignChange
-highlight! link DiffviewNormal NvimTreeNormal
-highlight CompeDocumentation guifg=NONE guibg=#393E46 guisp=NONE gui=NONE blend=NONE
-highlight WhichKeyFloat guifg=NONE guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight WhichKeyGroup guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight TabLineFill guifg=#C7C8D1 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight LspDiagnosticsSignHint guifg=#4DC1FF guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold blend=NONE
+highlight String guifg=#87B479 guibg=NONE guisp=NONE gui=NONE blend=NONE
 highlight! link TabLineInformation LspDiagnosticsSignInformation
-highlight! link TabLineHint LspDiagnosticsSignHint
+highlight mkdLink guifg=#64A6C4 guibg=NONE guisp=NONE gui=underline blend=NONE
+highlight! link TSFunction Function
 highlight NvimTreeFolderIcon guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link TabLineWarning LspDiagnosticsSignWarning
-highlight LspTroubleIndent guifg=#919191 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link IncSearch Search
-highlight StatusLineLSP guifg=#A3A3A3 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight StatusLineGit guifg=#212121 guibg=#858585 guisp=NONE gui=NONE blend=NONE
+highlight Title guifg=#5486C0 guibg=NONE guisp=NONE gui=bold blend=NONE
+highlight! link SignColumn Normal
+highlight! link TSPunctBracket Delimiter
+highlight! link TSCharacter Character
+highlight luaTSConstructor guifg=#9092A2 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Keyword guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link Statement Keyword
+highlight MoreMsg guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight TSURI guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight SpellCap guifg=#C7C8D1 guibg=NONE guisp=#EEBA59 gui=underline blend=NONE
+highlight GitSignsAdd guifg=#5A7D0C guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight LspDiagnosticsFloatingInformation guifg=#FFCC66 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Special guifg=#C67158 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Comment guifg=#858585 guibg=NONE guisp=NONE gui=italic blend=NONE
+highlight Folded guifg=#858585 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight! link TSStringEscape Character
+highlight! link markdownLinkDelimiter Delimiter
+highlight LspDiagnosticsDefaultWarning guifg=#FF8800 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link Conditional Keyword
+highlight Search guifg=#C7C8D1 guibg=#67899E guisp=NONE gui=NONE blend=NONE
+highlight Italic guifg=NONE guibg=NONE guisp=NONE gui=italic blend=NONE
+highlight CursorLineNr guifg=#C7C8C0 guibg=NONE guisp=NONE gui=bold blend=NONE
+highlight! link VisualNOS Visual
+highlight DiffChange guifg=NONE guibg=#0C7D9D guisp=NONE gui=NONE blend=NONE
 highlight! link ColorColumn CursorLine
-highlight StatusLineLCol guifg=#C7C8D1 guibg=#393E46 guisp=NONE gui=NONE blend=NONE
-highlight StatusLineMode guifg=#212121 guibg=#858585 guisp=NONE gui=bold blend=NONE
-highlight StatusLineNC guifg=#858585 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight StatusLine guifg=#C7C8D1 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight FlutterWidgetGuides guifg=#919191 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link TSBoolean Boolean
+highlight! link markdownLinkTextDelimiter Delimiter
+highlight SpellBad guifg=#C7C8D1 guibg=NONE guisp=#AF4B57 gui=underline blend=NONE
+highlight StatusLineGitChange guifg=#5486C0 guibg=#292929 guisp=NONE gui=NONE blend=NONE
 highlight! link TSInclude Include
-highlight! link TSFuncMacro Macro
-highlight! link markdownLinkDelimiter Delimiter
-highlight Function guifg=#EEBA59 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link mkdInlineURL mkdLink
-highlight! link TSFloat Float
-highlight TabLineSel guifg=#292929 guibg=#5486C0 guisp=NONE gui=NONE blend=NONE
-highlight TSError guifg=NONE guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight SignChange guifg=#0C7D9D guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link TSConstMacro Macro
-highlight! link markdownIdDelimiter Delimiter
-highlight! link markdownUrl mkdLink
-highlight! link Question MoreMsg
-highlight BufferCurrentTarget guifg=#AF4B57 guibg=#212121 guisp=NONE gui=bold blend=NONE
-highlight StatusLineFT guifg=#C7C8D1 guibg=#393E46 guisp=NONE gui=NONE blend=NONE
-highlight BufferCurrentMod guifg=#FFCC66 guibg=#212121 guisp=NONE gui=NONE blend=NONE
-highlight BufferCurrentIndex guifg=#64A6C4 guibg=#212121 guisp=NONE gui=NONE blend=NONE
+highlight! link Include Keyword
+highlight SpellLocal guifg=#C7C8D1 guibg=NONE guisp=#87B479 gui=underline blend=NONE
 highlight! link NvimTreeOpenedFile NvimTreeOpenedFolderName
-highlight SignDelete guifg=#93151B guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight SignAdd guifg=#5A7D0C guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight BufferCurrentSign guifg=#64A6C4 guibg=#212121 guisp=NONE gui=NONE blend=NONE
-highlight Bold guifg=NONE guibg=NONE guisp=NONE gui=bold blend=NONE
-highlight Todo guifg=#AF4B57 guibg=NONE guisp=NONE gui=bold blend=NONE
-highlight! link SignColumn Normal
+highlight! link TSSymbol Identifier
+highlight! link TSConstMacro Macro
+highlight! link TSTitle Title
+highlight PmenuThumb guifg=NONE guibg=#C7C8D1 guisp=NONE gui=NONE blend=NONE
+highlight SignChange guifg=#0C7D9D guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Delimiter guifg=#9092A2 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight TelescopeBorder guifg=#858585 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight NvimTreeFolderName guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline blend=NONE
 highlight! link ModeMsg Normal
+highlight LspDiagnosticsUnderlineError guifg=NONE guibg=NONE guisp=#AF4B57 gui=underline blend=NONE
+highlight NvimTreeExecFile guifg=#87B479 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight IndentBlanklineContextChar guifg=#6B6B6B guibg=NONE guisp=NONE gui=NONE blend=NONE
 highlight! link MsgArea Normal
-highlight! link MsgSeparator Normal
-highlight SpellBad guifg=#C7C8D1 guibg=NONE guisp=#AF4B57 gui=underline blend=NONE
-highlight SpellCap guifg=#C7C8D1 guibg=NONE guisp=#EEBA59 gui=underline blend=NONE
-highlight SpellLocal guifg=#C7C8D1 guibg=NONE guisp=#87B479 gui=underline blend=NONE
-highlight SpellRare guifg=#C7C8D1 guibg=NONE guisp=#5486C0 gui=underline blend=NONE
-highlight! link NormalNC Normal
-highlight Pmenu guifg=#C7C8D1 guibg=#393E46 guisp=NONE gui=NONE blend=NONE
-highlight PmenuSel guifg=#262626 guibg=#67899E guisp=NONE gui=NONE blend=NONE
-highlight! link WildMenu PmenuSel
-highlight CursorLineNr guifg=#C7C8C0 guibg=NONE guisp=NONE gui=bold blend=NONE
-highlight markdownLinkText guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight Folded guifg=#858585 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight FoldColumn guifg=#858585 guibg=#212121 guisp=NONE gui=NONE blend=NONE
+highlight TabLineSel guifg=#292929 guibg=#5486C0 guisp=NONE gui=NONE blend=NONE
+highlight! link TSConditional Conditional
+highlight BufferCurrentSign guifg=#64A6C4 guibg=#212121 guisp=NONE gui=NONE blend=NONE
+highlight TSField guifg=#C7C8D1 guibg=NONE guisp=NONE gui=NONE blend=NONE
 highlight LineNr guifg=#858585 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight FloatBorder guifg=#858585 guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight Whitespace guifg=#575757 guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight NormalFloat guifg=NONE guibg=#292D32 guisp=NONE gui=NONE blend=NONE
-highlight Visual guifg=NONE guibg=#2C2F35 guisp=NONE gui=NONE blend=NONE
-highlight! link VisualNOS Visual
-highlight DiffText guifg=NONE guibg=NONE guisp=NONE gui=NONE blend=NONE
-highlight! link QuickFixLine CursorLine
+highlight WhichKeyDesc guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight Constant guifg=#C67158 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight TSAnnotation guifg=#64A6C4 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight BufferInactiveSign guifg=#858585 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight! link mkdInlineURL mkdLink
+highlight mkdUnderline guifg=#858585 guibg=NONE guisp=NONE gui=NONE blend=NONE
+highlight! link LspDiagnosticsError LspDiagnosticsSignError
+highlight Boolean guifg=#AF4B57 guibg=NONE guisp=NONE gui=NONE blend=NONE
 highlight PmenuSbar guifg=NONE guibg=#535A65 guisp=NONE gui=NONE blend=NONE
-highlight PmenuThumb guifg=NONE guibg=#C7C8D1 guisp=NONE gui=NONE blend=NONE
-highlight MatchParen guifg=NONE guibg=#292929 guisp=NONE gui=NONE blend=NONE
-highlight Cursor guifg=NONE guibg=NONE guisp=NONE gui=reverse blend=NONE
-highlight! link lCursor Cursor
-highlight! link CursorIM Cursor
-highlight! link TermCursor Cursor
-highlight! link TermCursorNC Cursor
-highlight Conceal guifg=#5486C0 guibg=NONE guisp=NONE gui=NONE blend=NONE
-
+highlight StatusLineGit guifg=#C67158 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight StatusLineGitAdd guifg=#87B479 guibg=#292929 guisp=NONE gui=NONE blend=NONE
+highlight StatusLineLspDiagnosticsInformation guifg=#FFCC66 guibg=#292929 guisp=NONE gui=NONE blend=NONE
diff --git a/lua/lv-galaxyline/init.lua b/lua/lv-galaxyline/init.lua
index 685d38e7..fece7a04 100644
--- a/lua/lv-galaxyline/init.lua
+++ b/lua/lv-galaxyline/init.lua
@@ -102,9 +102,10 @@ table.insert(gls.left, {
                 t = colors.blue
             }
             vim.api.nvim_command('hi GalaxyViMode guifg=' .. mode_color[vim.fn.mode()])
-            return '▊ '
+            return '▊'
         end,
-        highlight = {colors.red, colors.bg}
+        -- highlight = 'TabLineSel'
+        -- highlight = {colors.red, colors.bg}
     }
 })
 -- print(vim.fn.getbufvar(0, 'ts'))
@@ -113,12 +114,12 @@ vim.fn.getbufvar(0, 'ts')
 table.insert(gls.left, {
     GitIcon = {
         provider = function()
-            return ' '
+            return '  '
         end,
         condition = condition.check_git_workspace,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.orange, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineGit'
     }
 })
 
@@ -127,8 +128,8 @@ table.insert(gls.left, {
         provider = 'GitBranch',
         condition = condition.check_git_workspace,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -137,7 +138,7 @@ table.insert(gls.left, {
         provider = 'DiffAdd',
         condition = condition.hide_in_width,
         icon = '  ',
-        highlight = {colors.green, colors.bg}
+        highlight = 'StatusLineGitAdd'
     }
 })
 
@@ -146,7 +147,7 @@ table.insert(gls.left, {
         provider = 'DiffModified',
         condition = condition.hide_in_width,
         icon = ' 柳',
-        highlight = {colors.blue, colors.bg}
+        highlight = 'StatusLineGitChange'
     }
 })
 
@@ -155,30 +156,52 @@ table.insert(gls.left, {
         provider = 'DiffRemove',
         condition = condition.hide_in_width,
         icon = '  ',
-        highlight = {colors.red, colors.bg}
+        highlight = 'StatusLineGitDelete'
     }
 })
 
 table.insert(gls.right, {
-    DiagnosticError = {provider = 'DiagnosticError', icon = '  ', highlight = {colors.error_red, colors.bg}}
+    DiagnosticError = {provider = 'DiagnosticError', icon = '  ', 
+        highlight = 'StatusLineLspDiagnosticsError'
+    }
 })
-table.insert(gls.right, {DiagnosticWarn = {provider = 'DiagnosticWarn', icon = '  ', highlight = {colors.orange, colors.bg}}})
+table.insert(gls.right, {DiagnosticWarn = {provider = 'DiagnosticWarn', icon = '  ', 
+
+
+        highlight = 'StatusLineLspDiagnosticsWarning'
+
+
+}})
+
+
+table.insert(gls.right, {DiagnosticInfo = {provider = 'DiagnosticInfo', icon = '  ', 
+
+    highlight = 'StatusLineLspDiagnosticsInformation'
+
+
+}})
+
+
 
 table.insert(gls.right, {
-    DiagnosticHint = {provider = 'DiagnosticHint', icon = '  ', highlight = {colors.vivid_blue, colors.bg}}
-})
+    DiagnosticHint = {provider = 'DiagnosticHint', icon = '  ', 
+
 
-table.insert(gls.right, {DiagnosticInfo = {provider = 'DiagnosticInfo', icon = '  ', highlight = {colors.info_yellow, colors.bg}}})
+        highlight = 'StatusLineLspDiagnosticsHint'
+
+
+    }
+})
 
 table.insert(gls.right, {
     TreesitterIcon = {
         provider = function()
-            if next(vim.treesitter.highlighter.active) ~= nil then return ' ' end
+            if next(vim.treesitter.highlighter.active) ~= nil then return '  ' end
             return ''
         end,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.green, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineTreeSitter'
     }
 })
 
@@ -220,7 +243,7 @@ table.insert(gls.right, {
             return true
         end,
         icon = '  ',
-        highlight = {colors.grey, colors.bg}
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -228,8 +251,8 @@ table.insert(gls.right, {
     LineInfo = {
         provider = 'LineColumn',
         separator = '  ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -237,8 +260,8 @@ table.insert(gls.right, {
     PerCent = {
         provider = 'LinePercent',
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -249,8 +272,8 @@ table.insert(gls.right, {
         end,
         condition = condition.hide_in_width,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -259,8 +282,8 @@ table.insert(gls.right, {
         provider = 'FileTypeName',
         condition = condition.hide_in_width,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -269,8 +292,8 @@ table.insert(gls.right, {
         provider = 'FileEncode',
         condition = condition.hide_in_width,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -280,8 +303,8 @@ table.insert(gls.right, {
             return ' '
         end,
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.orange, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
@@ -289,13 +312,18 @@ table.insert(gls.short_line_left, {
     BufferType = {
         provider = 'FileTypeName',
         separator = ' ',
-        separator_highlight = {'NONE', colors.bg},
-        highlight = {colors.grey, colors.bg}
+        separator_highlight = 'StatusLineSeparator',
+        highlight = 'StatusLineNC'
     }
 })
 
 table.insert(gls.short_line_left, {
-    SFileName = {provider = 'SFileName', condition = condition.buffer_not_empty, highlight = {colors.grey, colors.bg}}
+    SFileName = {provider = 'SFileName', condition = condition.buffer_not_empty, 
+
+        highlight = 'StatusLineNC'
+
+
+    }
 })
 
 --table.insert(gls.short_line_right[1] = {BufferIcon = {provider = 'BufferIcon', highlight = {colors.grey, colors.bg}}})
diff --git a/lua/lv-themes/spacegray.lua b/lua/lv-themes/spacegray.lua
index d21c0037..ef4ecc17 100644
--- a/lua/lv-themes/spacegray.lua
+++ b/lua/lv-themes/spacegray.lua
@@ -307,18 +307,28 @@ local theme = lush(function()
         markdownItalic {fg = "NONE", gui = "italic"}, -- flutter-tools.nvim
         FlutterWidgetGuides {fg = c.gray.li(10)}, -- statusline
 
-        StatusLine {bg = c.bg1, fg = c.white},
-        StatusLineNC {bg = c.bg1, fg = c.gray},
-        StatusLineMode {bg = c.gray, fg = c.bg, gui = "bold"},
-        StatusLineDeco {bg = c.bg2, fg = c.yellow},
-        StatusLineLCol {bg = c.bg2, fg = c.white},
-        StatusLineLColAlt {bg = c.bg1, fg = c.white},
-        StatusLineFT {bg = c.bg2, fg = c.white},
-        StatusLineFTAlt {bg = c.bg2, fg = c.white},
-        StatusLineGit {bg = c.gray, fg = c.bg},
-        StatusLineGitAlt {bg = c.gray, fg = c.bg},
-        StatusLineLSP {bg = c.bg1, fg = c.gray.li(25)},
-        StatusLineFileName {bg = c.bg1, fg = c.white, gui = "bold"},
+        StatusLine {bg = c.bg1, fg = c.white}, -- status line of current window
+        StatusLineNC {bg = c.bg1, fg = c.light_gray}, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window.
+        StatusLineSeparator {bg = c.bg1, fg = "NONE"},
+        StatusLineGit {bg = c.bg1, fg = c.orange},
+        StatusLineGitAdd {bg = c.bg1, fg = c.green},
+        StatusLineGitChange {bg = c.bg1, fg = c.blue},
+        StatusLineGitDelete {bg = c.bg1, fg = c.red},
+        StatusLineLspDiagnosticsError {bg = c.bg1, fg = c.error_red, gui = "NONE"},
+        StatusLineLspDiagnosticsWarning {bg = c.bg1, fg = c.warning_orange, gui = "NONE"},
+        StatusLineLspDiagnosticsInformation {bg = c.bg1, fg = c.info_yellow, gui = "NONE"},
+        StatusLineLspDiagnosticsHint {bg = c.bg1, fg = c.hint_blue, gui = "NONE"},
+        StatusLineTreeSitter {bg = c.bg1, fg = c.green},
+
+        -- StatusLineMode {bg = c.gray, fg = c.bg, gui = "bold"},
+        -- StatusLineDeco {bg = c.bg2, fg = c.yellow},
+        -- StatusLineLCol {bg = c.bg2, fg = c.white},
+        -- StatusLineLColAlt {bg = c.bg1, fg = c.white},
+        -- StatusLineFT {bg = c.bg2, fg = c.white},
+        -- StatusLineFTAlt {bg = c.bg2, fg = c.white},
+        -- StatusLineGitAlt {bg = c.gray, fg = c.bg},
+        -- StatusLineLSP {bg = c.bg1, fg = c.gray.li(25)},
+        -- StatusLineFileName {bg = c.bg1, fg = c.white, gui = "bold"},
 
 
         -- lsp-trouble.nvim