Switch everything to use base-16 colors

diff --git a/lua/lualine/themes/nord.lua b/lua/lualine/themes/nord.lua
index 76902d98a0ac6ac5d891ab8ae6b0de1513bd3c0c..326ffec4faaa941cdf6b101466a3fcefc603278b 100644 (file)
--- a/lua/lualine/themes/nord.lua
+++ b/lua/lualine/themes/nord.lua
@@ -3,28 +3,28 @@ local colors = require('nord.colors')
 local nord = {}
 
 nord.normal = {
-       a = {fg = colors.bg, bg = colors.accent, gui = 'bold'},
+       a = {fg = colors.nord0_gui, bg = colors.accent, gui = 'bold'},
        b = {fg = colors.title, bg = colors.active},
        c = {fg = colors.fg, bg = colors.selection},
 }
 
 nord.insert = {
-       a = {fg = colors.bg, bg = colors.nord14_gui, gui = 'bold'},
+       a = {fg = colors.nord0_gui, bg = colors.nord14_gui, gui = 'bold'},
        b = {fg = colors.title, bg = colors.active},
 }
 
 nord.visual = {
-       a = {fg = colors.bg, bg = colors.nord9_gui, gui = 'bold'},
+       a = {fg = colors.nord0_gui, bg = colors.nord9_gui, gui = 'bold'},
        b = {fg = colors.title, bg = colors.active},
 }
 
 nord.replace = {
-       a = {fg = colors.bg, bg = colors.nord11_gui, gui = 'bold'},
+       a = {fg = colors.nord0_gui, bg = colors.nord11_gui, gui = 'bold'},
        b = {fg = colors.title, bg = colors.active},
 }
 
 nord.command = {
-       a = {fg = colors.bg, bg = colors.nord15_gui, gui = 'bold'},
+       a = {fg = colors.nord0_gui, bg = colors.nord15_gui, gui = 'bold'},
        b = {fg = colors.title, bg = colors.active},
 }
 

diff --git a/lua/nord/colors.lua b/lua/nord/colors.lua
index df2a3f9fb0b620d18e1e531aa8c6455378073751..cd07e7f7715c6dbce5057b4051fbb426323538f9 100644 (file)
--- a/lua/nord/colors.lua
+++ b/lua/nord/colors.lua
@@ -17,40 +17,20 @@ local nord = {
   nord13_gui = "#EBCB8B"       ,
   nord14_gui = "#A3BE8C"       ,
   nord15_gui = "#B48EAD"       ,
-
-       bg =            '#2E3440',
-       bg_alt =        '#3B4252',
-       fg =            '#D8DEE9',
-       text =          '#D8DEE9',
-       comments =      '#4C566A',
-       selection =     '#3B4252',
-       contrast =      '#434C5E',
-       active =        '#5E81AC',
-       border =        '#434C5E',
-       line_numbers =  '#616E88',
-       highlight =     '#c1c9d6',
-       disabled =      '#3B4252',
-       cursor =        '#E5E9F0',
-       accent =        '#D8DEE9',
-  gray =          '#D8DEE9',
-
-       error =         '#BF616A',
-       link =          '#A3BE8C',
-
-       none =          'NONE'
+  none =          'NONE'
 }
 
 -- Enable contrast sidebars, floating windows and popup menus
 if vim.g.nord_contrast == true then
-  nord.sidebar = nord.bg_alt
-  nord.float = nord.bg_alt
+  nord.sidebar = nord.nord1_gui
+  nord.float = nord.nord1_gui
 else
-  nord.sidebar = nord.bg
-  nord.float = nord.bg
+  nord.sidebar = nord.nord0_gui
+  nord.float = nord.nord0_gui
 end
 
 if vim.g.nord_cursorline_transparent == true then
-  nord.cursorlinefg = nord.bg
+  nord.cursorlinefg = nord.nord0_gui
 else
   nord.cursorlinefg = nord.nord1_gui
 end

diff --git a/lua/nord/theme.lua b/lua/nord/theme.lua
index af4e6e007c1209afb271826f231b2f06f154c5c7..f89bff7cc2ffd1319ca14abe25250b2f631889d3 100644 (file)
--- a/lua/nord/theme.lua
+++ b/lua/nord/theme.lua
@@ -29,14 +29,14 @@ theme.loadSyntax = function ()
     Delimiter =      { fg = nord.nord6_gui }, -- character that needs attention like , or .
     SpecialComment = { fg = nord.nord8_gui }, -- special things inside a comment
     Debug =          { fg = nord.nord11_gui }, -- debugging statements
-    Underlined =     { fg = nord.link, bg = nord.none, style = 'underline' }, -- text that stands out, HTML links
-    Ignore =         { fg = nord.disabled }, -- left blank, hidden
-    Error =          { fg = nord.error, bg = nord.none, style = 'bold,underline' }, -- any erroneous construct
+    Underlined =     { fg = nord.nord14_gui, bg = nord.none, style = 'underline' }, -- text that stands out, HTML links
+    Ignore =         { fg = nord.nord1_gui }, -- left blank, hidden
+    Error =          { fg = nord.nord11_gui, bg = nord.none, style = 'bold,underline' }, -- any erroneous construct
     Todo =           { fg = nord.nord13_gui, bg = nord.none, style = 'bold,italic' }, -- anything that needs extra attention; mostly the keywords TODO FIXME and XXX
-    Conceal =        { fg = nord.none, bg = nord.bg },
+    Conceal =        { fg = nord.none, bg = nord.nord0_gui },
 
 
-    htmlLink = { fg = nord.link, style = "underline" },
+    htmlLink = { fg = nord.nord14_gui, style = "underline" },
     htmlH1 =   { fg = nord.nord8_gui, style = "bold" },
     htmlH2 =   { fg = nord.nord11_gui, style = "bold" },
     htmlH3 =   { fg = nord.nord14_gui, style = "bold" },
@@ -78,64 +78,64 @@ theme.loadEditor = function ()
     -- Editor highlight groups
 
   local editor = {
-    NormalFloat =      { fg = nord.fg, bg = nord.float }, -- normal text and background color
+    NormalFloat =      { fg = nord.nord4_gui, bg = nord.float }, -- normal text and background color
     ColorColumn =      { fg = nord.none, bg = nord.nord1_gui }, --  used for the columns set with 'colorcolumn'
-    Conceal =          { fg = nord.disabled }, -- placeholder characters substituted for concealed text (see 'conceallevel')
+    Conceal =          { fg = nord.nord1_gui }, -- placeholder characters substituted for concealed text (see 'conceallevel')
     Cursor =           { fg = nord.nord4_gui, bg = nord.none, style = 'reverse' }, -- the character under the cursor
-    CursorIM =         { fg = nord.cursor, bg = nord.none, style = 'reverse' }, -- like Cursor, but used when in IME mode
+    CursorIM =         { fg = nord.nord5_gui, bg = nord.none, style = 'reverse' }, -- like Cursor, but used when in IME mode
     Directory =        { fg = nord.nord7_gui, bg = nord.none }, -- directory names (and other special names in listings)
     DiffAdd =          { fg = nord.nord14_gui, bg = nord.none, style = 'reverse' }, -- diff mode: Added line
     DiffChange =       { fg = nord.nord12_gui, bg = nord.none, style = 'reverse' }, --  diff mode: Changed line
     DiffDelete =       { fg = nord.nord11_gui, bg = nord.none, style = 'reverse' }, -- diff mode: Deleted line
     DiffText =         { fg = nord.nord15_gui, bg = nord.none, style = 'reverse' }, -- diff mode: Changed text within a changed line
-    EndOfBuffer =      { fg = nord.disabled },
+    EndOfBuffer =      { fg = nord.nord1_gui },
     ErrorMsg =         { fg = nord.none },
-    Folded =           { fg = nord.disabled, nord.none, style = 'italic' },
+    Folded =           { fg = nord.nord1_gui, nord.none, style = 'italic' },
     FoldColumn =       { fg = nord.nord7_gui },
     IncSearch =        { fg = nord.none, bg = nord.nord4_gui, style = 'reverse' },
-    LineNr =           { fg = nord.line_numbers },
-    CursorLineNr =     { fg = nord.accent },
+    LineNr =           { fg = nord.nord3_gui_bright },
+    CursorLineNr =     { fg = nord.nord4_gui },
     MatchParen =       { fg = nord.nord15_gui, bg = nord.none, style = 'bold' },
-    ModeMsg =          { fg = nord.accent },
-    MoreMsg =          { fg = nord.accent },
-    NonText =          { fg = nord.disabled },
-    Pmenu =            { fg = nord.text, bg = nord.contrast },
-    PmenuSel =         { fg = nord.accent, bg = nord.active },
-    PmenuSbar =        { fg = nord.text, bg = nord.contrast },
-    PmenuThumb =       { fg = nord.fg, bg = nord.accent },
+    ModeMsg =          { fg = nord.nord4_gui },
+    MoreMsg =          { fg = nord.nord4_gui },
+    NonText =          { fg = nord.nord1_gui },
+    Pmenu =            { fg = nord.nord4_gui, bg = nord.nord2_gui },
+    PmenuSel =         { fg = nord.nord4_gui, bg = nord.nord10_gui },
+    PmenuSbar =        { fg = nord.nord4_gui, bg = nord.nord2_gui },
+    PmenuThumb =       { fg = nord.nord4_gui, bg = nord.nord4_gui },
     Question =         { fg = nord.nord14_gui },
-    QuickFixLine =     { fg = nord.highlight, nord.nord6_gui, style = 'reverse' },
-    qfLineNr =         { fg = nord.highlight, nord.nord6_gui, style = 'reverse' },
+    QuickFixLine =     { fg = nord.nord4_gui, nord.nord6_gui, style = 'reverse' },
+    qfLineNr =         { fg = nord.nord4_gui, nord.nord6_gui, style = 'reverse' },
     Search =           { fg = nord.nord1_gui, bg = nord.nord6_gui, style = 'reverse' },
     SpecialKey =       { fg = nord.nord9_gui },
     SpellBad =         { fg = nord.nord11_gui, bg = nord.none, style = 'italic,undercurl' },
     SpellCap =         { fg = nord.nord7_gui, bg = nord.none, style = 'italic,undercurl' },
     SpellLocal =       { fg = nord.nord8_gui, bg = nord.none, style = 'italic,undercurl' },
     SpellRare =        { fg = nord.nord9_gui, bg = nord.none, style = 'italic,undercurl' },
-    StatusLine =       { fg = nord.fg, bg = nord.contrast },
-    StatusLineNC =     { fg = nord.text, bg = nord.disabled },
-    StatusLineTerm =   { fg = nord.fg, bg = nord.contrast },
-    StatusLineTermNC = { fg = nord.text, bg = nord.disabled },
-    TabLineFill =      { fg = nord.fg },
+    StatusLine =       { fg = nord.nord4_gui, bg = nord.nord2_gui },
+    StatusLineNC =     { fg = nord.nord4_gui, bg = nord.nord1_gui },
+    StatusLineTerm =   { fg = nord.nord4_gui, bg = nord.nord2_gui },
+    StatusLineTermNC = { fg = nord.nord4_gui, bg = nord.nord1_gui },
+    TabLineFill =      { fg = nord.nord4_gui },
     TablineSel =       { fg = nord.nord8_gui, bg = nord.nord3_gui },
-    Tabline =          { fg = nord.fg },
+    Tabline =          { fg = nord.nord4_gui },
     Title =            { fg = nord.nord14_gui, bg = nord.none, style = 'bold' },
-    Visual =           { fg = nord.none, bg = nord.selection },
-    VisualNOS =        { fg = nord.none, bg = nord.selection },
+    Visual =           { fg = nord.none, bg = nord.nord1_gui },
+    VisualNOS =        { fg = nord.none, bg = nord.nord1_gui },
     WarningMsg =       { fg = nord.nord15_gui },
     WildMenu =         { fg = nord.nord12_gui, bg = nord.none, style = 'bold' },
     CursorColumn =     { fg = nord.none, bg = nord.cursorlinefg },
     CursorLine =       { fg = nord.none, bg = nord.cursorlinefg },
-    ToolbarLine =      { fg = nord.fg, bg = nord.bg_alt },
-    ToolbarButton =    { fg = nord.fg, bg = nord.none, style = 'bold' },
-    NormalMode =       { fg = nord.accent, bg = nord.none, style = 'reverse' },
+    ToolbarLine =      { fg = nord.nord4_gui, bg = nord.nord1_gui },
+    ToolbarButton =    { fg = nord.nord4_gui, bg = nord.none, style = 'bold' },
+    NormalMode =       { fg = nord.nord4_gui, bg = nord.none, style = 'reverse' },
     InsertMode =       { fg = nord.nord14_gui, bg = nord.none, style = 'reverse' },
     ReplacelMode =     { fg = nord.nord11_gui, bg = nord.none, style = 'reverse' },
     VisualMode =       { fg = nord.nord9_gui, bg = nord.none, style = 'reverse' },
-    CommandMode =      { fg = nord.gray, bg = nord.none, style = 'reverse' },
+    CommandMode =      { fg = nord.nord4_gui, bg = nord.none, style = 'reverse' },
     Warnings =         { fg = nord.nord15_gui },
 
-    healthError =   { fg = nord.error },
+    healthError =   { fg = nord.nord11_gui },
     healthSuccess = { fg = nord.nord14_gui },
     healthWarning = { fg = nord.nord15_gui },
 
@@ -146,26 +146,26 @@ theme.loadEditor = function ()
     DashboardFooter =   { fg = nord.nord14_gui, style = "italic" },
 
     -- BufferLine
-    BufferLineIndicatorSelected = { fg = nord.bg },
-    BufferLineFill =              { bg = nord.bg },
+    BufferLineIndicatorSelected = { fg = nord.nord0_gui },
+    BufferLineFill =              { bg = nord.nord0_gui },
   }
 
   -- Options:
 
   --Set transparent background
   if vim.g.nord_disable_background then
-    editor.Normal =     { fg = nord.fg, bg = nord.none } -- normal text and background color
-    editor.SignColumn = { fg = nord.fg, bg = nord.none }
+    editor.Normal =     { fg = nord.nord4_gui, bg = nord.none } -- normal text and background color
+    editor.SignColumn = { fg = nord.nord4_gui, bg = nord.none }
   else
-    editor.Normal =     { fg = nord.fg, bg = nord.bg } -- normal text and background color
-    editor.SignColumn = { fg = nord.fg, bg = nord.bg }
+    editor.Normal =     { fg = nord.nord4_gui, bg = nord.nord0_gui } -- normal text and background color
+    editor.SignColumn = { fg = nord.nord4_gui, bg = nord.nord0_gui }
   end
 
   -- Remove window split borders
   if vim.g.nord_borders then
-    editor.VertSplit = { fg = nord.border }
+    editor.VertSplit = { fg = nord.nord2_gui }
   else
-    editor.VertSplit = { fg = nord.bg }
+    editor.VertSplit = { fg = nord.nord0_gui }
   end
 
   return editor
@@ -208,9 +208,9 @@ theme.loadTreeSitter = function ()
     TSBoolean=            { fg = nord.nord9_gui },    -- For booleans.
     TSConstBuiltin =      { fg = nord.nord7_gui },    -- For constant that are built in the language: `nil` in Lua.
     TSConstMacro =        { fg = nord.nord7_gui },    -- For constants that are defined by macros: `NULL` in C.
-    TSError =             { fg = nord.error },    -- For syntax/parser errors.
+    TSError =             { fg = nord.nord11_gui },    -- For syntax/parser errors.
     TSException =         { fg = nord.nord15_gui },    -- For exception related keywords.
-    TSField =             { fg = nord.gray }, -- For fields.
+    TSField =             { fg = nord.nord4_gui }, -- For fields.
     TSFuncMacro =         { fg = nord.nord7_gui },    -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust.
     TSInclude =           { fg = nord.nord9_gui },    -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua.
     TSLabel =             { fg = nord.nord15_gui }, -- For labels: `label:` in C and `:label:` in Lua.
@@ -223,20 +223,19 @@ theme.loadTreeSitter = function ()
     TSPunctBracket =      { fg = nord.nord8_gui }, -- For brackets and parens.
     TSPunctSpecial =      { fg = nord.nord8_gui }, -- For special punctutation that does not fall in the catagories before.
     TSStringRegex =       { fg = nord.nord7_gui }, -- For regexes.
-    TSStringEscape =      { fg = nord.disabled }, -- For escape characters within a string.
+    TSStringEscape =      { fg = nord.nord1_gui }, -- For escape characters within a string.
     TSSymbol =            { fg = nord.nord15_gui },    -- For identifiers referring to symbols or atoms.
     TSType =              { fg = nord.nord9_gui},    -- For types.
     TSTypeBuiltin =       { fg = nord.nord9_gui},    -- For builtin types.
     TSTag =               { fg = nord.nord4_gui },    -- Tags like html tag names.
     TSTagDelimiter =      { fg = nord.nord15_gui },    -- Tag delimiter like `<` `>` `/`
-    TSText =              { fg = nord.text },    -- For strings considenord11_gui text in a markup language.
+    TSText =              { fg = nord.nord4_gui },    -- For strings considenord11_gui text in a markup language.
     TSTextReference =     { fg = nord.nord15_gui }, -- FIXME
     TSEmphasis =          { fg = nord.nord10_gui },    -- For text to be represented with emphasis.
-    TSUnderline =         { fg = nord.fg, bg = nord.none, style = 'underline' },    -- For text to be represented with an underline.
-    TSStrike =            { },    -- For strikethrough text.
+    TSUnderline =         { fg = nord.nord4_gui, bg = nord.none, style = 'underline' },    -- For text to be represented with an underline.
     TSTitle =             { fg = nord.nord10_gui, bg = nord.none, style = 'bold' },    -- Text that is part of a title.
-    TSLiteral =           { fg = nord.fg },    -- Literal text.
-    TSURI =               { fg = nord.link },    -- Any URI like a link or email.        TSAnnotation =                                                                  { fg = nord.nord11_gui },    -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information.
+    TSLiteral =           { fg = nord.nord4_gui },    -- Literal text.
+    TSURI =               { fg = nord.nord14_gui },    -- Any URI like a link or email.        TSAnnotation =                                                                  { fg = nord.nord11_gui },    -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information.
 
   }
 
@@ -248,8 +247,8 @@ theme.loadTreeSitter = function ()
   treesitter.TSFunction =        { fg = nord.nord8_gui }    -- For fuction (calls and definitions).
   treesitter.TSMethod =          { fg = nord.nord7_gui }    -- For method calls and definitions.
   treesitter.TSFuncBuiltin =     { fg = nord.nord8_gui }
-  treesitter.TSVariable =        { fg = nord.accent }-- Any variable name that does not have another highlight.
-  treesitter.TSVariableBuiltin = { fg = nord.accent }
+  treesitter.TSVariable =        { fg = nord.nord4_gui }-- Any variable name that does not have another highlight.
+  treesitter.TSVariableBuiltin = { fg = nord.nord4_gui }
 
   return treesitter
 
@@ -259,11 +258,11 @@ theme.loadLSP = function ()
   -- Lsp highlight groups
 
   local lsp = {
-    LspDiagnosticsDefaultError =           { fg = nord.error }, -- used for "Error" diagnostic virtual text
-    LspDiagnosticsSignError =              { fg = nord.error }, -- used for "Error" diagnostic signs in sign column
-    LspDiagnosticsFloatingError =          { fg = nord.error }, -- used for "Error" diagnostic messages in the diagnostics float
-    LspDiagnosticsVirtualTextError =       { fg = nord.error }, -- Virtual text "Error"
-    LspDiagnosticsUnderlineError =         { style = 'undercurl', sp = nord.error }, -- used to underline "Error" diagnostics.
+    LspDiagnosticsDefaultError =           { fg = nord.nord11_gui }, -- used for "Error" diagnostic virtual text
+    LspDiagnosticsSignError =              { fg = nord.nord11_gui }, -- used for "Error" diagnostic signs in sign column
+    LspDiagnosticsFloatingError =          { fg = nord.nord11_gui }, -- used for "Error" diagnostic messages in the diagnostics float
+    LspDiagnosticsVirtualTextError =       { fg = nord.nord11_gui }, -- Virtual text "Error"
+    LspDiagnosticsUnderlineError =         { style = 'undercurl', sp = nord.nord11_gui }, -- used to underline "Error" diagnostics.
     LspDiagnosticsDefaultWarning =         { fg = nord.nord15_gui}, -- used for "Warning" diagnostic signs in sign column
     LspDiagnosticsSignWarning =            { fg = nord.nord15_gui}, -- used for "Warning" diagnostic signs in sign column
     LspDiagnosticsFloatingWarning =        { fg = nord.nord15_gui}, -- used for "Warning" diagnostic messages in the diagnostics float
@@ -279,9 +278,9 @@ theme.loadLSP = function ()
     LspDiagnosticsFloatingHint =           { fg = nord.nord9_gui  }, -- used for "Hint" diagnostic messages in the diagnostics float
     LspDiagnosticsVirtualTextHint =        { fg = nord.nord9_gui  }, -- Virtual text "Hint"
     LspDiagnosticsUnderlineHint =          { style = 'undercurl', sp = nord.nord10_gui }, -- used to underline "Hint" diagnostics.
-    LspReferenceText =                     { fg = nord.accent, bg = nord.highlight }, -- used for highlighting "text" references
-    LspReferenceRead =                     { fg = nord.accent, bg = nord.highlight }, -- used for highlighting "read" references
-    LspReferenceWrite =                    { fg = nord.accent, bg = nord.highlight }, -- used for highlighting "write" references
+    LspReferenceText =                     { fg = nord.nord4_gui, bg = nord.nord4_gui }, -- used for highlighting "text" references
+    LspReferenceRead =                     { fg = nord.nord4_gui, bg = nord.nord4_gui }, -- used for highlighting "read" references
+    LspReferenceWrite =                    { fg = nord.nord4_gui, bg = nord.nord4_gui }, -- used for highlighting "write" references
   }
 
   return lsp
@@ -294,9 +293,9 @@ theme.loadPlugins = function()
   local plugins = {
 
     -- LspTrouble
-    LspTroubleText =   { fg = nord.text },
-    LspTroubleCount =  { fg = nord.nord9_gui, bg = nord.active },
-    LspTroubleNormal = { fg = nord.fg, bg = nord.sidebar },
+    LspTroubleText =   { fg = nord.nord4_gui },
+    LspTroubleCount =  { fg = nord.nord9_gui, bg = nord.nord10_gui },
+    LspTroubleNormal = { fg = nord.nord4_gui, bg = nord.sidebar },
 
     -- Diff
     diffAdded =     { fg = nord.nord14_gui },
@@ -305,15 +304,15 @@ theme.loadPlugins = function()
     diffOldFile =   { fg = nord.yelow },
     diffNewFile =   { fg = nord.nord12_gui },
     diffFile =      { fg = nord.nord7_gui },
-    diffLine =      { fg = nord.comments },
+    diffLine =      { fg = nord.nord3_gui },
     diffIndexLine = { fg = nord.nord9_gui },
 
     -- Neogit
     NeogitBranch =               { fg = nord.nord10_gui },
     NeogitRemote =               { fg = nord.nord9_gui },
-    NeogitHunkHeader =           { fg = nord.fg, bg = nord.highlight },
-    NeogitHunkHeaderHighlight =  { fg = nord.nord7_gui, bg = nord.contrast },
-    NeogitDiffContextHighlight = { fg = nord.bg_alt, bg = nord.contrast },
+    NeogitHunkHeader =           { fg = nord.nord4_gui, bg = nord.nord4_gui },
+    NeogitHunkHeaderHighlight =  { fg = nord.nord7_gui, bg = nord.nord2_gui },
+    NeogitDiffContextHighlight = { fg = nord.nord1_gui, bg = nord.nord2_gui },
     NeogitDiffDeleteHighlight =  { fg = nord.nord11_gui },
     NeogitDiffAddHighlight =     { fg = nord.nord14_gui },
 
@@ -340,7 +339,7 @@ theme.loadPlugins = function()
     TelescopeSelectionCaret = { fg = nord.nord9_gui },
     TelescopeSelection =      { fg = nord.nord9_gui },
     TelescopeMatching =       { fg = nord.nord8_gui },
-    TelescopeNormal =         { fg = nord.fg, bg = nord.float },
+    TelescopeNormal =         { fg = nord.nord4_gui, bg = nord.float },
 
     -- NvimTree
     NvimTreeRootFolder =        { fg = nord.nord7_gui, style = "bold" },
@@ -350,29 +349,29 @@ theme.loadPlugins = function()
     NvimTreeExecFile =          { fg = nord.nord14_gui },
     NvimTreeSpecialFile =       { fg = nord.nord9_gui , style = "underline" },
     NvimTreeFolderName=         { fg = nord.nord10_gui },
-    NvimTreeEmptyFolderName=    { fg = nord.disabled },
-    NvimTreeFolderIcon=         { fg = nord.accent },
-    NvimTreeIndentMarker =      { fg  = nord.disabled },
-    LspDiagnosticsError =       { fg = nord.error },
+    NvimTreeEmptyFolderName=    { fg = nord.nord1_gui },
+    NvimTreeFolderIcon=         { fg = nord.nord4_gui },
+    NvimTreeIndentMarker =      { fg  = nord.nord1_gui },
+    LspDiagnosticsError =       { fg = nord.nord11_gui },
     LspDiagnosticsWarning =     { fg = nord.nord15_gui },
     LspDiagnosticsInformation = { fg = nord.nord10_gui },
     LspDiagnosticsHint =        { fg = nord.nord9_gui },
 
     -- WhichKey
-    WhichKey =          { fg = nord.accent , style = 'bold'},
-    WhichKeyGroup =     { fg = nord.text },
+    WhichKey =          { fg = nord.nord4_gui , style = 'bold'},
+    WhichKeyGroup =     { fg = nord.nord4_gui },
     WhichKeyDesc =      { fg = nord.nord7_gui, style = 'italic' },
-    WhichKeySeperator = { fg = nord.fg },
+    WhichKeySeperator = { fg = nord.nord4_gui },
     WhichKeyFloating =  { bg = nord.float },
     WhichKeyFloat =     { bg = nord.float },
 
     -- LspSaga
-    DiagnosticError =            { fg = nord.error },
+    DiagnosticError =            { fg = nord.nord11_gui },
     DiagnosticWarning =          { fg = nord.nord15_gui },
     DiagnosticInformation =      { fg = nord.nord10_gui },
     DiagnosticHint =             { fg = nord.nord9_gui },
-    DiagnosticTruncateLine =     { fg = nord.fg },
-    LspFloatWinNormal =          { bg = nord.contrast },
+    DiagnosticTruncateLine =     { fg = nord.nord4_gui },
+    LspFloatWinNormal =          { bg = nord.nord2_gui },
     LspFloatWinBorder =          { fg = nord.nord9_gui },
     LspSagaBorderTitle =         { fg = nord.nord8_gui },
     LspSagaHoverBorder =         { fg = nord.nord10_gui },
@@ -390,8 +389,8 @@ theme.loadPlugins = function()
     TargetWord =                 { fg = nord.nord8_gui },
 
         -- Sneak
-    Sneak =      { fg = nord.bg, bg = nord.accent },
-    SneakScope = { bg = nord.selection },
+    Sneak =      { fg = nord.nord0_gui, bg = nord.nord4_gui },
+    SneakScope = { bg = nord.nord1_gui },
 
     -- Indent Blankline
     IndentBlanklineChar =        { fg = nord.nord3_gui },
@@ -406,10 +405,10 @@ theme.loadPlugins = function()
     DapStopped =    { fg = nord.nord15_gui},
 
     -- Hop
-    HopNextKey =   { fg = nord.accent, style = 'bold' },
+    HopNextKey =   { fg = nord.nord4_gui, style = 'bold' },
     HopNextKey1 =  { fg = nord.nord8_gui, style = 'bold' },
-    HopNextKey2 =  { fg = nord.accent},
-    HopUnmatched = { fg = nord.comments },
+    HopNextKey2 =  { fg = nord.nord4_gui},
+    HopUnmatched = { fg = nord.nord3_gui },
 
     -- Fern
     FernBranchText = { fg = nord.nord3_gui_bright},
@@ -418,15 +417,15 @@ theme.loadPlugins = function()
 
   -- Disable nvim-tree background
   if vim.g.nord_disable_background then
-    plugins.NvimTreeNormal = { fg = nord.fg, bg = nord.none }
+    plugins.NvimTreeNormal = { fg = nord.nord4_gui, bg = nord.none }
   else
-    plugins.NvimTreeNormal = { fg = nord.fg, bg = nord.sidebar }
+    plugins.NvimTreeNormal = { fg = nord.nord4_gui, bg = nord.sidebar }
   end
 
   if vim.g.nord_enable_sidebar_background then
-    plugins.NvimTreeNormal = { fg = nord.fg, bg = nord.sidebar }
+    plugins.NvimTreeNormal = { fg = nord.nord4_gui, bg = nord.sidebar }
   else
-    plugins.NvimTreeNormal = { fg = nord.fg, bg = nord.none }
+    plugins.NvimTreeNormal = { fg = nord.nord4_gui, bg = nord.none }
   end
 
   return plugins