diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index a66904b..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Rob Wilson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/README.md b/README.md
index 8e72773..b0b031c 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,27 @@ A dark low-contrast Neovim theme.
 
 ![Screenshot](https://user-images.githubusercontent.com/226654/204131002-5ee1650b-784b-499a-b1c9-e28bd55250b6.png)
 
+-- visually distinguish precedence of most useful stuff
+-- see relationships with fades across related stuff
+-- use greys for most stuff, so tuneable with main color
+
 ## :hammer_and_wrench: Install
 
-```
-use { "roobert/nightshift.vim", requires = "rktjmp/lush.nvim" }
+```lua
+{
+  "roobert/nightshift.nvim",
+  lazy = false,
+  priority = 1000,
+  config = function()
+    require("nightshift").setup({
+      -- night or dusk
+      palette = "dark",
+      -- bright or pastel
+      accent = "pastel",
+    })
+    vim.cmd([[colorscheme nightshift]])
+  end,
+}
 ```
 
 ## :squid: Usage
@@ -18,8 +35,27 @@ use { "roobert/nightshift.vim", requires = "rktjmp/lush.nvim" }
 colorscheme nightshift
 ```
 
+## Border Config
+
+LazyVim
+
+```
+ui = { border = "rounded" }
+```
+
+## Italic Support in Iterm2
+
+TODO
+
 ## :snake: Supported Plugins
 
-* Bufferline
-* Lualine
-* Trouble
+- Bufferline
+- Lualine
+- Trouble
+
+## :snake: Improved Languages
+
+These languages have been improved specific treesitter based syntax highlighting:
+
+- python
+- terraform/hcl
diff --git a/colors/nightshift.lua b/colors/nightshift.lua
new file mode 100644
index 0000000..2ffac73
--- /dev/null
+++ b/colors/nightshift.lua
@@ -0,0 +1 @@
+require("nightshift").load()
diff --git a/colors/nightshift.vim b/colors/nightshift.vim
deleted file mode 100644
index 97c07cb..0000000
--- a/colors/nightshift.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-set background=dark
-
-let g:colors_name="nightshift"
-
-lua package.loaded['nightshift.theme'] = nil
-lua require('lush')(require('nightshift.theme'))
-lua require('lspconfig.ui.windows').default_options.border = 'single'
-
diff --git a/lua/lualine/themes/nightshift.lua b/lua/lualine/themes/nightshift.lua
deleted file mode 100644
index 739b5cb..0000000
--- a/lua/lualine/themes/nightshift.lua
+++ /dev/null
@@ -1,53 +0,0 @@
--- stylua: ignore start
-
-local colors = {
-  white = "#dddddd",
-  grey  = "#888888",
-  black = "#000000",
-
-  -- slightly darkened accent colors
-  green  = "#88cccc",
-  blue   = "#88bbee",
-  yellow = "#ffeedd",
-  red    = "#ee9999",
-
-  dark_blue = "#232a4d",
-  mid_blue  = "#232a4d",
-}
-
-return {
-  --
-  -- | A | B | C ------------- X | Y | Z
-  --
-
-  inactive = {
-    c = { fg = colors.grey, bg = colors.dark_blue },
-    a = { fg = colors.white, bg = colors.red, gui = 'bold' },
-    b = { fg = colors.white, bg = colors.mid_blue },
-  },
-
-  -- grey
-  normal = {
-    c = { fg = colors.grey, bg = colors.dark_blue },
-    a = { fg = colors.black, bg = colors.grey, gui = 'bold' },
-    b = { fg = colors.white, bg = colors.mid_blue },
-  },
-
-  -- green
-  insert = {
-    a = { fg = colors.black, bg = colors.green, gui = 'bold' },
-    b = { fg = colors.white, bg = colors.mid_blue },
-  },
-
-  -- blue
-  visual = {
-    a = { fg = colors.black, bg = colors.blue, gui = 'bold' },
-    b = { fg = colors.grey, bg = colors.mid_blue },
-  },
-
-  -- orange
-  replace = {
-    a = { fg = colors.black, bg = colors.red, gui = 'bold' },
-    b = { fg = colors.grey, bg = colors.mid_blue },
-  },
-}
diff --git a/lua/nightshift/highlights.lua b/lua/nightshift/highlights.lua
new file mode 100644
index 0000000..2150036
--- /dev/null
+++ b/lua/nightshift/highlights.lua
@@ -0,0 +1,206 @@
+local p = require("nightshift.theme")
+
+-- Exmaple mappings table entry:
+-- { "<highlight>", "<fg>", "<bg>", "<style>" }
+-- or for multiple styles:
+-- { "<highlight>", "<fg>", "<bg>", {p.italic, "bold", "underline" } }
+return {
+	-- Default window, etc. bg = None is transparent..
+	{ "Normal", p.fg, p.bg },
+	{ "NormalFloat", p.fg },
+	{ "FloatBorder", p.color8, p.bg },
+	{ "NotifyBackground", nil, p.bg },
+	{ "NonText", p.fg },
+
+	-- End of buffer: ~'s
+	{ "EndOfBuffer", p.color3 },
+
+	-- Indent Lines
+	{ "IndentBlanklineChar", p.color3 },
+
+	-- Special characters
+	{ "Special", p.color3 },
+	{ "SpecialChar", p.color3 },
+
+	-- Preprocessor & Include
+	{ "PreProc", p.color3 },
+	{ "Include", p.color3 },
+
+	-- Statements and Keywords
+	{ "Statement", p.color3 },
+	{ "Conditional", p.color3 },
+	{ "Repeat", p.color3 },
+	{ "Exception", p.color3 },
+	{ "Directory", p.color3 },
+	{ "Keyword", p.color3 },
+
+	-- Operators and Delimiters
+	{ "Operator", p.color4 },
+	{ "Delimiter", p.color4 },
+
+	-- Comments and Documentation
+	{ "Comment", p.color6, nil, p.italic },
+	{ "DocComment", p.color6, nil, p.italic },
+
+	-- Identifiers
+	{ "Identifier", p.color5 },
+	{ "Variable", p.color6 },
+
+	{ "Function", p.color7 },
+
+	-- Strings
+	{ "String", p.color8 },
+
+	-- Variables
+	{ "Type", p.color8, nil, "NONE" },
+	{ "Label", p.red },
+
+	-- Constants and Literals
+	{ "Character", p.red },
+	{ "Number", p.red },
+	{ "Boolean", p.blue },
+	{ "Float", p.blue },
+	{ "Constant", p.blue },
+
+	-- Todo's etc.
+	{ "Todo", p.color3, nil, p.italic },
+	{ "Debug", p.color3, nil, p.italic },
+
+	-- Status line, VertSplit, Tab pages, Titles, etc.
+	{ "StatusLine", p.color1 },
+	{ "StatusLineNC", p.color2 },
+	{ "VertSplit", p.color3 },
+	{ "TabLine", p.color3 },
+	{ "TabLineSel", p.color5 },
+	{ "TabLineFill", p.color6 },
+	{ "Title", p.color8 },
+	--
+	-- Visual Mode
+	{ "Visual", p.orange, p.color1 },
+	{ "VisualNOS", p.color4, p.color1 },
+
+	-- Line Numbers
+	{ "LineNr", p.color3 },
+	{ "CursorLineNr", p.color4 },
+
+	-- Folded text, and the column where it's shown
+	{ "Folded", p.color4, p.bg },
+	{ "FoldColumn", p.color4, p.bg },
+
+	-- Popup menu
+	{ "Pmenu", p.color5, p.color1 },
+	{ "PmenuSel", p.color5, p.color2 },
+	--{ "PmenuSbar", p.red },
+	{ "PmenuThumb", nil, p.color8 },
+
+	-- Spell checking
+	{ "SpellBad", p.color3 },
+	{ "SpellCap", p.color4 },
+	{ "SpellRare", p.color5 },
+	{ "SpellLocal", p.color6 },
+
+	-- More UI elements
+	{ "Cursor", p.color2 },
+	{ "CursorColumn", p.color2 },
+	{ "CursorLine", nil, p.color1 },
+	{ "CursorLineFold", p.color2 },
+	{ "CursorLineSign", p.color2 },
+	{ "ToolbarLine", p.color3 },
+	{ "ToolbarButton", p.color3 },
+
+	-- UI Messages / prompts
+	-- quit, etc.
+	{ "MoreMsg", p.blue },
+	-- input method (prompt)
+	{ "CursorIM", p.blue },
+	{ "Question", p.blue },
+	{ "SpecialKey", p.red },
+
+	-- Search & Matches
+	{ "MatchParen", p.green },
+	{ "Search", p.orange },
+	{ "IncSearch", p.orange, p.bg },
+
+	-- Errors and Warnings
+	{ "NvimInternalError", p.red, p.bg },
+	{ "Error", p.red },
+	{ "WarningMsg", p.orange },
+	{ "ErrorMsg", p.red },
+
+	-- Diagnostic
+	{ "DiagnosticInfo", p.blue, nil, p.italic },
+	{ "DiagnosticHint", p.yellow, nil, p.italic },
+	{ "DiagnosticWarning", p.orange, nil, p.italic },
+	{ "DiagnosticWarn", p.orange, nil, p.italic },
+	{ "DiagnosticError", p.red, nil, p.italic },
+
+	-- Indicators
+	{ "LspDiagnosticsSignInformation", p.blue, p.bg, p.italic },
+	{ "LspDiagnosticsSignHint", p.yellow, p.bg, p.italic },
+	{ "LspDiagnosticsSignWarning", p.orange, p.bg, p.italic },
+	{ "LspDiagnosticsSignError", p.red, p.bg, p.italic },
+
+	-- Diff mode
+	{ "DiffAdd", p.green },
+	{ "DiffChange", p.orange },
+	{ "DiffDelete", p.red },
+	{ "DiffText", p.color3 },
+
+	-- SignColumn
+	{ "SignColumn", nil, p.bg },
+	{ "GitSignsAdd", p.green, p.bg },
+	{ "GitSignsChange", p.orange, p.bg },
+	{ "GitSignsDelete", p.red, p.bg },
+
+	-- Git & Version Control
+	{ "gitcommitComment", p.color4 },
+	{ "gitcommitUntracked", p.color4 },
+	{ "gitcommitDiscarded", p.color4 },
+	{ "gitcommitSelected", p.color4 },
+	{ "gitcommitUnmerged", p.color3 },
+	{ "gitcommitOnBranch", p.color3 },
+	{ "gitcommitBranch", p.color3 },
+	{ "gitcommitDiscardedType", p.color3 },
+	{ "gitcommitSelectedType", p.color3 },
+	{ "gitcommitUntrackedFile", p.color3 },
+	{ "gitcommitDiscardedFile", p.color3 },
+	{ "gitcommitUnmergedFile", p.color3 },
+	{ "gitcommitSelectedFile", p.color3 },
+
+	-- python
+	{ "@repeat.python", p.color3, nil, p.italic },
+	{ "@conditional.python", p.color3, nil, p.italic },
+	{ "@operator.python", p.color3 },
+	{ "@conditional.call.python", p.color3 },
+	{ "@punctuation.bracket.python", p.color3 },
+	{ "@punctuation.special.python", p.color3 },
+	{ "@function.builtin.python", p.color3 },
+
+	{ "@keyword.operator.python", p.color4, nil, p.italic },
+	{ "@method.call.python", p.color4 },
+	{ "@function.python", p.color4 },
+	{ "@function.call.python", p.color4 },
+	{ "@type.python", p.color4 },
+
+	{ "@constructor.python", p.color5 },
+	{ "@field.python", p.color5 },
+
+	{ "@variable.python", p.color6 },
+
+	-- function arguments (keys)
+	{ "@parameter.python", p.color7 },
+
+	{ "@string.python", p.color8 },
+
+	{ "@constant.builtin.python", p.blue },
+
+	-- terraform
+	{ "@none.terraform", p.color3 },
+	{ "@lsp.type.type.terraform", p.color3 },
+	{ "@lsp.type.property.terraform", p.color4 },
+	{ "@lsp.type.variable.terraform", p.color5 },
+	{ "@lsp.type.enumMember.terraform", p.color8 },
+	{ "@lsp.type.parameter.terraform", p.color8 },
+	{ "@lsp.type.string.terraform", p.color8 },
+	{ "@lsp.type.stringMember.terraform", p.color8 },
+}
diff --git a/lua/nightshift/init.lua b/lua/nightshift/init.lua
new file mode 100644
index 0000000..f36ddc1
--- /dev/null
+++ b/lua/nightshift/init.lua
@@ -0,0 +1,36 @@
+M = {}
+
+local config = {
+	palette = "night",
+	accent = "pastel",
+}
+
+M.setup = function(opts)
+	config = vim.tbl_extend("force", config, opts)
+end
+
+M.get = function(key)
+	return config[key]
+end
+
+function M.load()
+	vim.g.colors_name = "nightshift"
+
+	-- options
+	vim.o.termguicolors = true
+	vim.o.background = "dark"
+
+	-- override border types for hover and diagnostic floats..
+	vim.diagnostic.config({ float = { border = "rounded" } })
+
+	local float = { focusable = true, style = "minimal", border = "rounded" }
+	vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, float)
+	vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, float)
+
+	require("lspconfig.ui.windows").default_options.border = "single"
+
+	-- load the colorscheme mappings
+	require("nightshift.utils").apply_highlight_groups(require("nightshift.highlights"))
+end
+
+return M
diff --git a/lua/nightshift/theme.lua b/lua/nightshift/theme.lua
index 2e7a49b..389f743 100644
--- a/lua/nightshift/theme.lua
+++ b/lua/nightshift/theme.lua
@@ -1,236 +1,123 @@
--- Nightshift - github.com/roobert/nightshift.vim
--- Inspired by tokyonight - github.com/folke/tokyonight.nvim
---
--- Run :Lushify to see the rendered colors
---
--- To print a color:
--- :lua print(string.format("#%6x", vim.api.nvim_get_hl_by_name('Number', {}).foreground))
---
--- Use treesitter-playground and :TSPlaygroundToggle to see the highlight groups applied
--- to the token under the corsor
+-- TODO:
+-- * tab colors
+-- * improve the color colors?
+-- * re-add todo count stuff lualine
+-- * background color for action hints and status bar
+-- * add description to README
+-- * generate some artwork for backgrounds
+-- * add support for other popular programming languages
 
 -- FIXME:
--- diff view
--- hop
--- trouble
-
-local lush = require("lush")
-local hsl = lush.hsl
-
-local theme = lush(function(injected_functions)
-	-- https://github.com/rktjmp/lush.nvim/issues/109
-	local sym = injected_functions.sym
-
-	-- NOTE: aiming for something like this with relative colors:
-	local c01 = hsl("#232a4d") -- c01 is the main colour for highlighted/selected stuff
-	local c02 = hsl("#364178") -- menu sbar/thumb
-	local c03 = hsl("#3e4b8a") -- include/function, etc.
-	local c04 = hsl("#46549b") -- comment/keyword
-
-	local c05 = hsl("#5664b3") -- 1 - just line number
-	local c06 = hsl("#6b75bb") -- 2 - field/special
-	local c07 = hsl("#8185c2") -- 2 - operator/shebang
-	local c08 = hsl("#9696ca") -- 3 - normal text
-
-	local c09 = hsl("#b9bfdf") -- unused
-	local c10 = hsl("#bfbfdf") -- variable/field/identifier
-	local c11 = hsl("#d8dbee") -- URIs
-
-	local bg = hsl("#1c2240")
-	local black = hsl("#111111")
-	local white = hsl("#eeeeee")
-
-	-- accent colors for info/warn/error, etc.
-	local accent_red = hsl("#ffb3ba")
-	local accent_orange = hsl("#ffdfba")
-	local accent_yellow = hsl("#ffffba")
-	local accent_green = hsl("#baffc9")
-	local accent_turquoise = hsl("#99dddd")
-	local accent_blue = hsl("#bae1ff")
-	local accent_purple = hsl("#afafff")
-
-	local hint = accent_blue
-	local info = accent_green
-	local warn = accent_orange
-	local error = accent_red
-
-	-- FIXME:
-	-- adjust all this stuff with .rotate() .(de)saturate() and (ligh|dark)en()
-
-	-- NOTE: the main colors are broken up into three gradients
-
-	local color_main = c01 -- c01 is the main colour for highlighted/selected stuff
-	-- local color_main = hsl("#0000ff").rotate(-15).desaturate(65).darken(65).lighten(10)
-
-	-- local c01 = color_main
-	-- local c02 = c01.lighten(10)
-	-- local c03 = c02.lighten(10)
-	-- local c04 = c03.lighten(10)
-
-	-- local color_secondary = color_main.lighten(30)
-
-	-- local c05 = color_secondary
-	-- local c06 = c05.lighten(20)
-	-- local c07 = c06.lighten(10)
-	-- local c08 = c07.lighten(10)
-
-	-- local color_thirdary = color_secondary.lighten(30)
-
-	-- local c09 = color_thirdary
-	-- local c10 = c09.lighten(45)
-	-- local c11 = c10.lighten(10)
-
-	-- local accent_primary = accent_purple
-	local accent_primary = color_main.rotate(10).lighten(75).saturate(90)
-	local accent_secondary = accent_blue
-
-	-- primary accent color - function names, etc.
-	local search_highlight = accent_orange
-
-	return {
-		-- main syntax
-		Comment({ fg = c03 }), -- any comment
-		Include({ fg = c04 }), -- preprocessor #include
-		Normal({ fg = c08, bg = bg }), -- normal text
-		String({ fg = white }), -- a string constant: "this is a string"
-		NonText({ fg = c08, bg = bg }),
-
-		-- def, etc.
-		Keyword({ fg = c04 }), --  any other keyword
-		Directory({ fg = c04 }), --  any other keyword
-		sym("@keyword.function")({ fg = c03 }),
-		--sym "@keyword.operator" { fg = c04 },
-		sym("@field")({ fg = c06 }),
-		sym("@variable")({ fg = c10 }),
-		sym("@constant.builtin")({ fg = white }),
-
-		-- if, etc.
-		Conditional({ fg = c03 }), -- if, then, else, endif, switch, etc.
-		Statement({ fg = c03 }), -- (preferred) any statement
-		TSField({ fg = c10 }), -- For fields.
-
-		-- specials
-		Special({ fg = c06 }), -- (preferred) any special symbol
-		Operator({ fg = c07 }), -- "sizeof", "+", "*", etc.
-		Identifier({ fg = c10 }), -- (preferred) any variable name
-
-		-- this has to be Normal because there's no way to distinguish it from normal variables
-		TSParameter({ fg = c08 }), -- For parameters of a function.
-		Type({ fg = accent_secondary }), -- (preferred) int, long, char, etc.
-
-		-- left margin
-		LineNr({ fg = c05 }), -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
-		CursorLineNr({ fg = c07 }), -- Like LineNr when 'color11' or 'relativenumber' is set for the cursor line.
-		SignColumn({ bg = bg }), -- column where |signs| are displayed
-
-		-- window decorations
-		IndentBlanklineChar({ fg = c03 }),
-		EndOfBuffer({ fg = c04 }), -- filler lines (~) after the end of the buffer.  By default, this is highlighted like |hl-NonText|.
-		VertSplit({ fg = c08 }), -- the column separating vertically split windows, also used by lsp popup outline
-
-		-- menus (inc. tab completion menu)
-		Pmenu({ fg = c06, bg = bg.darken(40) }), -- Popup menu: normal item.
-		PmenuSel({ fg = c11, bg = bg.darken(10) }), -- Popup menu: selected item.
-		PmenuSbar({ bg = bg.darken(60) }), -- Popup menu: scrollbar.
-		PmenuThumb({ bg = bg.darken(10) }), -- Popup menu: Thumb of the scrollbar.
-
-		FloatBorder({ bg = bg }),
-
-		-- used by shebang lines
-		PreProc({ fg = c07 }), -- (preferred) generic Preprocessor
-		TSURI({ fg = c11 }), -- Any URI like a link or email.
-
-		-- cursor line / visual selection backgrounds
-		--Cursor { fg = String.fg, bg = red }, -- character under the cursor - unused?
-		lCursor({}), -- the character under the cursor when |language-mapping| is used (see 'guicursor')
-		CursorIM({}), -- like Cursor, but used when in IME mode |CursorIM|
-
-		-- configuration for various background items / highlighted/selected stuff
-		CursorLine({ bg = c01.lighten(5) }), -- Screen-line at the cursor, when 'cursorline' is set.  Low-priority if foreground (ctermfg OR guifg) is not set.
-		CursorColumn({ bg = c01 }), -- Screen-column at the cursor, when 'cursorcolumn' is set.
-		ColorColumn({ bg = c01 }), -- used for the columns set with 'colorcolumn'
-		Visual({ bg = c01.lighten(4) }), -- Visual mode selection
-		StatusLine({ bg = c01 }),
-
-		-- functions, methods, etc.
-		Function({ fg = accent_primary }), -- function name (also: methods for classes)
-		TSMethod({ fg = accent_primary }), -- For method calls and definitions.
-		TSFunction({ fg = accent_primary }), -- For function (calls and definitions).
-		TSPunctBracket({ fg = accent_primary }), -- For brackets and parens.
-		TSFuncBuiltin({ fg = accent_primary }), -- For builtin functions: `table.insert` in Lua.
-
-		-- constants, numbers, etc.
-		Constant({ fg = accent_secondary }), -- (preferred) any constant
-		Character({ fg = accent_secondary }), --  a character constant: 'c', '\n'
-		Number({ fg = accent_secondary }), -- a number constant: 234, 0xff
-		Boolean({ fg = accent_secondary }), -- a boolean constant: TRUE, false
-		Float({ fg = accent_secondary }), -- a floating point constant: 2.3e10
-
-		-- search/match
-		CurSearch({ fg = search_highlight.darken(50) }),
-		IncSearch({ fg = search_highlight.darken(50) }), -- 'incsearch' highlighting; also used for the text replaced      with  ":s///c"
-		Search({ fg = search_highlight.darken(15) }),
-		Substitute({ fg = search_highlight.darken(15) }), -- |:substitute| replacement text  highlighting
-		MatchParen({ fg = accent_green }), -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt|
-
-		-- TODO, FIXME, etc.
-		WarningMsg({ fg = black, bg = warn }), -- warning messages
-		Error({ fg = black, bg = error }), -- (preferred) any erroneous construct
-		Todo({ fg = black, bg = hint }), -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
-		ErrorMsg({ fg = error }), -- (preferred) any erroneous construct
-
-		DiagnosticInfo({ fg = info }),
-		DiagnosticHint({ fg = hint }),
-		DiagnosticWarning({ fg = warn.darken(15) }),
-		DiagnosticWarn({ fg = warn.darken(15) }),
-		DiagnosticError({ fg = error }),
-
-		-- diagnostics
-		LspDiagnosticsDefaultInformation({ fg = info, bg = c01 }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
-		LspDiagnosticsDefaultHint({ fg = hint, bg = c01 }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
-		LspDiagnosticsDefaultWarning({ fg = warn, bg = c01 }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
-		LspDiagnosticsVirtualTextError({ fg = error, bg = c01 }), -- Used for "Error" diagnostic virtual text
-
-		-- diff stuff
-		DiffAdd({ fg = accent_green.darken(15) }), -- diff mode: Added line |diff.txt|
-		DiffChange({ fg = accent_blue.darken(15) }), -- diff mode: Changed line |diff.txt|
-		DiffDelete({ fg = accent_red.darken(15) }), -- diff mode: Deleted line |diff.txt|
-
-		-- trouble.nvim
-		TroubleFile({ fg = accent_primary }),
-
-		ActionHintsDefinition({ fg = accent_blue, bg = c01.lighten(5) }),
-		ActionHintsReferences({ fg = accent_red, bg = c01.lighten(5) }),
-
-		-- vim tutor
-		sym("Title")({ fg = c11 }),
-		sym("tutorLink")({ fg = accent_blue }),
-
-		-- markdown
-		sym("@text.title")({ fg = c11 }),
-		sym("markdownH1")({ fg = c11 }),
-		sym("markdownH2")({ fg = c11 }),
-		sym("markdownH3")({ fg = c11 }),
-		sym("markdownH4")({ fg = c11 }),
-
-		-- terraform
-		sym("@lsp.type.type.terraform")({ fg = c04 }),
-		sym("@lsp.type.variable.terraform")({ fg = c10 }),
-		sym("@lsp.type.property.terraform")({ fg = c07 }),
-		sym("@lsp.type.enumMember.terraform")({ fg = white }),
-
-		ChatGPTWelcome({ fg = Normal.fg, bg = Normal.bg }),
-	}
-end)
-
--- if lvim.builtin.bufferline.active then
--- 	lvim.builtin.bufferline.highlights = {
--- 		error_selected = { fg = "#b8e0ff", bold = false },
--- 		error_diagnostic_selected = { fg = "#dddddd", bold = false },
--- 	}
--- end
-
--- return our parsed theme for extension or use else where.
-return theme
-
--- vi:nowrap
+-- simplify to light and dark mode?
+local palettes = {
+	night = {
+		color0 = "#191d33",
+		color1 = "#1A1E39",
+		color2 = "#383f5e",
+		color3 = "#4e5470",
+		color4 = "#7b7f94",
+		color5 = "#a7a9b7",
+		color6 = "#bdbfc9",
+		color7 = "#d3d4db",
+		color8 = "#e9e9ed",
+	},
+
+	dusk = {
+		color0 = "#121527",
+		color1 = "#1A1E39",
+		color2 = "#232A4D",
+		color3 = "#3E4D89",
+		color4 = "#687BBA",
+		color5 = "#A4B1D6",
+		color6 = "#bdbfc9",
+		color7 = "#DFE5F1",
+		color8 = "#e9e9ed",
+	},
+
+	day = {
+		color0 = "#e9e9ed",
+		color1 = "#d3d4db",
+		color2 = "#bdbfc9",
+		color3 = "#a7a9b7",
+		color4 = "#7b7f94",
+		color5 = "#656982",
+		color6 = "#4e5470",
+		color7 = "#383f5e",
+		color8 = "#1A1E39",
+	},
+
+	dawn = {
+		color0 = "#e9e9ed",
+		color1 = "#d3d4db",
+		color2 = "#bdbfc9",
+		color3 = "#A4B1D6",
+		color4 = "#687BBA",
+		color5 = "#3E4D89",
+		color6 = "#232A4D",
+		color7 = "#1A1E39",
+		color8 = "#121527",
+	},
+}
+
+local accents = {
+	dark = {
+		accent0 = "#B15555",
+		accent1 = "#B17855",
+		accent2 = "#B1AA55",
+		accent3 = "#56A665",
+		accent4 = "#568FA0",
+		accent5 = "#B15564",
+		accent6 = "#9056A6",
+	},
+
+	bright = {
+		accent0 = "#D66A6A",
+		accent1 = "#D6956A",
+		accent2 = "#D6CC6A",
+		accent3 = "#6AD682",
+		accent4 = "#6AB7D6",
+		accent5 = "#D66A7E",
+		accent6 = "#B36AD6",
+	},
+
+	pastel = {
+		accent0 = "#D97C8F",
+		accent1 = "#D9AE7E",
+		accent2 = "#D9D87E",
+		accent3 = "#A5D9A7",
+		accent4 = "#8BB9C8",
+		accent5 = "#C9A1D3",
+		accent6 = "#B8A1D9",
+	},
+}
+
+local palette = palettes[require("nightshift").get("palette")] or palettes["night"]
+local accent = accents[require("nightshift").get("accent")] or accents["bright"]
+
+local italics = require("nightshift").get("italics") and "italic" or "NONE"
+local transparent_background = require("nightshift").get("transparent_background") and "NONE" or palette.color0
+
+return {
+	italic = italics,
+
+	bg = transparent_background,
+	fg = palette.color8,
+
+	red = accent.accent0,
+	orange = accent.accent1,
+	yellow = accent.accent2,
+	green = accent.accent3,
+	blue = accent.accent4,
+	pink = accent.accent5,
+	purple = accent.accent6,
+
+	color0 = palette.color0,
+	color1 = palette.color1,
+	color2 = palette.color2,
+	color3 = palette.color3,
+	color4 = palette.color4,
+	color5 = palette.color5,
+	color6 = palette.color6,
+	color7 = palette.color7,
+	color8 = palette.color8,
+}
diff --git a/lua/nightshift/utils.lua b/lua/nightshift/utils.lua
new file mode 100644
index 0000000..f782afa
--- /dev/null
+++ b/lua/nightshift/utils.lua
@@ -0,0 +1,33 @@
+M = {}
+
+M.apply_highlight_groups = function(highlights)
+	-- clear all current highlights
+	if vim.g.colors_name then
+		vim.cmd("highlight clear")
+	end
+
+	for _, highlight in pairs(highlights) do
+		local hlgroup = highlight[1]
+
+		local guifg = highlight[2] and "guifg=" .. highlight[2] or "guifg=NONE"
+		local guibg = highlight[3] and "guibg=" .. highlight[3] or "guibg=NONE"
+
+		-- handle italic, bold, underline, etc.
+		local gui = "gui="
+		if highlight[4] then
+			if type(highlight[4]) == "table" then
+				-- Join the table of styles into a comma-separated string
+				gui = gui .. table.concat(highlight[4], ",")
+			else
+				-- If it's a single string, just append it
+				gui = gui .. highlight[4]
+			end
+		else
+			gui = ""
+		end
+
+		vim.cmd(string.format("highlight %s %s %s %s", hlgroup, guifg, guibg, gui))
+	end
+end
+
+return M