@@ -8,28 +8,27 @@ if g.syntax_on == 1 then
   vim.cmd('syntax reset')
 end
 
-o.background = 'light'
-g.colors_name = 'grey'
+g.colors_name = 'plain'
 
 local background = '#f4f4f4'
 local grey_bg_light = '#E5E5E5'
-local black = '#222222'
-local blue = '#008EC4'
-local green = '#10A778'
-local light_green = '#5FD7A7'
-local light_red = '#E32791'
-local red = '#C30771'
+local black = '#676767'
+local blue = '#6587bf'
+local green = '#7c9f4b'
+local light_green = '#6d8b42'
+local light_red = '#c66666'
+local red = '#db7070'
 local grey = '#767676'
-local light_grey = '#CCCCCC'
+local light_grey = '#dfdfdf'
 local border = '#999999'
 local highlight = '#424242'
-local dark_yellow = '#A89C14'
-local yellow = '#F3E430'
-local light_yellow = '#F1F1F1'
+local dark_yellow = '#d69822'
+local yellow = '#f3e430'
+local light_yellow = '#fadaa0'
 local orange = '#D75F5F'
 local purple = '#523C79'
 local white = '#FFFFFF'
-local cyan = '#20A5BA'
+local cyan = '#509c93'
 
 g.terminal_color_0 = black
 g.terminal_color_1 = red
@@ -94,7 +93,7 @@ MoreMsg = { fg = black },
   ModeMsg = { fg = black, bold = true },
   MsgSeparator = { fg = border },
   NonText = { fg = grey },
-  Normal = { fg = black, bg = background },
+  Normal = { fg = black , bg = background },
   NormalFloat = { fg = black },
   FloatTitle = { fg = black, bold = true },
   FloatBorder = { fg = border },
@@ -125,7 +124,7 @@ WinBar = { fg = black, bold = true },
   WinBarNc = { fg = black, bold = true },
   WinBarFill = { fg = border },
   StorageClass = { link = 'Keyword' },
-  String = { fg = green },
+  String = { fg = cyan },
   SnippetTabstop = {},
   Symbol = { fg = orange },
   TabLine = { fg = black, bg = light_grey },
@@ -439,6 +438,9 @@ -- YARD
   yardComment = { link = 'Comment' },
   yardType = { link = 'Todo' },
   yardTypeList = { link = 'Todo' },
+
+  -- custom highlight groups
+  ['@variable'] = { fg = black },
 }
 
 for group, opts in pairs(highlights) do

@@ -1,372 +0,0 @@ 
-hi clear
-
-if exists('syntax on')
-    syntax reset
-endif
-
-let g:colors_name='plain'
-
-let s:black           = { "gui": "#222222", "cterm": "0"   }
-let s:medium_gray     = { "gui": "#767676", "cterm": "8" }
-let s:white           = { "gui": "#F1F1F1", "cterm": "7"  }
-let s:actual_white    = { "gui": "#FFFFFF", "cterm": "15" }
-let s:light_black     = { "gui": "#424242", "cterm": "11"   }
-let s:lighter_black   = { "gui": "#545454", "cterm": "12" }
-let s:subtle_black    = { "gui": "#303030", "cterm": "11" }
-let s:light_gray      = { "gui": "#999999", "cterm": "12" }
-let s:lighter_gray    = { "gui": "#CCCCCC", "cterm": "7" }
-let s:lightest_gray   = { "gui": "#E5E5E5", "cterm": "13" }
-let s:pink            = { "gui": "#FB007A", "cterm": "5"   }
-let s:dark_red        = { "gui": "#C30771", "cterm": "1"   }
-let s:light_red       = { "gui": "#E32791", "cterm": "1"   }
-let s:orange          = { "gui": "#D75F5F", "cterm": "9" }
-let s:darker_blue     = { "gui": "#005F87", "cterm": "4"  }
-let s:dark_blue       = { "gui": "#008EC4", "cterm": "4"   }
-let s:blue            = { "gui": "#20BBFC", "cterm": "4"  }
-let s:light_blue      = { "gui": "#B6D6FD", "cterm": "4" }
-let s:dark_cyan       = { "gui": "#20A5BA", "cterm": "6"   }
-let s:light_cyan      = { "gui": "#4FB8CC", "cterm": "6"  }
-let s:dark_green      = { "gui": "#10A778", "cterm": "6"   }
-let s:light_green     = { "gui": "#5FD7A7", "cterm": "6"  }
-let s:dark_purple     = { "gui": "#523C79", "cterm": "5"   }
-let s:light_purple    = { "gui": "#6855DE", "cterm": "5"  }
-let s:light_yellow    = { "gui": "#F3E430", "cterm": "3"  }
-let s:dark_yellow     = { "gui": "#A89C14", "cterm": "3"   }
-
-if &background == "dark"
-  let s:bg              = s:white
-  let s:bg_subtle       = s:lighter_gray
-  let s:bg_very_subtle  = s:light_gray
-  let s:norm            = s:light_black
-  let s:norm_subtle     = s:lighter_black
-  let s:purple          = s:dark_purple
-  let s:cyan            = s:dark_cyan
-  let s:green           = s:dark_green
-  let s:red             = s:dark_red
-  let s:yellow          = s:dark_yellow
-  let s:visual          = s:light_blue
-  let s:cursor_line     = s:medium_gray
-  let s:status_line     = s:lighter_gray
-  let s:status_line_nc  = s:lighter_black
-  let s:constant        = s:dark_blue
-  let s:comment         = s:light_gray
-  let s:selection       = s:light_yellow
-  let s:warning         = s:yellow
-else
-  let s:bg              = s:black
-  let s:bg_subtle       = s:light_black
-  let s:bg_very_subtle  = s:subtle_black
-  let s:norm            = s:lighter_gray
-  let s:norm_subtle     = s:light_gray
-  let s:purple          = s:light_purple
-  let s:cyan            = s:light_cyan
-  let s:green           = s:light_green
-  let s:red             = s:light_red
-  let s:yellow          = s:light_yellow
-  let s:visual          = s:subtle_black
-  let s:cursor_line     = s:subtle_black
-  let s:status_line     = s:lighter_black
-  let s:status_line_nc  = s:subtle_black
-  let s:constant        = s:light_green
-  let s:comment         = s:lighter_black
-  let s:selection       = s:light_purple
-  let s:warning         = s:yellow
-endif
-
-" https://github.com/noahfrederick/vim-hemisu/
-function! s:h(group, style)
-  execute "highlight" a:group
-    \ "guifg="   (has_key(a:style, "fg")    ? a:style.fg.gui   : "NONE")
-    \ "guibg="   (has_key(a:style, "bg")    ? a:style.bg.gui   : "NONE")
-    \ "guisp="   (has_key(a:style, "sp")    ? a:style.sp.gui   : "NONE")
-    \ "gui="     (has_key(a:style, "gui")   ? a:style.gui      : "NONE")
-    \ "ctermfg=" (has_key(a:style, "fg")    ? a:style.fg.cterm : "NONE")
-    \ "ctermbg=" (has_key(a:style, "bg")    ? a:style.bg.cterm : "NONE")
-    \ "cterm="   (has_key(a:style, "cterm") ? a:style.cterm    : "NONE")
-endfunction
-
-call s:h("firstAccent",        {"fg": s:cyan})
-call s:h("secondAccent",        {"fg": s:purple})
-
-call s:h("Normal",        {"fg": s:norm,})
-call s:h("Noise",         {"fg": s:norm_subtle})
-call s:h("Cursor",        {"bg": s:green, "fg": s:norm})
-call s:h("Comment",       {"fg": s:comment, "cterm": "italic"})
-call s:h("Function",      {"fg": s:norm, "cterm": "bold"})
-call s:h("FloatWin",      {"fg": s:norm, "bg": s:black})
-
-
-hi! link Constant         firstAccent
-hi! link Character        Constant
-hi! link Number           Constant
-hi! link Boolean          Constant
-hi! link Float            Constant
-hi! link String           Constant
-
-"call s:h("Identifier",    {"fg": s:dark_blue})
-hi! link Identifier       Normal
-
-"hi! link Statement        Normal
-call s:h("Statement",     {"fg": s:norm, "cterm": "bold"})
-hi! link Conditonal       Statement
-hi! link Repeat           Statement
-hi! link Label            Statement
-hi! link Operator         Noise
-hi! link Keyword          Statement
-hi! link Exception        Statement
-
-"call s:h("PreProc",       {"fg": s:red})
-hi! link PreProc          Normal
-hi! link Include          Statement
-hi! link Define           PreProc
-hi! link Macro            PreProc
-hi! link PreCondit        PreProc
-
-"call s:h("Type",          {"fg": s:purple})
-hi! link Type             secondAccent
-hi! link StorageClass     Type
-hi! link Structure        Noise
-hi! link Typedef          Noise
-
-"call s:h("Special",       {"fg": s:pink})
-hi! link Special          StatusLine
-hi! link SpecialChar      Special
-hi! link Tag              Special
-hi! link Delimiter        Special
-hi! link SpecialComment   Special
-hi! link Debug            Special
-
-hi! link Conceal          NonText
-
-call s:h("Underlined",    {"fg": s:norm, "gui": "underline", "cterm": "underline"})
-call s:h("Ignore",        {"fg": s:bg})
-call s:h("Error",         {"fg": s:red, "cterm": "bold"})
-call s:h("Todo",          {"fg": s:actual_white, "bg": s:black, "gui": "bold", "cterm": "bold"})
-call s:h("SpecialKey",    {"fg": s:subtle_black})
-call s:h("NonText",       {"fg": s:bg_very_subtle})
-call s:h("Directory",     {"fg": s:dark_green})
-call s:h("ErrorMsg",      {"fg": s:pink})
-call s:h("IncSearch",     {"bg": s:selection, "fg": s:black})
-call s:h("Search",        {"bg": s:selection, "fg": s:black})
-call s:h("MoreMsg",       {"fg": s:medium_gray, "cterm": "bold", "gui": "bold"})
-hi! link ModeMsg MoreMsg
-call s:h("LineNr",        {"fg": s:medium_gray})
-call s:h("CursorLineNr",  {"fg": s:green, "bg": s:bg_very_subtle})
-call s:h("Question",      {"fg": s:red})
-call s:h("VertSplit",     {"bg": s:bg, "fg": s:bg_very_subtle})
-call s:h("Title",         {"fg": s:dark_green})
-call s:h("Visual",        {"bg": s:visual})
-call s:h("VisualNOS",     {"bg": s:bg_subtle})
-call s:h("WarningMsg",    {"fg": s:warning})
-call s:h("WildMenu",      {"fg": s:white, "bg": s:bg})
-call s:h("Folded",        {"fg": s:medium_gray})
-call s:h("FoldColumn",    {"fg": s:bg_subtle})
-call s:h("DiffAdd",       {"fg": s:green})
-call s:h("DiffDelete",    {"fg": s:red})
-call s:h("DiffChange",    {"fg": s:dark_yellow})
-call s:h("DiffText",      {"fg": s:dark_green})
-call s:h("SignColumn",    {"fg": s:medium_gray})
-
-if has("gui_running")
-  call s:h("SpellBad",    {"gui": "underline", "sp": s:red})
-  call s:h("SpellCap",    {"gui": "underline", "sp": s:light_green})
-  call s:h("SpellRare",   {"gui": "underline", "sp": s:pink})
-  call s:h("SpellLocal",  {"gui": "underline", "sp": s:dark_green})
-else
-  call s:h("SpellBad",    {"cterm": "underline", "fg": s:red})
-  call s:h("SpellCap",    {"cterm": "underline", "fg": s:light_green})
-  call s:h("SpellRare",   {"cterm": "underline", "fg": s:pink})
-  call s:h("SpellLocal",  {"cterm": "underline", "fg": s:dark_green})
-endif
-
-""" Help
-hi link helpHyperTextEntry Title
-hi link helpHyperTextJump  String
-
-""" StatusLine
-
-call s:h("StatusLine",        {"fg": s:status_line})
-call s:h("StatusLineNC",      {"fg": s:status_line_nc})
-
-" Those are not standard but are useful to emphasis different parts of the
-" status line.
-call s:h("StatusLineOk",      {"gui": "underline", "bg": s:bg, "fg": s:green})
-call s:h("StatusLineError",   {"gui": "underline", "bg": s:bg, "fg": s:pink})
-call s:h("StatusLineWarning", {"gui": "underline", "bg": s:bg, "fg": s:warning})
-
-call s:h("Pmenu",         {"fg": s:norm, "bg": s:bg_subtle})
-call s:h("PmenuSel",      {"fg": s:green, "bg": s:bg_very_subtle, "gui": "bold"})
-call s:h("PmenuSbar",     {"fg": s:norm, "bg": s:bg_subtle})
-call s:h("PmenuThumb",    {"fg": s:norm, "bg": s:bg_subtle})
-call s:h("TabLine",       {"fg": s:norm_subtle, "bg": s:bg})
-call s:h("TabLineSel",    {"fg": s:norm, "bg": s:bg, "gui": "bold", "cterm": "bold"})
-call s:h("TabLineFill",   {"fg": s:norm_subtle, "bg": s:bg})
-call s:h("CursorColumn",  {"bg": s:bg_very_subtle})
-call s:h("CursorLine",    {"bg": s:cursor_line})
-call s:h("ColorColumn",   {"bg": s:bg_subtle})
-
-call s:h("MatchParen",    {"bg": s:bg_very_subtle, "fg": s:norm, "cterm": "bold"})
-hi link qfLineNr secondAccent
-hi link qfFileName firstAccent
-
-call s:h("htmlH1",        {"fg": s:norm})
-call s:h("htmlH2",        {"fg": s:norm})
-call s:h("htmlH3",        {"fg": s:norm})
-call s:h("htmlH4",        {"fg": s:norm})
-call s:h("htmlH5",        {"fg": s:norm})
-call s:h("htmlH6",        {"fg": s:norm})
-
-call s:h("htmlBold",      {"fg": s:norm})
-call s:h("htmlItalic",    {"fg": s:norm})
-call s:h("htmlEndTag",    {"fg": s:norm})
-call s:h("htmlTag",       {"fg": s:norm})
-call s:h("htmlTagName",   {"fg": s:norm})
-call s:h("htmlArg",       {"fg": s:norm})
-call s:h("htmlError",     {"fg": s:red})
-
-" JavaScript highlighting
-"
-call s:h("javaScript",           {"bg": s:bg, "fg": s:norm})
-call s:h("javaScriptBraces",     {"bg": s:bg, "fg": s:norm})
-call s:h("javaScriptNumber",     {"bg": s:bg, "fg": s:green})
-
-hi link diffRemoved       DiffDelete
-hi link diffAdded         DiffAdd
-
-hi link TSAnnotation secondAccent
-" unstable for now:
-hi link TSAttribute secondAccent
-hi link TSBoolean Constant
-hi link TSCharacter Constant
-hi link TSComment Comment
-hi link TSConstructor Normal
-hi link TSConditional Statement
-hi link TSConstant Constant
-hi link TSConstBuiltin secondAccent
-hi link TSConstMacro secondAccent
-hi link TSError Error
-hi link TSException Error
-hi link TSField Normal
-hi link TSFloat Constant
-hi link TSFunction Normal
-hi link TSFuncBuiltin secondAccent
-hi link TSFuncMacro secondAccent
-hi link TSInclude Noise
-hi link TSKeyword Statement
-hi link TSKeywordFunction Statement
-hi link TSLabel Noise
-hi link TSMethod Normal
-hi link TSNamespace Noise
-hi link TSNone Noise
-hi link TSNumber Constant
-hi link TSOperator Normal
-hi link TSParameter Noise
-hi link TSParameterReference Statement
-hi link TSProperty TSField
-hi link TSPunctDelimiter Noise
-hi link TSPunctBracket Noise
-hi link TSPunctSpecial Noise
-hi link TSRepeat Normal
-hi link TSString Constant
-hi link TSStringRegex secondAccent
-hi link TSStringEscape secondAccent
-hi link TSTag Statement
-hi link TSTagDelimiter Noise
-hi link TSText Normal
-hi link TSEmphasis Comment
-hi link TSUnderline Underlined
-hi link TSStrike Underlined
-hi link TSTitle Statement
-hi link TSLiteral Noise
-hi link TSURI Constant
-hi link TSType Noise
-hi link TSTypeBuiltin secondAccent
-hi link TSVariable Normal
-hi link TSVariableBuiltin Normal
-hi link TSRepeat Statement
-
-" nvim-lsp diagnostics
-hi link LspDiagnosticsDefaultError Error
-hi link LspDiagnosticsDefaultWarning WarningMsg
-hi link LspDiagnosticsDefaultInformation Noise
-hi link LspDiagnosticsDefaultHint Constant
-
-" Signify, git-gutter
-hi link SignifySignAdd              LineNr
-hi link SignifySignDelete           LineNr
-hi link SignifySignChange           LineNr
-hi link GitGutterAdd                LineNr
-hi link GitGutterDelete             LineNr
-hi link GitGutterChange             LineNr
-hi link GitGutterChangeDelete       LineNr
-
-hi link jsFlowTypeKeyword Statement
-hi link jsFlowImportType Statement
-hi link jsFunction Function
-hi link jsGlobalObjects Noise
-hi link jsGlobalNodeObjects Normal
-hi link jsSwitchCase Constant
-
-call s:h("jsSpreadOperator ",     {"bg": s:bg, "fg": s:selection})
-hi link jsReturn jsSpreadOperator
-hi link jsExport jsSpreadOperator
-
-call s:h("rustModPath ",     {"fg": s:lightest_gray})
-hi link rustMacro secondAccent
-hi link rustKeyword Noise
-hi link rustDerive secondAccent
-hi link rustDeriveTrait secondAccent
-hi link rustAttribute secondAccent
-hi link rustLifetime secondAccent
-
-hi link schemeSyntax Normal
-hi link schemeParentheses Noise
-hi link schemeIdentifier Noise
-
-hi link lispParen Noise
-hi link lispSymbol Noise
-
-hi link shCommandSub secondAccent
-
-hi link cFormat secondAccent
-
-hi link nixBuiltin secondAccent
-hi link nixNamespacedBuiltin secondAccent
-
-hi link sqlSpecial firstAccent
-hi link sqlKeyword secondAccent
-
-hi link helpExample Noise
-hi link helpCommand secondAccent
-hi link helpBacktick secondAccent
-hi link helpSpecial Noise
-
-hi link StorageClass Statement
-
-hi link elmType Type
-
-hi link xmlTag Constant
-hi link xmlTagName xmlTag
-hi link xmlEndTag xmlTag
-hi link xmlAttrib xmlTag
-
-hi link markdownH1 Statement
-hi link markdownH2 Statement
-hi link markdownH3 Statement
-hi link markdownH4 Statement
-hi link markdownH5 Statement
-hi link markdownH6 Statement
-hi link markdownListMarker Constant
-hi link markdownCode Constant
-hi link markdownCodeBlock Constant
-hi link markdownCodeDelimiter Constant
-hi link markdownHeadingDelimiter Constant
-
-call s:h("cssBraces",     {"bg": s:bg, "fg": s:selection})
-hi link cssTextProp Noise
-hi link cssTagName Normal
-
-" floatwin
-hi link NormalFloat FloatWin
-hi link CmpItemKind firstAccent
-hi link CmpItemAbbrMatch secondAccent

@@ -1,317 +0,0 @@ 
-vim.cmd('hi clear')
-
-if vim.fn.exists('syntax on') == 1 then
-    vim.cmd('syntax reset')
-end
-
-vim.g.colors_name = 'plain2'
-
-local colors = {
-    black = { gui = "#222222", cterm = "0" },
-    medium_gray = { gui = "#767676", cterm = "8" },
-    white = { gui = "#F1F1F1", cterm = "7" },
-    actual_white = { gui = "#FFFFFF", cterm = "15" },
-    light_black = { gui = "#424242", cterm = "11" },
-    lighter_black = { gui = "#545454", cterm = "12" },
-    subtle_black = { gui = "#303030", cterm = "11" },
-    light_gray = { gui = "#999999", cterm = "12" },
-    lighter_gray = { gui = "#CCCCCC", cterm = "7" },
-    lightest_gray = { gui = "#E5E5E5", cterm = "13" },
-    pink = { gui = "#FB007A", cterm = "5" },
-    dark_red = { gui = "#C30771", cterm = "1" },
-    light_red = { gui = "#E32791", cterm = "1" },
-    orange = { gui = "#D75F5F", cterm = "9" },
-    darker_blue = { gui = "#005F87", cterm = "4" },
-    dark_blue = { gui = "#008EC4", cterm = "4" },
-    blue = { gui = "#20BBFC", cterm = "4" },
-    light_blue = { gui = "#B6D6FD", cterm = "4" },
-    dark_cyan = { gui = "#20A5BA", cterm = "6" },
-    light_cyan = { gui = "#4FB8CC", cterm = "6" },
-    dark_green = { gui = "#10A778", cterm = "6" },
-    light_green = { gui = "#5FD7A7", cterm = "6" },
-    dark_purple = { gui = "#523C79", cterm = "5" },
-    light_purple = { gui = "#6855DE", cterm = "5" },
-    light_yellow = { gui = "#F3E430", cterm = "3" },
-    dark_yellow = { gui = "#A89C14", cterm = "3" },
-}
-
-local bg, bg_subtle, bg_very_subtle, norm, norm_subtle, purple, cyan, green, red, yellow, visual, cursor_line, status_line, status_line_nc, constant, comment, selection, warning
-
-if vim.o.background == "dark" then
-    bg = colors.white
-    bg_subtle = colors.lighter_gray
-    bg_very_subtle = colors.light_gray
-    norm = colors.light_black
-    norm_subtle = colors.lighter_black
-    purple = colors.dark_purple
-    cyan = colors.dark_cyan
-    green = colors.dark_green
-    red = colors.dark_red
-    yellow = colors.dark_yellow
-    visual = colors.light_blue
-    cursor_line = colors.medium_gray
-    status_line = colors.lighter_gray
-    status_line_nc = colors.lighter_black
-    constant = colors.dark_blue
-    comment = colors.light_gray
-    selection = colors.light_yellow
-    warning = colors.yellow
-else
-    bg = colors.black
-    bg_subtle = colors.light_black
-    bg_very_subtle = colors.subtle_black
-    norm = colors.lighter_gray
-    norm_subtle = colors.light_gray
-    purple = colors.light_purple
-    cyan = colors.light_cyan
-    green = colors.light_green
-    red = colors.light_red
-    yellow = colors.light_yellow
-    visual = colors.subtle_black
-    cursor_line = colors.subtle_black
-    status_line = colors.lighter_black
-    status_line_nc = colors.subtle_black
-    constant = colors.light_green
-    comment = colors.lighter_black
-    selection = colors.light_purple
-    warning = colors.yellow
-end
-
-local highlights = {
-    firstAccent = { fg = cyan },
-    secondAccent = { fg = purple },
-    Normal = { fg = norm },
-    Noise = { fg = norm_subtle },
-    Cursor = { bg = green, fg = norm },
-    Comment = { fg = comment, cterm = "italic" },
-    Function = { fg = norm, cterm = "bold" },
-    FloatWin = { fg = norm, bg = colors.black },
-    Constant = { link = "firstAccent" },
-    Character = { link = "Constant" },
-    Number = { link = "Constant" },
-    Boolean = { link = "Constant" },
-    Float = { link = "Constant" },
-    String = { link = "Constant" },
-    Identifier = { link = "Normal" },
-    Statement = { link = "Normal" },
-    Conditonal = { link = "Statement" },
-    Repeat = { link = "Statement" },
-    Label = { link = "Statement" },
-    Operator = { link = "Noise" },
-    Keyword = { link = "Statement" },
-    Exception = { link = "Statement" },
-    PreProc = { link = "Normal" },
-    Include = { link = "Statement" },
-    Define = { link = "PreProc" },
-    Macro = { link = "PreProc" },
-    PreCondit = { link = "PreProc" },
-    Type = { link = "secondAccent" },
-    StorageClass = { link = "Type" },
-    Structure = { link = "Noise" },
-    Typedef = { link = "Noise" },
-    Special = { link = "StatusLine" },
-    SpecialChar = { link = "Special" },
-    Tag = { link = "Special" },
-    Delimiter = { link = "Special" },
-    SpecialComment = { link = "Special" },
-    Debug = { link = "Special" },
-    Conceal = { link = "NonText" },
-    Underlined = { fg = norm, gui = "underline", cterm = "underline" },
-    Ignore = { fg = bg },
-    Error = { fg = red, cterm = "bold" },
-    Todo = { fg = colors.actual_white, bg = colors.black, gui = "bold", cterm = "bold" },
-    SpecialKey = { fg = colors.subtle_black },
-    NonText = { fg = bg_very_subtle },
-    Directory = { fg = green },
-    ErrorMsg = { fg = colors.pink },
-    IncSearch = { bg = selection, fg = colors.black },
-    Search = { bg = selection, fg = colors.black },
-    MoreMsg = { fg = colors.medium_gray, cterm = "bold", gui = "bold" },
-    ModeMsg = { link = "MoreMsg" },
-    LineNr = { fg = colors.medium_gray },
-    CursorLineNr = { fg = green, bg = bg_very_subtle },
-    Question = { fg = red },
-    VertSplit = { bg = bg, fg = bg_very_subtle },
-    Title = { fg = green },
-    Visual = { bg = visual },
-    VisualNOS = { bg = bg_subtle },
-    WarningMsg = { fg = warning },
-    WildMenu = { fg = colors.white, bg = bg },
-    Folded = { fg = colors.medium_gray },
-    FoldColumn = { fg = bg_subtle },
-    DiffAdd = { fg = green },
-    DiffDelete = { fg = red },
-    DiffChange = { fg = yellow },
-    DiffText = { fg = green },
-    SignColumn = { fg = colors.medium_gray },
-    SpellBad = { gui = "underline", sp = red },
-    SpellCap = { gui = "underline", sp = light_green },
-    SpellRare = { gui = "underline", sp = colors.pink },
-    SpellLocal = { gui = "underline", sp = green },
-    StatusLine = { fg = status_line },
-    StatusLineNC = { fg = status_line_nc },
-    StatusLineOk = { gui = "underline", bg = bg, fg = green },
-    StatusLineError = { gui = "underline", bg = bg, fg = colors.pink },
-    StatusLineWarning = { gui = "underline", bg = bg, fg = warning },
-    Pmenu = { fg = norm, bg = bg_subtle },
-    PmenuSel = { fg = green, bg = bg_very_subtle, gui = "bold" },
-    PmenuSbar = { fg = norm, bg = bg_subtle },
-    PmenuThumb = { fg = norm, bg = bg_subtle },
-    TabLine = { fg = norm_subtle, bg = bg },
-    TabLineSel = { fg = norm, bg = bg, gui = "bold", cterm = "bold" },
-    TabLineFill = { fg = norm_subtle, bg = bg },
-    CursorColumn = { bg = bg_very_subtle },
-    CursorLine = { bg = cursor_line },
-    ColorColumn = { bg = bg_subtle },
-    MatchParen = { bg = bg_very_subtle, fg = norm, cterm = "bold" },
-    qfLineNr = { link = "secondAccent" },
-    qfFileName = { link = "firstAccent" },
-    htmlH1 = { fg = norm },
-    htmlH2 = { fg = norm },
-    htmlH3 = { fg = norm },
-    htmlH4 = { fg = norm },
-    htmlH5 = { fg = norm },
-    htmlH6 = { fg = norm },
-    htmlBold = { fg = norm },
-    htmlItalic = { fg = norm },
-    htmlEndTag = { fg = norm },
-    htmlTag = { fg = norm },
-    htmlTagName = { fg = norm },
-    htmlArg = { fg = norm },
-    htmlError = { fg = red },
-    javaScript = { bg = bg, fg = norm },
-    javaScriptBraces = { bg = bg, fg = norm },
-    javaScriptNumber = { bg = bg, fg = green },
-    diffRemoved = { link = "DiffDelete" },
-    diffAdded = { link = "DiffAdd" },
-    TSAnnotation = { link = "secondAccent" },
-    TSAttribute = { link = "secondAccent" },
-    TSBoolean = { link = "Constant" },
-    TSCharacter = { link = "Constant" },
-    TSComment = { link = "Comment" },
-    TSConstructor = { link = "Normal" },
-    TSConditional = { link = "Statement" },
-    TSConstant = { link = "Constant" },
-    TSConstBuiltin = { link = "secondAccent" },
-    TSConstMacro = { link = "secondAccent" },
-    TSError = { link = "Error" },
-    TSException = { link = "Error" },
-    TSField = { link = "Normal" },
-    TSFloat = { link = "Constant" },
-    TSFunction = { link = "Normal" },
-    TSFuncBuiltin = { link = "secondAccent" },
-    TSFuncMacro = { link = "secondAccent" },
-    TSInclude = { link = "Noise" },
-    TSKeyword = { link = "Statement" },
-    TSKeywordFunction = { link = "Statement" },
-    TSLabel = { link = "Noise" },
-    TSMethod = { link = "Normal" },
-    TSNamespace = { link = "Noise" },
-    TSNone = { link = "Noise" },
-    TSNumber = { link = "Constant" },
-    TSOperator = { link = "Normal" },
-    TSParameter = { link = "Noise" },
-    TSParameterReference = { link = "Statement" },
-    TSProperty = { link = "TSField" },
-    TSPunctDelimiter = { link = "Noise" },
-    TSPunctBracket = { link = "Noise" },
-    TSPunctSpecial = { link = "Noise" },
-    TSRepeat = { link = "Normal" },
-    TSString = { link = "Constant" },
-    TSStringRegex = { link = "secondAccent" },
-    TSStringEscape = { link = "secondAccent" },
-    TSTag = { link = "Statement" },
-    TSTagDelimiter = { link = "Noise" },
-    TSText = { link = "Normal" },
-    TSEmphasis = { link = "Comment" },
-    TSUnderline = { link = "Underlined" },
-    TSStrike = { link = "Underlined" },
-    TSTitle = { link = "Statement" },
-    TSLiteral = { link = "Noise" },
-    TSURI = { link = "Constant" },
-    TSType = { link = "Noise" },
-    TSTypeBuiltin = { link = "secondAccent" },
-    TSVariable = { link = "Normal" },
-    TSVariableBuiltin = { link = "Normal" },
-    TSRepeat = { link = "Statement" },
-    LspDiagnosticsDefaultError = { link = "Error" },
-    LspDiagnosticsDefaultWarning = { link = "WarningMsg" },
-    LspDiagnosticsDefaultInformation = { link = "Noise" },
-    LspDiagnosticsDefaultHint = { link = "Constant" },
-    SignifySignAdd = { link = "LineNr" },
-    SignifySignDelete = { link = "LineNr" },
-    SignifySignChange = { link = "LineNr" },
-    GitGutterAdd = { link = "LineNr" },
-    GitGutterDelete = { link = "LineNr" },
-    GitGutterChange = { link = "LineNr" },
-    GitGutterChangeDelete = { link = "LineNr" },
-    jsFlowTypeKeyword = { link = "Statement" },
-    jsFlowImportType = { link = "Statement" },
-    jsFunction = { link = "Function" },
-    jsGlobalObjects = { link = "Noise" },
-    jsGlobalNodeObjects = { link = "Normal" },
-    jsSwitchCase = { link = "Constant" },
-    jsSpreadOperator = { bg = bg, fg = selection },
-    jsReturn = { link = "jsSpreadOperator" },
-    jsExport = { link = "jsSpreadOperator" },
-    rustModPath = { fg = colors.lightest_gray },
-    rustMacro = { link = "secondAccent" },
-    rustKeyword = { link = "Noise" },
-    rustDerive = { link = "secondAccent" },
-    rustDeriveTrait = { link = "secondAccent" },
-    rustAttribute = { link = "secondAccent" },
-    rustLifetime = { link = "secondAccent" },
-    schemeSyntax = { link = "Normal" },
-    schemeParentheses = { link = "Noise" },
-    schemeIdentifier = { link = "Noise" },
-    lispParen = { link = "Noise" },
-    lispSymbol = { link = "Noise" },
-    shCommandSub = { link = "secondAccent" },
-    cFormat = { link = "secondAccent" },
-    nixBuiltin = { link = "secondAccent" },
-    nixNamespacedBuiltin = { link = "secondAccent" },
-    sqlSpecial = { link = "firstAccent" },
-    sqlKeyword = { link = "secondAccent" },
-    helpExample = { link = "Noise" },
-    helpCommand = { link = "secondAccent" },
-    helpBacktick = { link = "secondAccent" },
-    helpSpecial = { link = "Noise" },
-    StorageClass = { link = "Statement" },
-    elmType = { link = "Type" },
-    xmlTag = { link = "Constant" },
-    xmlTagName = { link = "xmlTag" },
-    xmlEndTag = { link = "xmlTag" },
-    xmlAttrib = { link = "xmlTag" },
-    markdownH1 = { link = "Statement" },
-    markdownH2 = { link = "Statement" },
-    markdownH3 = { link = "Statement" },
-    markdownH4 = { link = "Statement" },
-    markdownH5 = { link = "Statement" },
-    markdownH6 = { link = "Statement" },
-    markdownListMarker = { link = "Constant" },
-    markdownCode = { link = "Constant" },
-    markdownCodeBlock = { link = "Constant" },
-    markdownCodeDelimiter = { link = "Constant" },
-    markdownHeadingDelimiter = { link = "Constant" },
-    cssBraces = { bg = bg, fg = selection },
-    cssTextProp = { link = "Noise" },
-    cssTagName = { link = "Normal" },
-    NormalFloat = { link = "FloatWin" },
-    CmpItemKind = { link = "firstAccent" },
-    CmpItemAbbrMatch = { link = "secondAccent" },
-}
-
-if vim.fn.has("gui_running") == 0 then
-    highlights.SpellBad = { cterm = "underline", fg = red }
-    highlights.SpellCap = { cterm = "underline", fg = light_green }
-    highlights.SpellRare = { cterm = "underline", fg = colors.pink }
-    highlights.SpellLocal = { cterm = "underline", fg = green }
-end
-
-for group, opts in pairs(highlights) do
-    if opts.link then
-        vim.api.nvim_set_hl(0, group, { link = opts.link })
-    else
-        vim.api.nvim_set_hl(0, group, opts)
-    end
-end

@@ -43,7 +43,7 @@ *.swp,.lock,.DS_Store,._*
 ]]
 
 cmd('syntax on')
-cmd('colorscheme grey')
+cmd('colorscheme plain')
 autocmd('TextYankPost', {
   pattern = '*',
   callback = function()
@@ -52,7 +52,7 @@ end,
 })
 
 o.background = 'light'
-o.termguicolors = false
+o.termguicolors = true
 
 -- gitgutter options
 g.gitgutter_override_sign_column_highlight = 0

@@ -22,10 +22,6 @@ {
   programs.alacritty = {
     enable = true;
     settings = {
-      env = {
-        "TERM" = "xterm-256color-italic";
-      };
-
       window = {
         padding.x = 10;
         padding.y = 10;

@@ -42,7 +42,6 @@ ];
 
     sessionVariables = {
 
-      TERM = "xterm-256color-italic";
       EDITOR = "nvim";
       MANPAGER = "nvim +Man!";
       PATH = "/etc/profiles/per-user/icy/bin:$PATH:$HOME/go/bin:$HOME/bin";

@@ -24,8 +24,8 @@ setw -g mode-keys vi
 
       bind r source-file ~/.config/tmux/tmux.conf
 
-      set-option -g default-terminal xterm-256color-italic
-      set -as terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[2 q'
+      # set-option -g default-terminal xterm-256color-italic
+      # set -as terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[2 q'
       set escape-time 20
 
       set -g mouse on
@@ -92,6 +92,10 @@ 
       # dim inactive pane
       set -g window-style 'fg=color8,bg=default'
       set -g window-active-style 'fg=color7,bg=default'
+
+      set -g terminal-overrides ',xterm-256color:Tc'
+      set -g default-terminal "tmux-256color"
+      set -as terminal-overrides ',xterm*:sitm=\E[3m'
     '';
   };
 }