Overhaul 16-color styling (#271)

Includes regenerated terminal themes.

README.md

@@ -6,6 +6,12 @@ A dark Vim/Neovim color scheme for the GUI and 16/256/true-color terminals, base
 
 ![Color Reference](https://raw.githubusercontent.com/joshdick/onedark.vim/master/img/color_reference.png)
 
+## Breaking Changes
+
+[Pull request #271](https://github.com/joshdick/onedark.vim/pull/271), merged July 11, 2021, contained several breaking changes, especially for 16-color users.
+
+If you are an existing onedark.vim user that is suddenly having issues after this PR was merged, see the [PR description](https://github.com/joshdick/onedark.vim/pull/271) for details.
+
 ## Supported Plugins
 
 onedark.vim includes support for the following Vim and Neovim plugins:

autoload/airline/themes/onedark.vim

@@ -14,17 +14,17 @@ function! airline#themes#onedark#refresh()
     let s:term_blue = s:colors.blue.cterm16
     let s:term_purple = s:colors.purple.cterm16
     let s:term_white = s:colors.white.cterm16
-    let s:term_black = s:colors.black.cterm16
-    let s:term_grey = s:colors.cursor_grey.cterm16
+    let s:term_cursor_grey = s:colors.cursor_grey.cterm16
+    let s:term_visual_grey = s:colors.visual_grey.cterm16
   else
     let s:term_red = s:colors.red.cterm
     let s:term_green = s:colors.green.cterm
     let s:term_yellow = s:colors.yellow.cterm
     let s:term_blue = s:colors.blue.cterm
     let s:term_purple = s:colors.purple.cterm
     let s:term_white = s:colors.white.cterm
-    let s:term_black = s:colors.black.cterm
-    let s:term_grey = s:colors.cursor_grey.cterm
+    let s:term_cursor_grey = s:colors.cursor_grey.cterm
+    let s:term_visual_grey = s:colors.visual_grey.cterm
   endif
 
   let g:airline#themes#onedark#palette = {}
@@ -33,36 +33,36 @@ function! airline#themes#onedark#refresh()
         \ 'red': [ s:colors.red.gui, '', s:term_red, 0 ]
         \ }
 
-  let s:N1 = [ s:colors.black.gui, s:colors.green.gui, s:term_black, s:term_green ]
-  let s:N2 = [ s:colors.white.gui, s:colors.visual_grey.gui, s:term_white, s:term_grey ]
-  let s:N3 = [ s:colors.green.gui, s:colors.black.gui, s:term_green, '' ]
+  let s:N1 = [ s:colors.cursor_grey.gui, s:colors.green.gui, s:term_cursor_grey, s:term_green ]
+  let s:N2 = [ s:colors.white.gui, s:colors.visual_grey.gui, s:term_white, s:term_visual_grey ]
+  let s:N3 = [ s:colors.green.gui, s:colors.cursor_grey.gui, s:term_green, s:term_cursor_grey ]
   let g:airline#themes#onedark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
 
   let group = airline#themes#get_highlight('vimCommand')
   let g:airline#themes#onedark#palette.normal_modified = {
         \ 'airline_c': [ group[0], '', group[2], '', '' ]
         \ }
 
-  let s:I1 = [ s:colors.black.gui, s:colors.blue.gui, s:term_black, s:term_blue ]
+  let s:I1 = [ s:colors.cursor_grey.gui, s:colors.blue.gui, s:term_cursor_grey, s:term_blue ]
   let s:I2 = s:N2
-  let s:I3 = [ s:colors.blue.gui, s:colors.black.gui, s:term_blue, '' ]
+  let s:I3 = [ s:colors.blue.gui, s:colors.cursor_grey.gui, s:term_blue, '' ]
   let g:airline#themes#onedark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
   let g:airline#themes#onedark#palette.insert_modified = g:airline#themes#onedark#palette.normal_modified
 
-  let s:R1 = [ s:colors.black.gui, s:colors.red.gui, s:term_black, s:term_red ]
+  let s:R1 = [ s:colors.cursor_grey.gui, s:colors.red.gui, s:term_cursor_grey, s:term_red ]
   let s:R2 = s:N2
-  let s:R3 = [ s:colors.red.gui, s:colors.black.gui, s:term_red, '' ]
+  let s:R3 = [ s:colors.red.gui, s:colors.cursor_grey.gui, s:term_red, '' ]
   let g:airline#themes#onedark#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
   let g:airline#themes#onedark#palette.replace_modified = g:airline#themes#onedark#palette.normal_modified
 
-  let s:V1 = [ s:colors.black.gui, s:colors.purple.gui, s:term_black, s:term_purple ]
+  let s:V1 = [ s:colors.cursor_grey.gui, s:colors.purple.gui, s:term_cursor_grey, s:term_purple ]
   let s:V2 = s:N2
-  let s:V3 = [ s:colors.purple.gui, s:colors.black.gui, s:term_purple, '' ]
+  let s:V3 = [ s:colors.purple.gui, s:colors.cursor_grey.gui, s:term_purple, '' ]
   let g:airline#themes#onedark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
   let g:airline#themes#onedark#palette.visual_modified = g:airline#themes#onedark#palette.normal_modified
 
-  let s:IA1 = [ s:colors.black.gui, s:colors.white.gui, s:term_black, s:term_white ]
-  let s:IA2 = [ s:colors.white.gui, s:colors.visual_grey.gui, s:term_white, s:term_grey ]
+  let s:IA1 = [ s:colors.cursor_grey.gui, s:colors.white.gui, s:term_cursor_grey, s:term_white ]
+  let s:IA2 = [ s:colors.white.gui, s:colors.visual_grey.gui, s:term_white, s:term_visual_grey ]
   let s:IA3 = s:N2
   let g:airline#themes#onedark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
   let g:airline#themes#onedark#palette.inactive_modified = {
@@ -72,7 +72,7 @@ function! airline#themes#onedark#refresh()
   " Warning/Error styling code from vim-airline's ["base16" theme](https://github.com/vim-airline/vim-airline-themes/blob/master/autoload/airline/themes/base16.vim)
 
   " Warnings
-  let s:WI = [ s:colors.black.gui, s:colors.yellow.gui, s:term_black, s:term_yellow ]
+  let s:WI = [ s:colors.cursor_grey.gui, s:colors.yellow.gui, s:term_cursor_grey, s:term_yellow ]
   let g:airline#themes#onedark#palette.normal.airline_warning = [
        \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
        \ ]
@@ -99,7 +99,7 @@ function! airline#themes#onedark#refresh()
       \ g:airline#themes#onedark#palette.normal.airline_warning
 
   " Errors
-  let s:ER = [ s:colors.black.gui, s:colors.red.gui, s:term_black, s:term_red ]
+  let s:ER = [ s:colors.cursor_grey.gui, s:colors.red.gui, s:term_cursor_grey, s:term_red ]
   let g:airline#themes#onedark#palette.normal.airline_error = [
        \ s:ER[0], s:ER[1], s:ER[2], s:ER[3]
        \ ]

autoload/lightline/colorscheme/onedark.vim

@@ -12,17 +12,17 @@ if get(g:, 'onedark_termcolors', 256) == 16
   let s:term_blue = s:colors.blue.cterm16
   let s:term_purple = s:colors.purple.cterm16
   let s:term_white = s:colors.white.cterm16
-  let s:term_black = s:colors.black.cterm16
-  let s:term_grey = s:colors.cursor_grey.cterm16
+  let s:term_cursor_grey = s:colors.cursor_grey.cterm16
+  let s:term_visual_grey = s:colors.visual_grey.cterm16
 else
   let s:term_red = s:colors.red.cterm
   let s:term_green = s:colors.green.cterm
   let s:term_yellow = s:colors.yellow.cterm
   let s:term_blue = s:colors.blue.cterm
   let s:term_purple = s:colors.purple.cterm
   let s:term_white = s:colors.white.cterm
-  let s:term_black = s:colors.black.cterm
-  let s:term_grey = s:colors.cursor_grey.cterm
+  let s:term_cursor_grey = s:colors.cursor_grey.cterm
+  let s:term_visual_grey = s:colors.visual_grey.cterm
 endif
 
 let s:red = [ s:colors.red.gui, s:term_red ]
@@ -31,28 +31,28 @@ let s:yellow = [ s:colors.yellow.gui, s:term_yellow ]
 let s:blue = [ s:colors.blue.gui, s:term_blue ]
 let s:purple = [ s:colors.purple.gui, s:term_purple ]
 let s:white = [ s:colors.white.gui, s:term_white ]
-let s:black = [ s:colors.black.gui, s:term_black ]
-let s:grey = [ s:colors.visual_grey.gui, s:term_grey ]
+let s:cursor_grey = [ s:colors.cursor_grey.gui, s:term_cursor_grey ]
+let s:visual_grey = [ s:colors.visual_grey.gui, s:term_visual_grey ]
 
 let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
-let s:p.normal.left = [ [ s:black, s:green ], [ s:white, s:grey ] ]
-let s:p.normal.right = [ [ s:black, s:green ], [ s:white, s:grey ] ]
-let s:p.inactive.left =  [ [ s:white, s:grey ], [ s:white, s:grey ] ]
-let s:p.inactive.right = [ [ s:black, s:white ], [ s:black, s:white ] ]
-let s:p.insert.left = [ [ s:black, s:blue ], [ s:white, s:grey ] ]
-let s:p.insert.right = [ [ s:black, s:blue ], [ s:white, s:grey ] ]
-let s:p.replace.left = [ [ s:black, s:red ], [ s:white, s:grey ] ]
-let s:p.replace.right = [ [ s:black, s:red ], [ s:white, s:grey ] ]
-let s:p.visual.left = [ [ s:black, s:purple ], [ s:white, s:grey ] ]
-let s:p.visual.right = [ [ s:black, s:purple ], [ s:white, s:grey ] ]
-let s:p.normal.middle = [ [ s:white, s:black ] ]
-let s:p.inactive.middle = [ [ s:white, s:grey ] ]
-let s:p.tabline.left = [ [ s:white, s:grey ] ]
-let s:p.tabline.tabsel = [ [ s:black, s:white ] ]
-let s:p.tabline.middle = [ [ s:white, s:black ] ]
-let s:p.tabline.right = [ [ s:white, s:grey ] ]
-let s:p.normal.error = [ [ s:black, s:red ] ]
-let s:p.normal.warning = [ [ s:black, s:yellow ] ]
+let s:p.normal.left = [ [ s:cursor_grey, s:green ], [ s:white, s:visual_grey ] ]
+let s:p.normal.right = [ [ s:cursor_grey, s:green ], [ s:white, s:visual_grey ] ]
+let s:p.inactive.left =  [ [ s:white, s:visual_grey ], [ s:white, s:visual_grey ] ]
+let s:p.inactive.right = [ [ s:cursor_grey, s:white ], [ s:cursor_grey, s:white ] ]
+let s:p.insert.left = [ [ s:cursor_grey, s:blue ], [ s:white, s:visual_grey ] ]
+let s:p.insert.right = [ [ s:cursor_grey, s:blue ], [ s:white, s:visual_grey ] ]
+let s:p.replace.left = [ [ s:cursor_grey, s:red ], [ s:white, s:visual_grey ] ]
+let s:p.replace.right = [ [ s:cursor_grey, s:red ], [ s:white, s:visual_grey ] ]
+let s:p.visual.left = [ [ s:cursor_grey, s:purple ], [ s:white, s:visual_grey ] ]
+let s:p.visual.right = [ [ s:cursor_grey, s:purple ], [ s:white, s:visual_grey ] ]
+let s:p.normal.middle = [ [ s:white, s:cursor_grey ] ]
+let s:p.inactive.middle = [ [ s:white, s:visual_grey ] ]
+let s:p.tabline.left = [ [ s:white, s:visual_grey ] ]
+let s:p.tabline.tabsel = [ [ s:cursor_grey, s:white ] ]
+let s:p.tabline.middle = [ [ s:white, s:cursor_grey ] ]
+let s:p.tabline.right = [ [ s:white, s:visual_grey ] ]
+let s:p.normal.error = [ [ s:cursor_grey, s:red ] ]
+let s:p.normal.warning = [ [ s:cursor_grey, s:yellow ] ]
 
 let g:lightline#colorscheme#onedark#palette = lightline#colorscheme#flatten(s:p)
 

autoload/onedark.vim

@@ -11,16 +11,17 @@ let s:colors = {
       \ "blue": get(s:overrides, "blue", { "gui": "#61AFEF", "cterm": "39", "cterm16": "4" }),
       \ "purple": get(s:overrides, "purple", { "gui": "#C678DD", "cterm": "170", "cterm16": "5" }),
       \ "cyan": get(s:overrides, "cyan", { "gui": "#56B6C2", "cterm": "38", "cterm16": "6" }),
-      \ "white": get(s:overrides, "white", { "gui": "#ABB2BF", "cterm": "145", "cterm16": "7" }),
+      \ "white": get(s:overrides, "white", { "gui": "#ABB2BF", "cterm": "145", "cterm16": "15" }),
       \ "black": get(s:overrides, "black", { "gui": "#282C34", "cterm": "235", "cterm16": "0" }),
-      \ "visual_black": get(s:overrides, "visual_black", { "gui": "NONE", "cterm": "NONE", "cterm16": "0" }),
-      \ "comment_grey": get(s:overrides, "comment_grey", { "gui": "#5C6370", "cterm": "59", "cterm16": "15" }),
-      \ "gutter_fg_grey": get(s:overrides, "gutter_fg_grey", { "gui": "#4B5263", "cterm": "238", "cterm16": "15" }),
-      \ "cursor_grey": get(s:overrides, "cursor_grey", { "gui": "#2C323C", "cterm": "236", "cterm16": "8" }),
-      \ "visual_grey": get(s:overrides, "visual_grey", { "gui": "#3E4452", "cterm": "237", "cterm16": "15" }),
-      \ "menu_grey": get(s:overrides, "menu_grey", { "gui": "#3E4452", "cterm": "237", "cterm16": "8" }),
-      \ "special_grey": get(s:overrides, "special_grey", { "gui": "#3B4048", "cterm": "238", "cterm16": "15" }),
-      \ "vertsplit": get(s:overrides, "vertsplit", { "gui": "#181A1F", "cterm": "59", "cterm16": "15" }),
+      \ "foreground": get(s:overrides, "foreground", { "gui": "#ABB2BF", "cterm": "145", "cterm16": "NONE" }),
+      \ "background": get(s:overrides, "background", { "gui": "#282C34", "cterm": "235", "cterm16": "NONE" }),
+      \ "comment_grey": get(s:overrides, "comment_grey", { "gui": "#5C6370", "cterm": "59", "cterm16": "7" }),
+      \ "gutter_fg_grey": get(s:overrides, "gutter_fg_grey", { "gui": "#4B5263", "cterm": "238", "cterm16": "8" }),
+      \ "cursor_grey": get(s:overrides, "cursor_grey", { "gui": "#2C323C", "cterm": "236", "cterm16": "0" }),
+      \ "visual_grey": get(s:overrides, "visual_grey", { "gui": "#3E4452", "cterm": "237", "cterm16": "8" }),
+      \ "menu_grey": get(s:overrides, "menu_grey", { "gui": "#3E4452", "cterm": "237", "cterm16": "7" }),
+      \ "special_grey": get(s:overrides, "special_grey", { "gui": "#3B4048", "cterm": "238", "cterm16": "7" }),
+      \ "vertsplit": get(s:overrides, "vertsplit", { "gui": "#3E4452", "cterm": "59", "cterm16": "7" }),
       \}
 
 function! onedark#GetColors()

build/build.js

@@ -14,18 +14,18 @@ const baseColors = Object.freeze({
   blue: { gui: '#61AFEF', cterm: '39', cterm16: '4' }, // alternate cterm: 75
   purple: { gui: '#C678DD', cterm: '170', cterm16: '5' }, // alternate cterm: 176
   cyan: { gui: '#56B6C2', cterm: '38', cterm16: '6' }, // alternate cterm: 73
-  white: { gui: '#ABB2BF', cterm: '145', cterm16: '7' },
+  white: { gui: '#ABB2BF', cterm: '145', cterm16: '15' },
   black: { gui: '#282C34', cterm: '235', cterm16: '0' }
 });
 
 const specialColors = Object.freeze({
-  comment_grey: { gui: '#5C6370', cterm: '59', cterm16: '15' },
-  gutter_fg_grey: { gui: '#4B5263', cterm: '238', cterm16: '15' },
-  cursor_grey: { gui: '#2C323C', cterm: '236', cterm16: '8' },
-  visual_grey: { gui: '#3E4452', cterm: '237', cterm16: '15' },
-  menu_grey: { cterm16: '8' }, // vim theme handles gui/cterm values
-  special_grey: { gui: '#3B4048', cterm: '238', cterm16: '15' },
-  vertsplit: { gui: '#181A1F', cterm: '59', cterm16: '15' }
+  comment_grey: { gui: '#5C6370', cterm: '59', cterm16: '7' },
+  gutter_fg_grey: { gui: '#4B5263', cterm: '238', cterm16: '8' },
+  cursor_grey: { gui: '#2C323C', cterm: '236', cterm16: '0' },
+  visual_grey: { gui: '#3E4452', cterm: '237', cterm16: '8' },
+  menu_grey: { cterm16: '7' }, // vim theme handles gui/cterm values
+  special_grey: { gui: '#3B4048', cterm: '238', cterm16: '7' },
+  vertsplit: { gui: '#3E4452', cterm: '59', cterm16: '7' }
 });
 
 const colors = Object.assign({}, baseColors, specialColors);

build/templates/One Dark.Xresources

@@ -4,20 +4,20 @@
 *.cursorColor:  <%=white.gui%>
 
 ! black
-*.color0:       <%=comment_grey.gui%>
-*.color8:       <%=gutter_fg_grey.gui%>
+*.color0:       <%=cursor_grey.gui%>
+*.color8:       <%=visual_grey.gui%>
 
 ! red
 *.color1:       <%=red.gui%>
-*.color9:       <%=dark_red.gui%>
+*.color9:       <%=red.gui%>
 
 ! green
 *.color2:       <%=green.gui%>
 *.color10:      <%=green.gui%>
 
 ! yellow
 *.color3:       <%=yellow.gui%>
-*.color11:      <%=dark_yellow.gui%>
+*.color11:      <%=yellow.gui%>
 
 ! blue
 *.color4:       <%=blue.gui%>
@@ -32,6 +32,6 @@
 *.color14:      <%=cyan.gui%>
 
 ! white
-*.color7:       <%=white.gui%>
-*.color15:      <%=visual_grey.gui%>
+*.color7:       <%=comment_grey.gui%>
+*.color15:      <%=white.gui%>
 

build/templates/autoload.template.vim

@@ -13,7 +13,8 @@ let s:colors = {
       \ "cyan": get(s:overrides, "cyan", { "gui": "<%=cyan.gui%>", "cterm": "<%=cyan.cterm%>", "cterm16": "<%=cyan.cterm16%>" }),
       \ "white": get(s:overrides, "white", { "gui": "<%=white.gui%>", "cterm": "<%=white.cterm%>", "cterm16": "<%=white.cterm16%>" }),
       \ "black": get(s:overrides, "black", { "gui": "<%=black.gui%>", "cterm": "<%=black.cterm%>", "cterm16": "<%=black.cterm16%>" }),
-      \ "visual_black": get(s:overrides, "visual_black", { "gui": "NONE", "cterm": "NONE", "cterm16": "<%=black.cterm16%>" }),
+      \ "foreground": get(s:overrides, "foreground", { "gui": "<%=white.gui%>", "cterm": "<%=white.cterm%>", "cterm16": "NONE" }),
+      \ "background": get(s:overrides, "background", { "gui": "<%=black.gui%>", "cterm": "<%=black.cterm%>", "cterm16": "NONE" }),
       \ "comment_grey": get(s:overrides, "comment_grey", { "gui": "<%=comment_grey.gui%>", "cterm": "<%=comment_grey.cterm%>", "cterm16": "<%=comment_grey.cterm16%>" }),
       \ "gutter_fg_grey": get(s:overrides, "gutter_fg_grey", { "gui": "<%=gutter_fg_grey.gui%>", "cterm": "<%=gutter_fg_grey.cterm%>", "cterm16": "<%=gutter_fg_grey.cterm16%>" }),
       \ "cursor_grey": get(s:overrides, "cursor_grey", { "gui": "<%=cursor_grey.gui%>", "cterm": "<%=cursor_grey.cterm%>", "cterm16": "<%=cursor_grey.cterm16%>" }),

colors/onedark.vim

@@ -145,7 +145,8 @@ let s:purple = s:colors.purple
 let s:cyan = s:colors.cyan
 let s:white = s:colors.white
 let s:black = s:colors.black
-let s:visual_black = s:colors.visual_black " Black out selected text in 16-color visual mode
+let s:foreground = s:colors.foreground
+let s:background = s:colors.background
 let s:comment_grey = s:colors.comment_grey
 let s:gutter_fg_grey = s:colors.gutter_fg_grey
 let s:cursor_grey = s:colors.cursor_grey
@@ -160,9 +161,9 @@ let s:vertsplit = s:colors.vertsplit
 
 let g:terminal_ansi_colors = [
   \ s:black.gui, s:red.gui, s:green.gui, s:yellow.gui,
-  \ s:blue.gui, s:purple.gui, s:cyan.gui, s:white.gui,
-  \ s:visual_grey.gui, s:dark_red.gui, s:green.gui, s:dark_yellow.gui,
-  \ s:blue.gui, s:purple.gui, s:cyan.gui, s:comment_grey.gui
+  \ s:blue.gui, s:purple.gui, s:cyan.gui, s:comment_grey.gui,
+  \ s:visual_grey.gui, s:red.gui, s:green.gui, s:yellow.gui,
+  \ s:blue.gui, s:purple.gui, s:cyan.gui, s:white.gui
 \]
 
 " }}}
@@ -240,10 +241,10 @@ call s:h("MatchParen", { "fg": s:blue, "gui": "underline", "cterm": "underline"
 call s:h("ModeMsg", {}) " 'showmode' message (e.g., "-- INSERT --")
 call s:h("MoreMsg", {}) " more-prompt
 call s:h("NonText", { "fg": s:special_grey }) " '~' and '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line).
-call s:h("Normal", { "fg": s:white, "bg": s:black }) " normal text
-call s:h("Pmenu", { "bg": s:menu_grey }) " Popup menu: normal item.
-call s:h("PmenuSel", { "fg": s:black, "bg": s:blue }) " Popup menu: selected item.
-call s:h("PmenuSbar", { "bg": s:special_grey }) " Popup menu: scrollbar.
+call s:h("Normal", { "fg": s:foreground, "bg": s:background }) " normal text
+call s:h("Pmenu", { "fg": s:white, "bg": s:menu_grey }) " Popup menu: normal item.
+call s:h("PmenuSel", { "fg": s:cursor_grey, "bg": s:blue }) " Popup menu: selected item.
+call s:h("PmenuSbar", { "bg": s:cursor_grey }) " Popup menu: scrollbar.
 call s:h("PmenuThumb", { "bg": s:white }) " Popup menu: Thumb of the scrollbar.
 call s:h("Question", { "fg": s:purple }) " hit-enter prompt and yes/no questions
 call s:h("QuickFixLine", { "fg": s:black, "bg": s:yellow }) " Current quickfix item in the quickfix window.
@@ -262,7 +263,7 @@ call s:h("TabLineFill", {}) " tab pages line, where there are no labels
 call s:h("TabLineSel", { "fg": s:white }) " tab pages line, active tab page label
 call s:h("Terminal", { "fg": s:white, "bg": s:black }) " terminal window (see terminal-size-color)
 call s:h("Title", { "fg": s:green }) " titles for output from ":set all", ":autocmd" etc.
-call s:h("Visual", { "fg": s:visual_black, "bg": s:visual_grey }) " Visual mode selection
+call s:h("Visual", { "bg": s:visual_grey }) " Visual mode selection
 call s:h("VisualNOS", { "bg": s:visual_grey }) " Visual mode selection when vim is "Not Owning the Selection". Only X11 Gui's gui-x11 and xterm-clipboard supports this.
 call s:h("WarningMsg", { "fg": s:yellow }) " warning messages
 call s:h("WildMenu", { "fg": s:black, "bg": s:blue }) " current match in 'wildmenu' completion
@@ -644,8 +645,8 @@ if has("nvim")
   let g:terminal_color_13 = s:purple.gui " No dark version
   let g:terminal_color_14 = s:cyan.gui " No dark version
   let g:terminal_color_15 = s:comment_grey.gui
-  let g:terminal_color_background = g:terminal_color_0
-  let g:terminal_color_foreground = g:terminal_color_7
+  let g:terminal_color_background = s:background.gui
+  let g:terminal_color_foreground = s:foreground.gui
   " }}}
 
   " Neovim LSP {{{

term/One Dark.Xresources

@@ -4,20 +4,20 @@
 *.cursorColor:  #ABB2BF
 
 ! black
-*.color0:       #5C6370
-*.color8:       #4B5263
+*.color0:       #2C323C
+*.color8:       #3E4452
 
 ! red
 *.color1:       #E06C75
-*.color9:       #BE5046
+*.color9:       #E06C75
 
 ! green
 *.color2:       #98C379
 *.color10:      #98C379
 
 ! yellow
 *.color3:       #E5C07B
-*.color11:      #D19A66
+*.color11:      #E5C07B
 
 ! blue
 *.color4:       #61AFEF
@@ -32,6 +32,6 @@
 *.color14:      #56B6C2
 
 ! white
-*.color7:       #ABB2BF
-*.color15:      #3E4452
+*.color7:       #5C6370
+*.color15:      #ABB2BF