@@ 31,86 31,36 @@ let s:light_black = { "gui": "#424242", "cterm": "8" }
let s:lighter_black = { "gui": "#545454", "cterm": "240" }
let s:subtle_black = { "gui": "#303030", "cterm": "236" }
let s:light_gray = { "gui": "#918175", "cterm": "249" }
-let s:lighter_gray = { "gui": "#CCCCCC", "cterm": "251" }
-let s:lightest_gray = { "gui": "#E5E5E5", "cterm": "251" }
-let s:dark_red = { "gui": "#f75341", "cterm": "1" }
-let s:light_red = { "gui": "#ff5c8f", "cterm": "1" }
-let s:dark_blue = { "gui": "#008EC4", "cterm": "4" }
-let s:light_blue = { "gui": "#B6D6FD", "cterm": "153" }
-let s:dark_cyan = { "gui": "#0aaeb3", "cterm": "6" }
-let s:light_cyan = { "gui": "#4FB8CC", "cterm": "14" }
-let s:dark_green = { "gui": "#10A778", "cterm": "2" }
-let s:light_green = { "gui": "#5FD7A7", "cterm": "10" }
-let s:dark_purple = { "gui": "#523C79", "cterm": "5" }
-let s:light_purple = { "gui": "#6855DE", "cterm": "13" }
-let s:light_yellow = { "gui": "#fed06e", "cterm": "11" }
-let s:dark_yellow = { "gui": "#A89C14", "cterm": "3" }
-
-if &background == "dark"
- let s:bg = s:black
- let s:bg_subtle = s:light_black
- let s:bg_very_subtle = s:subtle_black
- let s:norm = s:white
- let s:norm_subtle = s:light_gray
- let s:norm_very_subtle = s:medium_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:lighter_black
- let s:cursor_line = s:subtle_black
- let s:constant = s:dark_cyan
- let s:comment = s:light_gray
- let s:selection = s:light_yellow
- let s:selection_fg = s:black
- let s:ok = s:light_green
- let s:warning = s:yellow
- let s:error = s:light_red
-else
- 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:norm_very_subtle = s:medium_gray
- 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:lightest_gray
- let s:constant = s:dark_blue
- let s:comment = s:light_gray
- let s:selection = s:light_yellow
- let s:selection_fg = s:light_black
- let s:ok = s:light_green
- let s:warning = s:yellow
- let s:error = s:dark_red
-endif
+let s:red = { "gui": "#ef2f27", "cterm": "1" }
+let s:light_red = { "gui": "#f75341", "cterm": "1" }
+let s:cyan = { "gui": "#4FB8CC", "cterm": "14" }
+let s:green = { "gui": "#10A778", "cterm": "2" }
+let s:purple = { "gui": "#6855DE", "cterm": "13" }
+let s:yellow = { "gui": "#fed06e", "cterm": "11" }
+let s:orange = { "gui": "#fbb829", "cterm": "3" }
+
+let s:bg = s:black
+let s:bg_subtle = s:light_black
+let s:bg_very_subtle = s:subtle_black
+let s:norm = s:white
+let s:norm_subtle = s:light_gray
+let s:norm_very_subtle = s:medium_gray
+let s:visual = s:lighter_black
+let s:cursor_line = s:subtle_black
+let s:constant = s:cyan
+let s:comment = s:light_gray
+let s:selection = s:yellow
+let s:selection_fg = s:black
+let s:ok = s:green
+let s:warning = s:yellow
+let s:error = s:red
-unlet s:black
unlet s:medium_gray
unlet s:white
unlet s:light_black
unlet s:lighter_black
unlet s:subtle_black
unlet s:light_gray
-unlet s:lighter_gray
-unlet s:lightest_gray
-unlet s:dark_red
-unlet s:light_red
-unlet s:dark_blue
-unlet s:light_blue
-unlet s:dark_cyan
-unlet s:light_cyan
-unlet s:dark_green
-unlet s:light_green
-unlet s:dark_purple
-unlet s:light_purple
-unlet s:light_yellow
-unlet s:dark_yellow
" https://github.com/noahfrederick/vim-hemisu/
function! s:h(group, style)
@@ 258,7 208,7 @@ call s:h("CursorLine", {"bg": s:cursor_line})
call s:h("ColorColumn", {"bg": s:cursor_line})
" __MatchParen__
-call s:h("MatchParen", {"bg": s:bg_subtle, "fg": s:norm})
+call s:h("MatchParen", {"fg": s:light_red, "cterm": "bold", "gui": "bold"})
hi! link htmlH1 Normal
hi! link htmlH2 Normal