refactored code to use 16 colors only

diff --git a/LICENSE b/LICENSE
index d159169d1050894d3ea3b98e1c965c4058208fe1..1661cc72915ed7d028ec231c4a802310b79a2679 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -14,7 +14,7 @@ License is intended to guarantee your freedom to share and change free
 software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
+using it.  (Some other Free Software Foundation software is covenord11_gui by
 the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
@@ -48,7 +48,7 @@ that any problems introduced by others will not reflect on the original
 authors' reputations.
 
   Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
+patents.  We wish to avoid the danger that nord11_guiistributors of a free
 program will individually obtain patent licenses, in effect making the
 program proprietary.  To prevent this, we have made it clear that any
 patent must be licensed for everyone's free use or not licensed at all.
@@ -70,9 +70,9 @@ language.  (Hereinafter, translation is included without limitation in
 the term "modification".)  Each licensee is addressed as "you".
 
 Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
+covenord11_gui by this License; they are outside its scope.  The act of
 running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
+is covenord11_gui only if its contents constitute a work based on the
 Program (independent of having been made by running the Program).
 Whether that is true depends on what the Program does.
 
@@ -105,15 +105,15 @@ above, provided that you also meet all of these conditions:
     interactive use in the most ordinary way, to print or display an
     announcement including an appropriate copyright notice and a
     notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
+    a warranty) and that users may nord11_guiistribute the program under
     these conditions, and telling the user how to view a copy of this
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+    the Program is not requinord11_gui to print an announcement.)
 
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
+and can be reasonably considenord11_gui independent and separate works in
 themselves, then this License, and its terms, do not apply to those
 sections when you distribute them as separate works.  But when you
 distribute the same sections as part of a whole which is a work based
@@ -152,7 +152,7 @@ Sections 1 and 2 above provided that you also do one of the following:
     received the program in object code or executable form with such
     an offer, in accord with Subsection b above.)
 
-The source code for a work means the preferred form of the work for
+The source code for a work means the prefernord11_gui form of the work for
 making modifications to it.  For an executable work, complete source
 code means all the source code for all modules it contains, plus any
 associated interface definition files, plus the scripts used to
@@ -177,7 +177,7 @@ However, parties who have received copies, or rights, from you under
 this License will not have their licenses terminated so long as such
 parties remain in full compliance.
 
-  5. You are not required to accept this License, since you have not
+  5. You are not requinord11_gui to accept this License, since you have not
 signed it.  However, nothing else grants you permission to modify or
 distribute the Program or its derivative works.  These actions are
 prohibited by law if you do not accept this License.  Therefore, by
@@ -186,7 +186,7 @@ Program), you indicate your acceptance of this License to do so, and
 all its terms and conditions for copying, distributing or modifying
 the Program or works based on it.
 
-  6. Each time you redistribute the Program (or any work based on the
+  6. Each time you nord11_guiistribute the Program (or any work based on the
 Program), the recipient automatically receives a license from the
 original licensor to copy, distribute or modify the Program subject to
 these terms and conditions.  You may not impose any further
@@ -202,7 +202,7 @@ excuse you from the conditions of this License.  If you cannot
 distribute so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you
 may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
+license would not permit royalty-free nord11_guiistribution of the Program by
 all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Program.
@@ -267,12 +267,12 @@ TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 REPAIR OR CORRECTION.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+  12. IN NO EVENT UNLESS REQUInord11_gui BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+nord11_guiISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+TO LOSS OF DATA OR DATA BEING RENDEnord11_gui INACCURATE OR LOSSES SUSTAINED BY
 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
@@ -283,7 +283,7 @@ POSSIBILITY OF SUCH DAMAGES.
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
+free software which everyone can nord11_guiistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
@@ -293,7 +293,7 @@ the "copyright" line and a pointer to where the full notice is found.
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software; you can nord11_guiistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
@@ -314,7 +314,7 @@ when it starts in an interactive mode:
 
     Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
+    This is free software, and you are welcome to nord11_guiistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate

diff --git a/lua/lualine/themes/nord.lua b/lua/lualine/themes/nord.lua
index 23093e53b1a4c417e03f5e30c86bffd6b8e980a2..76902d98a0ac6ac5d891ab8ae6b0de1513bd3c0c 100644 (file)
--- a/lua/lualine/themes/nord.lua
+++ b/lua/lualine/themes/nord.lua
@@ -9,22 +9,22 @@ nord.normal = {
 }
 
 nord.insert = {
-       a = {fg = colors.bg, bg = colors.green, gui = 'bold'},
+       a = {fg = colors.bg, bg = colors.nord14_gui, gui = 'bold'},
        b = {fg = colors.title, bg = colors.active},
 }
 
 nord.visual = {
-       a = {fg = colors.bg, bg = colors.purple, gui = 'bold'},
+       a = {fg = colors.bg, bg = colors.nord9_gui, gui = 'bold'},
        b = {fg = colors.title, bg = colors.active},
 }
 
 nord.replace = {
-       a = {fg = colors.bg, bg = colors.red, gui = 'bold'},
+       a = {fg = colors.bg, bg = colors.nord11_gui, gui = 'bold'},
        b = {fg = colors.title, bg = colors.active},
 }
 
 nord.command = {
-       a = {fg = colors.bg, bg = colors.yellow, gui = 'bold'},
+       a = {fg = colors.bg, 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 a918520b4ae666900b0d2dab6a5248b67e58ba2d..14bffe4672a560967aa37e192afb6624f7aed8c4 100644 (file)
--- a/lua/nord/colors.lua
+++ b/lua/nord/colors.lua
@@ -1,18 +1,5 @@
 local nord = {
-
-       white =         '#ECEFF4',
-       gray =          '#cad2e1',
-       black =         '#3B4252',
-       red =           '#BF616A',
-       green =         '#A3BE8C',
-       yellow =        '#B48EAD',
-       paleblue =      '#5E81AC',
-       cyan =          '#88C0D0',
-       blue =          '#8FBCBB',
-       purple =        '#81A1C1',
-       orange =        '#D08770',
-       pink =          '#EBCB8B',
-
+    --16 colors
     nord0_gui = "#2E3440"        ,
     nord1_gui = "#3B4252"        ,
     nord2_gui = "#434C5E"        ,

diff --git a/lua/nord/theme.lua b/lua/nord/theme.lua
index 5367cd85727c543ba0c689fbfb1ce3e705ccb646..5fe387d482ae27f5edae04edd16b18bb3f3e3602 100644 (file)
--- a/lua/nord/theme.lua
+++ b/lua/nord/theme.lua
@@ -22,32 +22,32 @@ theme.loadSyntax = function ()
                PreProc =                                       { fg = nord.nord9_gui}, -- generic Preprocessor
                Include =                                       { fg = nord.nord9_gui}, -- preprocessor #include
                Define =                                        { fg = nord.nord9_gui}, -- preprocessor #define
-               Macro =                                         { fg = nord.cyan }, -- same as Define
-               Typedef =                                       { fg = nord.cyan }, -- A typedef
-               PreCondit =                                     { fg = nord.pink }, -- preprocessor #if, #else, #endif, etc.
+               Macro =                                         { fg = nord.nord8_gui }, -- same as Define
+               Typedef =                                       { fg = nord.nord8_gui }, -- A typedef
+               PreCondit =                                     { fg = nord.nord13_gui }, -- preprocessor #if, #else, #endif, etc.
                Special =                                       { fg = nord.nord4_gui}, -- any special symbol
                SpecialChar =                                   { fg = nord.nord13_gui}, -- special character in a constant
                Tag =                                           { fg = nord.nord4_gui}, -- you can use CTRL-] on this
                Delimiter =                                     { fg = nord.nord6_gui }, -- character that needs attention like , or .
                SpecialComment =                                { fg = nord.nord8_gui}, -- special things inside a comment
-               Debug =                                         { fg = nord.red }, -- debugging statements
+               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
                Todo =                                          { fg = nord.nord13_gui, bg = nord.none, style = 'bold,italic' }, -- anything that needs extra attention; mostly the keywords TODO FIXME and XXX
 
         htmlLink = { fg = nord.link, style = "underline" },
-        htmlH1 = { fg = nord.cyan, style = "bold" },
-        htmlH2 = { fg = nord.red, style = "bold" },
-        htmlH3 = { fg = nord.green, style = "bold" },
-        htmlH4 = { fg = nord.yellow, style = "bold" },
-        htmlH5 = { fg = nord.purple, style = "bold" },
-        markdownH1 = { fg = nord.cyan, style = "bold" },
-        markdownH2 = { fg = nord.red, style = "bold" },
-        markdownH3 = { fg = nord.green, style = "bold" },
-        markdownH1Delimiter = { fg = nord.cyan },
-        markdownH2Delimiter = { fg = nord.red },
-        markdownH3Delimiter = { fg = nord.green },
+        htmlH1 = { fg = nord.nord8_gui, style = "bold" },
+        htmlH2 = { fg = nord.nord11_gui, style = "bold" },
+        htmlH3 = { fg = nord.nord14_gui, style = "bold" },
+        htmlH4 = { fg = nord.nord15_gui, style = "bold" },
+        htmlH5 = { fg = nord.nord9_gui, style = "bold" },
+        markdownH1 = { fg = nord.nord8_gui, style = "bold" },
+        markdownH2 = { fg = nord.nord11_gui, style = "bold" },
+        markdownH3 = { fg = nord.nord14_gui, style = "bold" },
+        markdownH1Delimiter = { fg = nord.nord8_gui },
+        markdownH2Delimiter = { fg = nord.nord11_gui },
+        markdownH3Delimiter = { fg = nord.nord14_gui },
        }
 
        syntax.Comment =                {fg = nord.nord3_gui_bright}
@@ -71,19 +71,19 @@ theme.loadEditor = function ()
                Conceal =                               { fg = nord.disabled }, -- 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
-               Directory =                             { fg = nord.blue, bg = nord.none }, -- directory names (and other special names in listings)
-               DiffAdd =                               { fg = nord.green, bg = nord.none, style = 'reverse' }, -- diff mode: Added line
-               DiffChange =                    { fg = nord.orange, bg = nord.none, style = 'reverse' }, --  diff mode: Changed line
-               DiffDelete =                    { fg = nord.red, bg = nord.none, style = 'reverse' }, -- diff mode: Deleted line
-               DiffText =                              { fg = nord.yellow, bg = nord.none, style = 'reverse' }, -- diff mode: Changed text within a changed line
+               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 },
                ErrorMsg =                              { fg = nord.none },
                Folded =                                { fg = nord.disabled, nord.none, style = 'italic' },
-               FoldColumn =                    { fg = nord.blue },
+               FoldColumn =                    { fg = nord.nord7_gui },
                IncSearch =                             { fg = nord.none, bg = nord.nord4_gui, style = 'reverse' },
                LineNr =                                { fg = nord.line_numbers },
                CursorLineNr =                  { fg = nord.accent },
-               MatchParen =                    { fg = nord.yellow, bg = nord.none, style = 'bold' },
+               MatchParen =                    { fg = nord.nord15_gui, bg = nord.none, style = 'bold' },
                ModeMsg =                               { fg = nord.accent },
                MoreMsg =                               { fg = nord.accent },
                NonText =                               { fg = nord.disabled },
@@ -91,15 +91,15 @@ theme.loadEditor = function ()
                PmenuSel =                              { fg = nord.accent, bg = nord.active },
                PmenuSbar =                             { fg = nord.text, bg = nord.contrast },
                PmenuThumb =                    { fg = nord.fg, bg = nord.accent },
-               Question =                              { fg = nord.green },
-               QuickFixLine =                  { fg = nord.highlight, nord.white, style = 'reverse' },
-               qfLineNr =                              { fg = nord.highlight, nord.white, style = 'reverse' },
-               Search =                                { fg = nord.nord1_gui, bg = nord.white, style = 'reverse' },
-               SpecialKey =                    { fg = nord.purple },
-               SpellBad =                              { fg = nord.red, bg = nord.none, style = 'italic,undercurl' },
-               SpellCap =                              { fg = nord.blue, bg = nord.none, style = 'italic,undercurl' },
-               SpellLocal =                    { fg = nord.cyan, bg = nord.none, style = 'italic,undercurl' },
-               SpellRare =                             { fg = nord.purple, bg = nord.none, style = 'italic,undercurl' },
+               Question =                              { fg = nord.nord14_gui },
+               QuickFixLine =                  { fg = nord.highlight, nord.nord6_gui, style = 'reverse' },
+               qfLineNr =                              { fg = nord.highlight, 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 },
@@ -107,31 +107,31 @@ theme.loadEditor = function ()
                TabLineFill =                   { fg = nord.fg },
                TablineSel =                    { fg = nord.accent, bg = nord.bg },
                Tabline =                               { fg = nord.fg },
-               Title =                                 { fg = nord.green, bg = nord.none, style = 'bold' },
+               Title =                                 { fg = nord.nord14_gui, bg = nord.none, style = 'bold' },
                Visual =                                { fg = nord.none, bg = nord.selection },
                VisualNOS =                             { fg = nord.none, bg = nord.selection },
-               WarningMsg =                    { fg = nord.yellow },
-               WildMenu =                              { fg = nord.orange, bg = nord.none, style = 'bold' },
+               WarningMsg =                    { fg = nord.nord15_gui },
+               WildMenu =                              { fg = nord.nord12_gui, bg = nord.none, style = 'bold' },
                CursorColumn =                  { fg = nord.none, bg = nord.active },
                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' },
-               InsertMode =                    { fg = nord.green, bg = nord.none, style = 'reverse' },
-               ReplacelMode =                  { fg = nord.red, bg = nord.none, style = 'reverse' },
-               VisualMode =                    { fg = nord.purple, 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' },
-               Warnings =                              { fg = nord.yellow },
+               Warnings =                              { fg = nord.nord15_gui },
 
         healthError =           { fg = nord.error },
-        healthSuccess =         { fg = nord.green },
-        healthWarning =         { fg = nord.yellow },
+        healthSuccess =         { fg = nord.nord14_gui },
+        healthWarning =         { fg = nord.nord15_gui },
 
         -- dashboard
-        DashboardShortCut =                     { fg = nord.blue },
-        DashboardHeader =                       { fg = nord.purple },
-        DashboardCenter =                       { fg = nord.cyan },
-        DashboardFooter =                       { fg = nord.green, style = "italic" },
+        DashboardShortCut =                     { fg = nord.nord7_gui },
+        DashboardHeader =                       { fg = nord.nord9_gui },
+        DashboardCenter =                       { fg = nord.nord8_gui },
+        DashboardFooter =                       { fg = nord.nord14_gui, style = "italic" },
 
        }
 
@@ -158,22 +158,22 @@ end
 
 theme.loadTerminal = function ()
 
-       vim.g.terminal_color_0 = nord.black
-       vim.g.terminal_color_1 = nord.red
-       vim.g.terminal_color_2 = nord.green
-       vim.g.terminal_color_3 = nord.yellow
-       vim.g.terminal_color_4 = nord.blue
-       vim.g.terminal_color_5 = nord.purple
-       vim.g.terminal_color_6 = nord.cyan
-       vim.g.terminal_color_7 = nord.white
+       vim.g.terminal_color_0 = nord.nord1_gui
+       vim.g.terminal_color_1 = nord.nord11_gui
+       vim.g.terminal_color_2 = nord.nord14_gui
+       vim.g.terminal_color_3 = nord.nord15_gui
+       vim.g.terminal_color_4 = nord.nord7_gui
+       vim.g.terminal_color_5 = nord.nord9_gui
+       vim.g.terminal_color_6 = nord.nord8_gui
+       vim.g.terminal_color_7 = nord.nord6_gui
        vim.g.terminal_color_8 = nord.gray
-       vim.g.terminal_color_9 = nord.red
-       vim.g.terminal_color_10 = nord.green
-       vim.g.terminal_color_11 = nord.yellow
-       vim.g.terminal_color_12 = nord.blue
-       vim.g.terminal_color_13 = nord.purple
-       vim.g.terminal_color_14 = nord.cyan
-       vim.g.terminal_color_15 = nord.white
+       vim.g.terminal_color_9 = nord.nord11_gui
+       vim.g.terminal_color_10 = nord.nord14_gui
+       vim.g.terminal_color_11 = nord.nord15_gui
+       vim.g.terminal_color_12 = nord.nord7_gui
+       vim.g.terminal_color_13 = nord.nord9_gui
+       vim.g.terminal_color_14 = nord.nord8_gui
+       vim.g.terminal_color_15 = nord.nord6_gui
 
 end
 
@@ -181,66 +181,66 @@ theme.loadTreeSitter = function ()
     -- TreeSitter highlight groups
 
     local treesitter = {
-        TSAnnotation =              { fg = nord.orange },    -- For C++/Dart attributes, annotations thatcan be attached to the code to denote some kind of meta information.
+        TSAnnotation =              { fg = nord.nord12_gui },    -- For C++/Dart attributes, annotations thatcan be attached to the code to denote some kind of meta information.
         TSCharacter=                { fg = nord.nord14_gui },    -- For characters.
-        TSConstructor =             { fg = nord.purple }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
-        TSConstant =                { fg = nord.pink },    -- For constants
+        TSConstructor =             { fg = nord.nord9_gui }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
+        TSConstant =                { fg = nord.nord13_gui },    -- For constants
         TSFloat =                   { fg = nord.nord15_gui },    -- For floats
         TSNumber =                  { fg = nord.nord15_gui },    -- For all number
         TSString =                  { fg = nord.nord14_gui },    -- For strings.
 
-       --TSAnnotation =              { fg = nord.red },    -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information.
-        TSAttribute =               { fg = nord.yellow },    -- (unstable) TODO: docs
+       --TSAnnotation =              { fg = nord.nord11_gui },    -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information.
+        TSAttribute =               { fg = nord.nord15_gui },    -- (unstable) TODO: docs
         TSBoolean=                  { fg = nord.nord9_gui },    -- For booleans.
-        --TSCharacter=                { fg = nord.orange },    -- For characters.
-        --TSConstructor =             { fg = nord.purple }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
-        --TSConstant =                { fg = nord.yellow },    -- For constants
-        TSConstBuiltin =            { fg = nord.blue },    -- For constant that are built in the language: `nil` in Lua.
-        TSConstMacro =              { fg = nord.blue },    -- For constants that are defined by macros: `NULL` in C.
+        --TSCharacter=                { fg = nord.nord12_gui },    -- For characters.
+        --TSConstructor =             { fg = nord.nord9_gui }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
+        --TSConstant =                { fg = nord.nord15_gui },    -- For constants
+        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.
-        TSException =               { fg = nord.yellow },    -- For exception related keywords.
+        TSException =               { fg = nord.nord15_gui },    -- For exception related keywords.
         TSField =                   { fg = nord.gray }, -- For fields.
-        --TSFloat =                   { fg = nord.red },    -- For floats.
-        TSFuncMacro =               { fg = nord.blue },    -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust.
+        --TSFloat =                   { fg = nord.nord11_gui },    -- For floats.
+        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.
         TSNamespace =               { fg = nord.nord4_gui},    -- For identifiers referring to modules and namespaces.
         --TSNone =                    { },    -- TODO: docs
-        --TSNumber =                  { fg = nord.orange },    -- For all numbers
+        --TSNumber =                  { fg = nord.nord12_gui },    -- For all numbers
         TSOperator =                { fg = nord.nord9_gui }, -- For any operator: `+`, but also `->` and `*` in C.
-        TSParameter =               { fg = nord.paleblue }, -- For parameters of a function.
-        TSParameterReference=       { fg = nord.paleblue },    -- For references to parameters of a function.
-        TSProperty =                { fg = nord.paleblue }, -- Same as `TSField`.
-        TSPunctDelimiter =          { fg = nord.cyan }, -- For delimiters ie: `.`
-        TSPunctBracket =            { fg = nord.cyan }, -- For brackets and parens.
-        TSPunctSpecial =            { fg = nord.cyan }, -- For special punctutation that does not fall in the catagories before.
-        --TSString =                  { fg = nord.green },    -- For strings.
-        TSStringRegex =             { fg = nord.blue }, -- For regexes.
+        TSParameter =               { fg = nord.nord10_gui }, -- For parameters of a function.
+        TSParameterReference=       { fg = nord.nord10_gui },    -- For references to parameters of a function.
+        TSProperty =                { fg = nord.nord10_gui }, -- Same as `TSField`.
+        TSPunctDelimiter =          { fg = nord.nord8_gui }, -- For delimiters ie: `.`
+        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.
+        --TSString =                  { fg = nord.nord14_gui },    -- For strings.
+        TSStringRegex =             { fg = nord.nord7_gui }, -- For regexes.
         TSStringEscape =            { fg = nord.disabled }, -- For escape characters within a string.
-        TSSymbol =                  { fg = nord.yellow },    -- For identifiers referring to symbols or atoms.
+        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.yellow },    -- Tag delimiter like `<` `>` `/`
-        TSText =                    { fg = nord.text },    -- For strings considered text in a markup language.
-        TSTextReference =           { fg = nord.yellow }, -- FIXME
-        TSEmphasis =                { fg = nord.paleblue },    -- For text to be represented with emphasis.
+        TSTagDelimiter =            { fg = nord.nord15_gui },    -- Tag delimiter like `<` `>` `/`
+        TSText =                    { fg = nord.text },    -- 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.
-        TSTitle =                   { fg = nord.paleblue, bg = nord.none, style = 'bold' },    -- Text that is part of a title.
+        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.red },    -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information.
+        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.
 
     }
 
     treesitter.TSComment=                  { fg = nord.nord3_gui_bright }
     treesitter.TSConditional =             { fg = nord.nord9_gui }   -- For keywords related to conditionnals.
-    treesitter.TSKeyword =                 { fg = nord.purple } -- For keywords that don't fall in previous categories.
-    treesitter.TSRepeat =                  { fg = nord.purple }    -- For keywords related to loops.
+    treesitter.TSKeyword =                 { fg = nord.nord9_gui } -- For keywords that don't fall in previous categories.
+    treesitter.TSRepeat =                  { fg = nord.nord9_gui }    -- For keywords related to loops.
     treesitter.TSKeywordFunction =         { fg = nord.nord8_gui }
     treesitter.TSFunction =                { fg = nord.nord8_gui }    -- For fuction (calls and definitions).
-    treesitter.TSMethod =                  { fg = nord.blue }    -- For method calls and definitions.
-    treesitter.TSFuncBuiltin =             { fg = nord.cyan }
+    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 }
 
@@ -257,21 +257,21 @@ theme.loadLSP = function ()
         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.
-        LspDiagnosticsDefaultWarning =          { fg = nord.yellow}, -- used for "Warning" diagnostic signs in sign column
-        LspDiagnosticsSignWarning =             { fg = nord.yellow}, -- used for "Warning" diagnostic signs in sign column
-        LspDiagnosticsFloatingWarning =         { fg = nord.yellow}, -- used for "Warning" diagnostic messages in the diagnostics float
-        LspDiagnosticsVirtualTextWarning =      { fg = nord.yellow}, -- Virtual text "Warning"
-        LspDiagnosticsUnderlineWarning =        { style = 'undercurl', sp = nord.yellow }, -- used to underline "Warning" diagnostics.
-        LspDiagnosticsDefaultInformation =      { fg = nord.paleblue }, -- used for "Information" diagnostic virtual text
-        LspDiagnosticsSignInformation =         { fg = nord.paleblue },  -- used for "Information" diagnostic signs in sign column
-        LspDiagnosticsFloatingInformation =     { fg = nord.paleblue }, -- used for "Information" diagnostic messages in the diagnostics float
-        LspDiagnosticsVirtualTextInformation =  { fg = nord.paleblue }, -- Virtual text "Information"
-        LspDiagnosticsUnderlineInformation =    { style = 'undercurl', sp = nord.paleblue }, -- used to underline "Information" diagnostics.
-        LspDiagnosticsDefaultHint =             { fg = nord.purple  },  -- used for "Hint" diagnostic virtual text
-        LspDiagnosticsSignHint =                { fg = nord.purple  }, -- used for "Hint" diagnostic signs in sign column
-        LspDiagnosticsFloatingHint =            { fg = nord.purple  }, -- used for "Hint" diagnostic messages in the diagnostics float
-        LspDiagnosticsVirtualTextHint =         { fg = nord.purple  }, -- Virtual text "Hint"
-        LspDiagnosticsUnderlineHint =           { style = 'undercurl', sp = nord.paleblue }, -- used to underline "Hint" 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
+        LspDiagnosticsVirtualTextWarning =      { fg = nord.nord15_gui}, -- Virtual text "Warning"
+        LspDiagnosticsUnderlineWarning =        { style = 'undercurl', sp = nord.nord15_gui }, -- used to underline "Warning" diagnostics.
+        LspDiagnosticsDefaultInformation =      { fg = nord.nord10_gui }, -- used for "Information" diagnostic virtual text
+        LspDiagnosticsSignInformation =         { fg = nord.nord10_gui },  -- used for "Information" diagnostic signs in sign column
+        LspDiagnosticsFloatingInformation =     { fg = nord.nord10_gui }, -- used for "Information" diagnostic messages in the diagnostics float
+        LspDiagnosticsVirtualTextInformation =  { fg = nord.nord10_gui }, -- Virtual text "Information"
+        LspDiagnosticsUnderlineInformation =    { style = 'undercurl', sp = nord.nord10_gui }, -- used to underline "Information" diagnostics.
+        LspDiagnosticsDefaultHint =             { fg = nord.nord9_gui  },  -- used for "Hint" diagnostic virtual text
+        LspDiagnosticsSignHint =                { fg = nord.nord9_gui  }, -- used for "Hint" diagnostic signs in sign column
+        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
@@ -288,99 +288,99 @@ theme.loadPlugins = function()
 
         -- LspTrouble
         LspTroubleText =                        { fg = nord.text },
-        LspTroubleCount =                       { fg = nord.purple, bg = nord.active },
+        LspTroubleCount =                       { fg = nord.nord9_gui, bg = nord.active },
         LspTroubleNormal =                      { fg = nord.fg, bg = nord.sidebar },
 
         -- Diff
-        diffAdded =                             { fg = nord.green },
-        diffRemoved =                           { fg = nord.red },
-        diffChanged =                           { fg = nord.yellow },
+        diffAdded =                             { fg = nord.nord14_gui },
+        diffRemoved =                           { fg = nord.nord11_gui },
+        diffChanged =                           { fg = nord.nord15_gui },
         diffOldFile =                           { fg = nord.yelow },
-        diffNewFile =                           { fg = nord.orange },
-        diffFile =                              { fg = nord.blue },
+        diffNewFile =                           { fg = nord.nord12_gui },
+        diffFile =                              { fg = nord.nord7_gui },
         diffLine =                              { fg = nord.comments },
-        diffIndexLine =                         { fg = nord.purple },
+        diffIndexLine =                         { fg = nord.nord9_gui },
 
         -- Neogit
-        NeogitBranch =                          { fg = nord.paleblue },
-        NeogitRemote =                          { fg = nord.purple },
+        NeogitBranch =                          { fg = nord.nord10_gui },
+        NeogitRemote =                          { fg = nord.nord9_gui },
         NeogitHunkHeader =                      { fg = nord.fg, bg = nord.highlight },
-        NeogitHunkHeaderHighlight =             { fg = nord.blue, bg = nord.contrast },
+        NeogitHunkHeaderHighlight =             { fg = nord.nord7_gui, bg = nord.contrast },
         NeogitDiffContextHighlight =            { fg = nord.bg_alt, bg = nord.contrast },
-        NeogitDiffDeleteHighlight =             { fg = nord.red },
-        NeogitDiffAddHighlight =                { fg = nord.green },
+        NeogitDiffDeleteHighlight =             { fg = nord.nord11_gui },
+        NeogitDiffAddHighlight =                { fg = nord.nord14_gui },
 
         -- GitGutter
-        GitGutterAdd =                          { fg = nord.green }, -- diff mode: Added line |diff.txt|
-        GitGutterChange =                       { fg = nord.yellow }, -- diff mode: Changed line |diff.txt|
-        GitGutterDelete =                       { fg = nord.red }, -- diff mode: Deleted line |diff.txt|
+        GitGutterAdd =                          { fg = nord.nord14_gui }, -- diff mode: Added line |diff.txt|
+        GitGutterChange =                       { fg = nord.nord15_gui }, -- diff mode: Changed line |diff.txt|
+        GitGutterDelete =                       { fg = nord.nord11_gui }, -- diff mode: Deleted line |diff.txt|
 
         -- GitSigns
-        GitSignsAdd =                           { fg = nord.green }, -- diff mode: Added line |diff.txt|
-        GitSignsAddNr =                         { fg = nord.green }, -- diff mode: Added line |diff.txt|
-        GitSignsAddLn =                         { fg = nord.green }, -- diff mode: Added line |diff.txt|
-        GitSignsChange =                        { fg = nord.yellow }, -- diff mode: Changed line |diff.txt|
-        GitSignsChangeNr =                      { fg = nord.yellow }, -- diff mode: Changed line |diff.txt|
-        GitSignsChangeLn =                      { fg = nord.yellow }, -- diff mode: Changed line |diff.txt|
-        GitSignsDelete =                        { fg = nord.red }, -- diff mode: Deleted line |diff.txt|
-        GitSignsDeleteNr =                      { fg = nord.red }, -- diff mode: Deleted line |diff.txt|
-        GitSignsDeleteLn =                      { fg = nord.red }, -- diff mode: Deleted line |diff.txt|
+        GitSignsAdd =                           { fg = nord.nord14_gui }, -- diff mode: Added line |diff.txt|
+        GitSignsAddNr =                         { fg = nord.nord14_gui }, -- diff mode: Added line |diff.txt|
+        GitSignsAddLn =                         { fg = nord.nord14_gui }, -- diff mode: Added line |diff.txt|
+        GitSignsChange =                        { fg = nord.nord15_gui }, -- diff mode: Changed line |diff.txt|
+        GitSignsChangeNr =                      { fg = nord.nord15_gui }, -- diff mode: Changed line |diff.txt|
+        GitSignsChangeLn =                      { fg = nord.nord15_gui }, -- diff mode: Changed line |diff.txt|
+        GitSignsDelete =                        { fg = nord.nord11_gui }, -- diff mode: Deleted line |diff.txt|
+        GitSignsDeleteNr =                      { fg = nord.nord11_gui }, -- diff mode: Deleted line |diff.txt|
+        GitSignsDeleteLn =                      { fg = nord.nord11_gui }, -- diff mode: Deleted line |diff.txt|
 
         -- Telescope
-        TelescopePromptBorder =                 { fg = nord.cyan },
-        TelescopeResultsBorder =                { fg = nord.purple },
-        TelescopePreviewBorder =                { fg = nord.green },
-        TelescopeSelectionCaret =               { fg = nord.purple },
-        TelescopeSelection =                    { fg = nord.purple },
-        TelescopeMatching =                     { fg = nord.cyan },
+        TelescopePromptBorder =                 { fg = nord.nord8_gui },
+        TelescopeResultsBorder =                { fg = nord.nord9_gui },
+        TelescopePreviewBorder =                { fg = nord.nord14_gui },
+        TelescopeSelectionCaret =               { fg = nord.nord9_gui },
+        TelescopeSelection =                    { fg = nord.nord9_gui },
+        TelescopeMatching =                     { fg = nord.nord8_gui },
         TelescopeNormal =                       { fg = nord.fg, bg = nord.float },
 
         -- NvimTree
-        NvimTreeRootFolder =                    { fg = nord.blue, style = "bold" },
-        NvimTreeGitDirty =                      { fg = nord.yellow },
-        NvimTreeGitNew =                        { fg = nord.green },
-        NvimTreeImageFile =                     { fg = nord.yellow },
-        NvimTreeExecFile =                      { fg = nord.green },
-        NvimTreeSpecialFile =                   { fg = nord.purple , style = "underline" },
-        NvimTreeFolderName=                     { fg = nord.paleblue },
+        NvimTreeRootFolder =                    { fg = nord.nord7_gui, style = "bold" },
+        NvimTreeGitDirty =                      { fg = nord.nord15_gui },
+        NvimTreeGitNew =                        { fg = nord.nord14_gui },
+        NvimTreeImageFile =                     { fg = nord.nord15_gui },
+        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 },
-        LspDiagnosticsWarning =                 { fg = nord.yellow },
-        LspDiagnosticsInformation =             { fg = nord.paleblue },
-        LspDiagnosticsHint =                    { fg = nord.purple },
+        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 },
-        WhichKeyDesc =                          { fg = nord.blue, style = 'italic' },
+        WhichKeyDesc =                          { fg = nord.nord7_gui, style = 'italic' },
         WhichKeySeperator =                     { fg = nord.fg },
         WhichKeyFloating =                      { bg = nord.float },
         WhichKeyFloat =                         { bg = nord.float },
 
         -- LspSaga
         DiagnosticError =                       { fg = nord.error },
-        DiagnosticWarning =                     { fg = nord.yellow },
-        DiagnosticInformation =                 { fg = nord.paleblue },
-        DiagnosticHint =                        { fg = nord.purple },
+        DiagnosticWarning =                     { fg = nord.nord15_gui },
+        DiagnosticInformation =                 { fg = nord.nord10_gui },
+        DiagnosticHint =                        { fg = nord.nord9_gui },
         DiagnosticTruncateLine =                { fg = nord.fg },
         LspFloatWinNormal =                     { bg = nord.contrast },
-        LspFloatWinBorder =                     { fg = nord.purple },
-        LspSagaBorderTitle =                    { fg = nord.cyan },
-        LspSagaHoverBorder =                    { fg = nord.paleblue },
-        LspSagaRenameBorder =                   { fg = nord.green },
-        LspSagaDefPreviewBorder =               { fg = nord.green },
-        LspSagaCodeActionBorder =               { fg = nord.blue },
-        LspSagaFinderSelection =                { fg = nord.green },
-        LspSagaCodeActionTitle =                { fg = nord.paleblue },
-        LspSagaCodeActionContent =              { fg = nord.purple },
-        LspSagaSignatureHelpBorder =            { fg = nord.pink },
-        ReferencesCount =                       { fg = nord.purple },
-        DefinitionCount =                       { fg = nord.purple },
-        DefinitionIcon =                        { fg = nord.blue },
-        ReferencesIcon =                        { fg = nord.blue },
-        TargetWord =                            { fg = nord.cyan },
+        LspFloatWinBorder =                     { fg = nord.nord9_gui },
+        LspSagaBorderTitle =                    { fg = nord.nord8_gui },
+        LspSagaHoverBorder =                    { fg = nord.nord10_gui },
+        LspSagaRenameBorder =                   { fg = nord.nord14_gui },
+        LspSagaDefPreviewBorder =               { fg = nord.nord14_gui },
+        LspSagaCodeActionBorder =               { fg = nord.nord7_gui },
+        LspSagaFinderSelection =                { fg = nord.nord14_gui },
+        LspSagaCodeActionTitle =                { fg = nord.nord10_gui },
+        LspSagaCodeActionContent =              { fg = nord.nord9_gui },
+        LspSagaSignatureHelpBorder =            { fg = nord.nord13_gui },
+        ReferencesCount =                       { fg = nord.nord9_gui },
+        DefinitionCount =                       { fg = nord.nord9_gui },
+        DefinitionIcon =                        { fg = nord.nord7_gui },
+        ReferencesIcon =                        { fg = nord.nord7_gui },
+        TargetWord =                            { fg = nord.nord8_gui },
 
         -- BufferLine
         BufferLineIndicatorSelected =           { fg = nord.bg },