diff --git a/README.md b/README.md
index f948caf..659d2f9 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # gruber-darker.nvim
 
-_A Neovim port of a deftheme [adaptation][gruber-darker] of an Emacs [port][gruber-darker]
-of a BBEdit [colorscheme][gruber-dark]_
+_A modern Neovim port of a deftheme [adaptation][gruber-darker] of an Emacs
+[port][gruber-darker] of a BBEdit [colorscheme][gruber-dark]_
 
 ## Installation
 
@@ -11,13 +11,28 @@ of a BBEdit [colorscheme][gruber-dark]_
 use {
   "blazkowolf/gruber-darker.nvim",
   config = function()
-    require("gruber-darker").setup({
-      -- possible config values here...
-    })
+    require("gruber-darker").setup()
   end
 }
 ```
 
+Then, somewhere in your `init.lua`, set the colorscheme like this
+
+```lua
+vim.cmd.colorscheme("GruberDarker")
+```
+
+## Special thanks
+
+These repositories were great knowledge sources and helped
+immensely with the development of this plugin.
+
+- [rexim/gruber-darker-theme][gruber-darker-theme]
+- [folke/tokyonight.nvim][tokyonight]
+- [drsooch/gruber-darker-vim][gruber-darker-theme]
+
 [gruber-darker-theme]: https://github.com/rexim/gruber-darker-theme
 [gruber-darker]: https://jblevins.org/projects/emacs-color-themes/gruber-darker-theme.el.html
 [gruber-dark]: http://daringfireball.net/projects/bbcolors/schemes/
+[tokyonight]: https://github.com/folke/tokyonight.nvim
+[gruber-darker-vim]: https://github.com/drsooch/gruber-darker-vim
diff --git a/lua/gruber-darker/init.lua b/lua/gruber-darker/init.lua
index 27d0b4a..7494e09 100644
--- a/lua/gruber-darker/init.lua
+++ b/lua/gruber-darker/init.lua
@@ -5,67 +5,67 @@ local M = {}
 -- Highlights {{{
 local highlights = {
   Comment = { fg = c.default.brown }, -- any comment
-  -- ColorColumn = { bg = c.black }, -- used for the columns set with 'colorcolumn'
-  -- Conceal = { fg = c.dark5 }, -- placeholder characters substituted for concealed text (see 'conceallevel')
-  Cursor = { fg = c.default.none, bg = c.default.yellow }, -- character under the cursor
+  ColorColumn = { bg = c.default["bg+2"] }, -- used for the columns set with 'colorcolumn'
+  Conceal = { fg = c.default.fg, bg = c.default.bg }, -- placeholder characters substituted for concealed text (see 'conceallevel')
+  Cursor = { bg = c.default.yellow }, -- character under the cursor
   lCursor = { fg = c.default.none, bg = c.default.yellow }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
   CursorIM = { fg = c.default.none, bg = c.default.yellow }, -- like Cursor, but used when in IME mode |CursorIM|
-  CursorColumn = { fg = c.default.none, bg = c.default["bg+1"] }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
-  CursorLine = { fg = c.default.none, bg = c.default["bg+1"] }, -- Screen-line at the cursor, when 'cursorline' is set.  Low-priority if foreground (ctermfg OR guifg) is not set.
-  -- Directory = { fg = c.blue }, -- directory names (and other special names in listings)
+  CursorColumn = { bg = c.default["bg+2"] }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
+  CursorLine = { bg = c.default["bg+1"] }, -- Screen-line at the cursor, when 'cursorline' is set.  Low-priority if foreground (ctermfg OR guifg) is not set.
+  -- Directory = { fg = c.default.lightblue }, -- directory names (and other special names in listings)
   DiffAdd = { fg = c.default.green, bg = c.default.none }, -- diff mode: Added line |diff.txt|
   -- DiffChange = { bg = c.diff.change }, -- diff mode: Changed line |diff.txt|
   DiffDelete = { fg = c.default["red+1"], bg = c.default.none }, -- diff mode: Deleted line |diff.txt|
   -- DiffText = { bg = c.diff.text }, -- diff mode: Changed text within a changed line |diff.txt|
-  EndOfBuffer = { fg = c.default.none }, -- filler lines (~) after the end of the buffer.  By default, this is highlighted like |hl-NonText|.
+  EndOfBuffer = { fg = c.default.fg, bg = c.default.bg }, -- filler lines (~) after the end of the buffer.  By default, this is highlighted like |hl-NonText|.
   -- TermCursor  = { }, -- cursor in a focused terminal
   -- TermCursorNC= { }, -- cursor in an unfocused terminal
-  ErrorMsg = { fg = c.default.red }, -- error messages on the command line
-  VertSplit = { fg = c.default["bg+2"] }, -- the column separating vertically split windows
+  ErrorMsg = { fg = c.default.white, bg = c.default.red }, -- error messages on the command line
+  VertSplit = { fg = c.default["fg+2"], bg = c.default["bg+1"] }, -- the column separating vertically split windows
   WinSeparator = { fg = c.default["bg+2"], bold = true }, -- the column separating vertically split windows
-  -- Folded = { fg = c.blue, bg = c.fg_gutter }, -- line used for closed folds
-  -- FoldColumn = { bg = options.transparent and c.none or c.bg, fg = c.comment }, -- 'foldcolumn'
+  Folded = { fg = c.default.brown, bg = c.default["fg+2"], italic = true }, -- line used for closed folds
+  FoldColumn = { fg = c.default.brown, bg = c.default["fg+2"] }, -- 'foldcolumn'
   SignColumn = { fg = c.default["bg+2"], bg = c.default.none }, -- column where |signs| are displayed
   -- SignColumnSB = { bg = c.bg_sidebar, fg = c.fg_gutter }, -- column where |signs| are displayed
   -- Substitute = { bg = c.red, fg = c.black }, -- |:substitute| replacement text highlighting
   LineNr = { fg = c.default["bg+4"] }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
   CursorLineNr = { fg = c.default.yellow }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
-  MatchParen = { bg = c.default["bg+4"] }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt|
-  -- ModeMsg = { fg = c.fg_dark, bold = true }, -- 'showmode' message (e.g., "-- INSERT -- ")
+  MatchParen = { fg = c.default["bg+2"], bg = c.default.yellow }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt|
+  ModeMsg = { fg = c.default["fg+2"] }, -- 'showmode' message (e.g., "-- INSERT -- ")
   -- MsgArea = { fg = c.fg_dark }, -- Area for messages and cmdline
   -- MsgSeparator= { }, -- Separator for scrolled messages, `msgsep` flag of 'display'
-  -- MoreMsg = { fg = c.blue }, -- |more-prompt|
-  -- NonText = { fg = c.dark3 }, -- '@' 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). See also |hl-EndOfBuffer|.
+  MoreMsg = { fg = c.default["fg+2"] }, -- |more-prompt|
+  NonText = { fg = c.default["fg+2"] }, -- '@' 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). See also |hl-EndOfBuffer|.
   Normal = { fg = c.default.fg, bg = c.default.bg }, -- normal text
   NormalNC = { fg = c.default.fg, bg = c.default.bg }, -- normal text in non-current windows
   NormalSB = { fg = c.default.fg, bg = c.default.bg }, -- normal text in sidebar
   NormalFloat = { fg = c.default.fg, bg = c.default.bg }, -- Normal text in floating windows.
   FloatBorder = { fg = c.default["bg+2"], bg = c.default["bg-1"] },
-  -- Pmenu = { bg = c.bg_popup, fg = c.fg }, -- Popup menu: normal item.
-  -- PmenuSel = { bg = util.darken(c.fg_gutter, 0.8) }, -- Popup menu: selected item.
-  -- PmenuSbar = { bg = util.lighten(c.bg_popup, 0.95) }, -- Popup menu: scrollbar.
-  -- PmenuThumb = { bg = c.fg_gutter }, -- Popup menu: Thumb of the scrollbar.
+  Pmenu = { fg = c.default.fg, bg = c.default["bg+1"] }, -- Popup menu: normal item.
+  PmenuSel = { fg = c.default.fg, bg = c.default["bg+2"] }, -- Popup menu: selected item.
+  PmenuSbar = { bg = c.default.bg }, -- Popup menu: scrollbar.
+  PmenuThumb = { bg = c.default.bg }, -- Popup menu: Thumb of the scrollbar.
   Question = { fg = c.default.niagara }, -- |hit-enter| prompt and yes/no questions
   -- QuickFixLine = { bg = c.bg_visual, bold = true }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there.
-  -- Search = { bg = c.bg_search, fg = c.fg }, -- Last search pattern highlighting (see 'hlsearch').  Also used for similar items that need to stand out.
-  -- IncSearch = { bg = c.orange, fg = c.black }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c"
-  -- CurSearch = { link = "IncSearch" },
-  -- SpecialKey = { fg = c.dark3 }, -- Unprintable characters: text displayed differently from what it really is.  But not 'listchars' whitespace. |hl-Whitespace|
-  -- SpellBad = { sp = c.error, undercurl = true }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise.
-  -- SpellCap = { sp = c.warning, undercurl = true }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise.
-  -- SpellLocal = { sp = c.info, undercurl = true }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise.
-  -- SpellRare = { sp = c.hint, undercurl = true }, -- Word that is recognized by the spellchecker as one that is hardly ever used.  |spell| Combined with the highlighting used otherwise.
+  Search = { fg = c.default.black, bg = c.default.yellow }, -- Last search pattern highlighting (see 'hlsearch').  Also used for similar items that need to stand out.
+  IncSearch = { fg = c.default.black, bg = c.default["fg+2"] }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c"
+  CurSearch = { link = "IncSearch" },
+  SpecialKey = { fg = c.default["fg+2"] }, -- Unprintable characters: text displayed differently from what it really is.  But not 'listchars' whitespace. |hl-Whitespace|
+  SpellBad = { undercurl = true }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise.
+  SpellCap = { undercurl = true }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise.
+  SpellLocal = { undercurl = true }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise.
+  SpellRare = { undercurl = true }, -- Word that is recognized by the spellchecker as one that is hardly ever used.  |spell| Combined with the highlighting used otherwise.
   StatusLine = { fg = c.default.white, bg = c.default["bg+1"] }, -- status line of current window
   StatusLineNC = { fg = c.default.quartz, bg = c.default["bg+1"] }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window.
   TabLine = { bg = c.default.none }, -- tab pages line, not active tab page label
   TabLineFill = { fg = c.default["bg+4"], bg = c.default["bg+1"] }, -- tab pages line, where there are no labels
   TabLineSel = { fg = c.default.yellow, bg = c.default.none, bold = true }, -- tab pages line, active tab page label
-  -- Title = { fg = c.blue, bold = true }, -- titles for output from ":set all", ":autocmd" etc.
-  -- Visual = { bg = c.bg_visual }, -- Visual mode selection
-  -- VisualNOS = { bg = c.bg_visual }, -- Visual mode selection when vim is "Not Owning the Selection".
+  Title = { fg = c.default.quartz }, -- titles for output from ":set all", ":autocmd" etc.
+  Visual = { bg = c.default["bg+2"] }, -- Visual mode selection
+  VisualNOS = { fg = c.default.red }, -- Visual mode selection when vim is "Not Owning the Selection".
   WarningMsg = { fg = c.default.red }, -- warning messages
-  Whitespace = { fg = c.default.black, bg = c.default.red }, -- "nbsp", "space", "tab" and "trail" in 'listchars'
-  -- WildMenu = { bg = c.bg_visual }, -- current match in 'wildmenu' completion
+  -- Whitespace = { fg = c.default.black, bg = c.default.red }, -- "nbsp", "space", "tab" and "trail" in 'listchars'
+  WildMenu = { fg = c.default.black, bg = c.default.yellow }, -- current match in 'wildmenu' completion
 
   -- These groups are not listed as default vim groups,
   -- but they are defacto standard group names for syntax highlighting.
@@ -107,7 +107,7 @@ local highlights = {
   -- Tag           = { }, --    you can use CTRL-] on this
   -- Delimiter     = { }, --  character that needs attention
   -- SpecialComment= { }, -- special things inside a comment
-  -- Debug         = { }, --    debugging statements
+  -- Debug = { fg = c.default["fg+2"] }, --    debugging statements
 
   Underlined = { underline = true }, -- (preferred) text that stands out, HTML links
   Bold = { bold = true },
@@ -117,7 +117,82 @@ local highlights = {
   -- Ignore = { }, -- (preferred) left blank, hidden  |hl-Ignore|
 
   -- Error = { fg = c.error }, -- (preferred) any erroneous construct
-  -- Todo = { bg = c.yellow, fg = c.bg }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
+  Todo = { fg = c.default.bg, bg = c.default.yellow }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
+
+  markdownHeadingDelimiter = { fg = c.default.niagara, bold = true },
+  markdownCode = { fg = c.default.green },
+  markdownCodeBlock = { fg = c.default.green },
+  -- markdownH1 = { fg = c.magenta, bold = true },
+  -- markdownH2 = { fg = c.blue, bold = true },
+  -- markdownLinkText = { fg = c.blue, underline = true },
+  markdownItalic = { fg = c.default.wisteria, italic = true },
+  markdownBold = { fg = c.default.yellow, bold = true },
+  markdownCodeDelimiter = { fg = c.default.brown, italic = true },
+  markdownError = { fg = c.default.fg, bg = c.default["bg+1"] },
+
+  -- These groups are for the neovim tree-sitter highlights.
+  -- As of writing, tree-sitter support is a WIP, group names may change.
+  -- By default, most of these groups link to an appropriate Vim group,
+  -- TSError -> Error for example, so you do not have to define these unless
+  -- you explicitly want to support Treesitter's improved syntax awareness.
+
+  -- TSAnnotation        = { };    -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information.
+  -- TSAttribute         = { };    -- (unstable) TODO: docs
+  -- TSBoolean           = { };    -- For booleans.
+  -- TSCharacter         = { };    -- For characters.
+  -- TSComment           = { };    -- For comment blocks.
+  -- TSNote = { fg = c.bg, bg = c.info },
+  -- ["@text.warning"] = { fg = c.bg, bg = c.warning },
+  -- ["@text.danger"] = { fg = c.bg, bg = c.error },
+  -- ["@constructor"] = { fg = c.magenta }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
+  -- TSConditional       = { };    -- For keywords related to conditionnals.
+  -- TSConstant          = { };    -- For constants
+  -- TSConstBuiltin      = { };    -- For constant that are built in the language: `nil` in Lua.
+  -- TSConstMacro        = { };    -- For constants that are defined by macros: `NULL` in C.
+  -- TSError             = { };    -- For syntax/parser errors.
+  -- TSException         = { };    -- For exception related keywords.
+  -- ["@field"] = { fg = c.green1 }, -- For fields.
+  -- TSFloat             = { };    -- For floats.
+  -- TSFunction          = { };    -- For function (calls and definitions).
+  -- TSFuncBuiltin       = { };    -- For builtin functions: `table.insert` in Lua.
+  -- TSFuncMacro         = { };    -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust.
+  -- TSInclude           = { };    -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua.
+  -- ["@keyword"] = { fg = c.purple, style = options.styles.keywords }, -- For keywords that don't fall in previous categories.
+  -- ["@keyword.function"] = { fg = c.magenta, style = options.styles.functions }, -- For keywords used to define a fuction.
+  -- ["@label"] = { fg = c.blue }, -- For labels: `label:` in C and `:label:` in Lua.
+  -- TSMethod            = { };    -- For method calls and definitions.
+  -- TSNamespace         = { };    -- For identifiers referring to modules and namespaces.
+  -- TSNone              = { };    -- TODO: docs
+  -- TSNumber            = { };    -- For all numbers
+  -- ["@operator"] = { fg = c.blue5 }, -- For any operator: `+`, but also `->` and `*` in C.
+  -- ["@parameter"] = { fg = c.yellow }, -- For parameters of a function.
+  -- TSParameterReference= { };    -- For references to parameters of a function.
+  -- ["@property"] = { fg = c.green1 }, -- Same as `TSField`.
+  -- ["@punctuation.delimiter"] = { fg = c.blue5 }, -- For delimiters ie: `.`
+  -- ["@punctuation.bracket"] = { fg = c.fg_dark }, -- For brackets and parens.
+  -- ["@punctuation.special"] = { fg = c.blue5 }, -- For special punctutation that does not fall in the catagories before.
+  -- TSRepeat            = { };    -- For keywords related to loops.
+  -- TSString            = { };    -- For strings.
+  -- ["@string.regex"] = { fg = c.blue6 }, -- For regexes.
+  -- ["@string.escape"] = { fg = c.magenta }, -- For escape characters within a string.
+  -- TSSymbol            = { };    -- For identifiers referring to symbols or atoms.
+  -- TSType              = { };    -- For types.
+  -- TSTypeBuiltin       = { };    -- For builtin types.
+  -- ["@variable"] = { style = options.styles.variables }, -- Any variable name that does not have another highlight.
+  -- ["@variable.builtin"] = { fg = c.red }, -- Variable names that are defined by the languages, like `this` or `self`.
+
+  -- TSTag               = { };    -- Tags like html tag names.
+  -- TSTagDelimiter      = { };    -- Tag delimiter like `<` `>` `/`
+  -- TSText              = { };    -- For strings considered text in a markup language.
+  -- ["@text.reference"] = { fg = c.teal },
+  -- TSEmphasis          = { };    -- For text to be represented with emphasis.
+  -- TSUnderline         = { };    -- For text to be represented with an underline.
+  -- TSStrike            = { };    -- For strikethrough text.
+  -- TSTitle             = { };    -- Text that is part of a title.
+  -- TSLiteral           = { };    -- Literal text.
+  -- TSURI               = { };    -- Any URI like a link or email.
+  -- ["@text.diff.add"] = { link = "DiffAdd" },
+  -- ["@text.diff.delete"] = { link = "DiffDelete" },
 
   -- Cmp
   -- CmpDocumentation = { link = "NormalFloat" },
@@ -200,3 +275,5 @@ end
 
 return M
 
+
+