diff --git a/lua/solarized/Git.lua b/lua/solarized/Git.lua
index b47ccf2..2b872e6 100644
--- a/lua/solarized/Git.lua
+++ b/lua/solarized/Git.lua
@@ -1,10 +1,10 @@
 local Git = {
-  SignAdd = { fg = C.sign_add },
-  SignChange = { fg = C.sign_change },
-  SignDelete = { fg = C.sign_delete },
-  GitSignsAdd = { fg = C.sign_add },
-  GitSignsChange = { fg = C.sign_change },
-  GitSignsDelete = { fg = C.sign_delete },
+  SignAdd = { fg = C.green },
+  SignChange = { fg = C.yellow },
+  SignDelete = { fg = C.red },
+  GitSignsAdd = { fg = C.green },
+  GitSignsChange = { fg = C.yellow },
+  GitSignsDelete = { fg = C.red },
 }
 
 return Git
diff --git a/lua/solarized/LSP.lua b/lua/solarized/LSP.lua
index 35d97fe..b0d5f9a 100644
--- a/lua/solarized/LSP.lua
+++ b/lua/solarized/LSP.lua
@@ -1,105 +1,105 @@
 local LSP = {
-  LspDiagnosticsDefaultError = { fg = C.error_red },
-  LspDiagnosticsDefaultWarning = { fg = C.warning_orange },
-  LspDiagnosticsDefaultInformation = { fg = C.info_yellow },
-  LspDiagnosticsDefaultHint = { fg = C.hint_blue },
-  LspDiagnosticsVirtualTextError = { fg = C.error_red },
-  LspDiagnosticsVirtualTextWarning = { fg = C.warning_orange },
-  LspDiagnosticsVirtualTextInformation = { fg = C.info_yellow },
-  LspDiagnosticsVirtualTextHint = { fg = C.hint_blue },
-  LspDiagnosticsFloatingError = { fg = C.error_red },
-  LspDiagnosticsFloatingWarning = { fg = C.warning_orange },
-  LspDiagnosticsFloatingInformation = { fg = C.info_yellow },
-  LspDiagnosticsFloatingHint = { fg = C.hint_blue },
-  LspDiagnosticsSignError = { fg = C.error_red },
-  LspDiagnosticsSignWarning = { fg = C.warning_orange },
-  LspDiagnosticsSignInformation = { fg = C.info_yellow },
-  LspDiagnosticsSignHint = { fg = C.hint_blue },
-  LspDiagnosticsError = { fg = C.error_red },
-  LspDiagnosticsWarning = { fg = C.warning_orange },
-  LspDiagnosticsInformation = { fg = C.info_yellow },
-  LspDiagnosticsHint = { fg = C.hint_blue },
+  LspDiagnosticsDefaultError = { fg = C.red },
+  LspDiagnosticsDefaultWarning = { fg = C.orange },
+  LspDiagnosticsDefaultInformation = { fg = C.yellow },
+  LspDiagnosticsDefaultHint = { fg = C.blue },
+  LspDiagnosticsVirtualTextError = { fg = C.red },
+  LspDiagnosticsVirtualTextWarning = { fg = C.orange },
+  LspDiagnosticsVirtualTextInformation = { fg = C.yellow },
+  LspDiagnosticsVirtualTextHint = { fg = C.blue },
+  LspDiagnosticsFloatingError = { fg = C.red },
+  LspDiagnosticsFloatingWarning = { fg = C.orange },
+  LspDiagnosticsFloatingInformation = { fg = C.yellow },
+  LspDiagnosticsFloatingHint = { fg = C.blue },
+  LspDiagnosticsSignError = { fg = C.red },
+  LspDiagnosticsSignWarning = { fg = C.orange },
+  LspDiagnosticsSignInformation = { fg = C.yellow },
+  LspDiagnosticsSignHint = { fg = C.blue },
+  LspDiagnosticsError = { fg = C.red },
+  LspDiagnosticsWarning = { fg = C.orange },
+  LspDiagnosticsInformation = { fg = C.yellow },
+  LspDiagnosticsHint = { fg = C.blue },
   LspDiagnosticsUnderlineError = { style = 'underline' },
   LspDiagnosticsUnderlineWarning = { style = 'underline' },
   LspDiagnosticsUnderlineInformation = { style = 'underline' },
   LspDiagnosticsUnderlineHint = { style = 'underline' },
-  QuickScopePrimary = { fg = C.purple_test, style = 'underline' },
-  QuickScopeSecondary = { fg = C.cyan_test, style = 'underline' },
-  TelescopeSelection = { fg = C.hint_blue },
-  TelescopeMatching = { fg = C.info_yellow, style = 'bold' },
-  TelescopeBorder = { fg = C.blue, bg = Config.transparent_background and 'NONE' or C.bg },
-  TelescopePromptPrefix = { fg = C.purple },
+  QuickScopePrimary = { fg = C.violet, style = 'underline' },
+  QuickScopeSecondary = { fg = C.cyan, style = 'underline' },
+  TelescopeSelection = { fg = C.blue },
+  TelescopeMatching = { fg = C.yellow, style = 'bold' },
+  TelescopeBorder = { fg = C.blue, bg = Config.transparent_background and 'NONE' or C.base03 },
+  TelescopePromptPrefix = { fg = C.violet },
   NvimTreeFolderIcon = { fg = C.blue },
-  NvimTreeIndentMarker = { fg = C.gray },
-  NvimTreeNormal = { fg = C.light_gray, bg = C.alt_bg },
-  NvimTreeVertSplit = { fg = C.alt_bg, bg = C.alt_bg },
+  NvimTreeIndentMarker = { fg = C.base0 },
+  NvimTreeNormal = { fg = C.base0, bg = C.base02 },
+  NvimTreeVertSplit = { fg = C.base02, bg = C.base02 },
   NvimTreeFolderName = { fg = C.blue },
   NvimTreeOpenedFolderName = { fg = C.cyan, style = 'italic' },
-  NvimTreeImageFile = { fg = C.purple },
+  NvimTreeImageFile = { fg = C.violet },
   NvimTreeSpecialFile = { fg = C.orange },
-  NvimTreeGitStaged = { fg = C.sign_add },
-  NvimTreeGitNew = { fg = C.sign_add },
-  NvimTreeGitDirty = { fg = C.sign_add },
-  NvimTreeGitDeleted = { fg = C.sign_delete },
-  NvimTreeGitMerge = { fg = C.sign_change },
-  NvimTreeGitRenamed = { fg = C.sign_change },
+  NvimTreeGitStaged = { fg = C.red },
+  NvimTreeGitNew = { fg = C.red },
+  NvimTreeGitDirty = { fg = C.red },
+  NvimTreeGitDeleted = { fg = C.red },
+  NvimTreeGitMerge = { fg = C.yellow },
+  NvimTreeGitRenamed = { fg = C.yellow },
   NvimTreeSymlink = { fg = C.cyan },
-  NvimTreeRootFolder = { fg = C.fg, style = 'bold' },
+  NvimTreeRootFolder = { fg = C.base1, style = 'bold' },
   NvimTreeExecFile = { fg = C.green },
-  LirFloatNormal = { fg = C.light_gray, bg = C.alt_bg },
+  LirFloatNormal = { fg = C.base0, bg = C.base02 },
   LirDir = { fg = C.blue },
   LirSymLink = { fg = C.cyan },
   LirEmptyDirText = { fg = C.blue },
-  BufferCurrent = { fg = C.fg, bg = C.bg },
-  BufferCurrentIndex = { fg = C.fg, bg = C.bg },
-  BufferCurrentMod = { fg = C.info_yellow, bg = C.bg },
-  BufferCurrentSign = { fg = C.hint_blue, bg = C.bg },
-  BufferCurrentTarget = { fg = C.red, bg = C.bg, style = 'bold' },
-  BufferVisible = { fg = C.fg, bg = C.bg },
-  BufferVisibleIndex = { fg = C.fg, bg = C.bg },
-  BufferVisibleMod = { fg = C.info_yellow, bg = C.bg },
-  BufferVisibleSign = { fg = C.gray, bg = C.bg },
-  BufferVisibleTarget = { fg = C.red, bg = C.bg, style = 'bold' },
-  BufferInactive = { fg = C.gray, bg = C.alt_bg },
-  BufferInactiveIndex = { fg = C.gray, bg = C.alt_bg },
-  BufferInactiveMod = { fg = C.info_yellow, bg = C.alt_bg },
-  BufferInactiveSign = { fg = C.gray, bg = C.alt_bg },
-  BufferInactiveTarget = { fg = C.red, bg = C.alt_bg, style = 'bold' },
-  StatusLine = { fg = C.alt_bg },
-  StatusLineNC = { fg = C.alt_bg },
-  StatusLineSeparator = { fg = C.alt_bg },
-  StatusLineTerm = { fg = C.alt_bg },
-  StatusLineTermNC = { fg = C.alt_bg },
-  CodiVirtualText = { fg = C.hint_blue },
-  IndentBlanklineContextChar = { fg = C.context },
-  IndentBlanklineChar = { fg = C.dark_gray },
-  IndentBlanklineSpaceChar = { fg = C.cyan_test },
-  IndentBlanklineSpaceCharBlankline = { fg = C.info_yellow },
+  BufferCurrent = { fg = C.base1, bg = C.base03 },
+  BufferCurrentIndex = { fg = C.base1, bg = C.base03 },
+  BufferCurrentMod = { fg = C.yellow, bg = C.base03 },
+  BufferCurrentSign = { fg = C.blue, bg = C.base03 },
+  BufferCurrentTarget = { fg = C.red, bg = C.base03, style = 'bold' },
+  BufferVisible = { fg = C.base1, bg = C.base03 },
+  BufferVisibleIndex = { fg = C.base1, bg = C.base03 },
+  BufferVisibleMod = { fg = C.yellow, bg = C.base03 },
+  BufferVisibleSign = { fg = C.base0, bg = C.base03 },
+  BufferVisibleTarget = { fg = C.red, bg = C.base03, style = 'bold' },
+  BufferInactive = { fg = C.base0, bg = C.base02 },
+  BufferInactiveIndex = { fg = C.base0, bg = C.base02 },
+  BufferInactiveMod = { fg = C.yellow, bg = C.base02 },
+  BufferInactiveSign = { fg = C.base0, bg = C.base02 },
+  BufferInactiveTarget = { fg = C.red, bg = C.base02, style = 'bold' },
+  StatusLine = { fg = C.base1, bg = C.base02 },
+  StatusLineNC = { fg = C.base00, bg = C.base02 },
+  StatusLineSeparator = { fg = C.base02 },
+  StatusLineTerm = { fg = C.base02 },
+  StatusLineTermNC = { fg = C.base02 },
+  CodiVirtualText = { fg = C.blue },
+  IndentBlanklineContextChar = { fg = C.base00 },
+  IndentBlanklineChar = { fg = C.base02 },
+  IndentBlanklineSpaceChar = { fg = C.cyan },
+  IndentBlanklineSpaceCharBlankline = { fg = C.yellow },
   DashboardHeader = { fg = C.blue },
-  DashboardCenter = { fg = C.purple },
+  DashboardCenter = { fg = C.violet },
   DashboardFooter = { fg = C.cyan },
   xmlTag = { fg = C.blue },
   xmlTagName = { fg = C.blue },
   xmlEndTag = { fg = C.blue },
-  CompeDocumentation = { bg = C.alt_bg },
-  DiffViewNormal = { fg = C.gray, bg = C.alt_bg },
-  DiffviewStatusAdded = { fg = C.sign_add },
-  DiffviewStatusModified = { fg = C.sign_change },
-  DiffviewStatusRenamed = { fg = C.sign_change },
-  DiffviewStatusDeleted = { fg = C.sign_delete },
-  DiffviewFilePanelInsertion = { fg = C.sign_add },
-  DiffviewFilePanelDeletion = { fg = C.sign_delete },
-  DiffviewVertSplit = { bg = C.bg },
-  diffAdded = { fg = C.sign_add },
-  diffRemoved = { fg = C.sign_delete },
+  CompeDocumentation = { bg = C.base02 },
+  DiffViewNormal = { fg = C.base0, bg = C.base02 },
+  DiffviewStatusAdded = { fg = C.red },
+  DiffviewStatusModified = { fg = C.yellow },
+  DiffviewStatusRenamed = { fg = C.yellow },
+  DiffviewStatusDeleted = { fg = C.red },
+  DiffviewFilePanelInsertion = { fg = C.red },
+  DiffviewFilePanelDeletion = { fg = C.red },
+  DiffviewVertSplit = { bg = C.base03 },
+  diffAdded = { fg = C.red },
+  diffRemoved = { fg = C.red },
   diffFileId = { fg = C.blue, style = 'bold,reverse' },
-  diffFile = { fg = C.alt_bg },
+  diffFile = { fg = C.base02 },
   diffNewFile = { fg = C.green },
   diffOldFile = { fg = C.red },
   debugPc = { bg = C.cyan },
   debugBreakpoint = { fg = C.red, style = 'reverse' },
-  FocusedSymbol = { fg = C.purple, style = 'bold' },
-  SymbolsOutlineConnector = { fg = C.context },
+  FocusedSymbol = { fg = C.violet, style = 'bold' },
+  SymbolsOutlineConnector = { fg = C.base00 },
 }
 
 return LSP
diff --git a/lua/solarized/Treesitter.lua b/lua/solarized/Treesitter.lua
index 1b2e6da..00d9fd6 100644
--- a/lua/solarized/Treesitter.lua
+++ b/lua/solarized/Treesitter.lua
@@ -1,5 +1,5 @@
 local Treesitter = {
-  TSComment = { fg = C.gray },
+  TSComment = { fg = C.base0 },
   TSAnnotation = { fg = C.blue },
   TSAttribute = { fg = C.cyan },
   TSConstructor = { fg = C.red },
@@ -12,7 +12,7 @@ local Treesitter = {
   TSKeywordReturn = { fg = C.green },
   TSKeywordFunction = { fg = C.green },
   TSLabel = { fg = C.green },
-  TSNone = { fg = C.fg },
+  TSNone = { fg = C.base1 },
   TSNamespace = { fg = C.green },
   TSRepeat = { fg = C.green },
   TSConstant = { fg = C.blue },
@@ -21,7 +21,7 @@ local Treesitter = {
   TSNumber = { fg = C.cyan },
   TSBoolean = { fg = C.cyan },
   TSCharacter = { fg = C.green },
-  TSError = { fg = C.error_red },
+  TSError = { fg = C.red },
   TSFunction = { fg = C.blue },
   TSFuncBuiltin = { fg = C.blue },
   TSMethod = { fg = C.blue },
@@ -32,10 +32,10 @@ local Treesitter = {
   TSField = { fg = C.blue },
   TSParameter = { fg = C.blue },
   TSParameterReference = { fg = C.red },
-  TSVariable = { fg = C.fg },
+  TSVariable = { fg = C.base1 },
   TSVariableBuiltin = { fg = C.red },
   TSSymbol = { fg = C.cyan },
-  TSText = { fg = C.fg },
+  TSText = { fg = C.base1 },
   TSTextReference = { fg = C.red },
   TSPunctDelimiter = { fg = C.red },
   TSTagDelimiter = { fg = C.red },
@@ -48,19 +48,19 @@ local Treesitter = {
   TSTag = { fg = C.green },
   TSEmphasis = { style = 'italic' },
   TSUnderline = { style = 'underline' },
-  TSNote = { fg = C.info_yellow, style = 'bold' },
-  TSWarning = { fg = C.warning_orange, style = 'bold' },
-  TSDanger = { fg = C.error_red, style = 'bold' },
-  TSTitle = { fg = C.fg, style = 'bold' },
+  TSNote = { fg = C.yellow, style = 'bold' },
+  TSWarning = { fg = C.orange, style = 'bold' },
+  TSDanger = { fg = C.red, style = 'bold' },
+  TSTitle = { fg = C.base1, style = 'bold' },
   TSLiteral = { fg = C.green },
   TSURI = { fg = C.blue, style = 'underline' },
-  TSMath = { fg = C.fg },
+  TSMath = { fg = C.base1 },
   TSKeywordOperator = { fg = C.green },
-  TSStructure = { fg = C.fg },
-  TSStrong = { fg = C.yellow_orange },
-  TSQueryLinterError = { fg = C.warning_orange },
-  TSEnvironment = { fg = C.fg },
-  TSEnvironmentName = { fg = C.fg },
+  TSStructure = { fg = C.base1 },
+  TSStrong = { fg = C.yellow },
+  TSQueryLinterError = { fg = C.orange },
+  TSEnvironment = { fg = C.base1 },
+  TSEnvironmentName = { fg = C.base1 },
 }
 
 return Treesitter
diff --git a/lua/solarized/Whichkey.lua b/lua/solarized/Whichkey.lua
index 3ee2808..9497559 100644
--- a/lua/solarized/Whichkey.lua
+++ b/lua/solarized/Whichkey.lua
@@ -1,9 +1,9 @@
 local Whichkey = {
-  WhichKey = { fg = C.purple },
+  WhichKey = { fg = C.violet },
   WhichKeySeperator = { fg = C.green },
   WhichKeyGroup = { fg = C.cyan },
   WhichKeyDesc = { fg = C.blue },
-  WhichKeyFloat = { bg = C.alt_bg },
+  WhichKeyFloat = { bg = C.base02 },
 }
 
 return Whichkey
diff --git a/lua/solarized/highlights.lua b/lua/solarized/highlights.lua
index 6443111..e282760 100644
--- a/lua/solarized/highlights.lua
+++ b/lua/solarized/highlights.lua
@@ -1,59 +1,68 @@
+function is_transparent(color)
+  if vim.g.transparent_background then
+    return "NONE"
+  end
+
+  return color
+end
+
+
 local highlights = {
-  Normal = { fg = C.fg, bg = Config.transparent_background and 'NONE' or C.bg },
-  SignColumn = { bg = C.bg },
-  MsgArea = { fg = C.fg, bg = Config.transparent_background and 'NONE' or C.bg },
-  ModeMsg = { fg = C.fg, bg = C.bg },
-  MsgSeparator = { fg = C.fg, bg = C.bg },
-  SpellBad = { fg = C.error_red, style = 'underline' },
-  SpellCap = { fg = C.yellow, style = 'underline' },
-  SpellLocal = { fg = C.green, style = 'underline' },
-  SpellRare = { fg = C.purple, style = 'underline' },
-  NormalNC = { fg = C.fg, bg = Config.transparent_background and 'NONE' or C.bg },
-  Pmenu = { fg = C.light_gray, bg = C.popup_back },
-  PmenuSel = { fg = C.alt_bg, bg = C.blue },
-  WildMenu = { fg = C.alt_bg, bg = C.blue },
-  CursorLineNr = { fg = C.light_gray, style = 'bold' },
-  Comment = { fg = C.gray, style = 'italic' },
-  Folded = { fg = C.accent, bg = C.alt_bg },
-  FoldColumn = { fg = C.accent, bg = C.alt_bg },
-  LineNr = { fg = C.context },
-  FloatBoder = { fg = C.gray, bg = C.alt_bg },
-  Whitespace = { fg = C.bg },
-  VertSplit = { fg = C.fg, bg = C.bg },
-  CursorLine = { bg = C.dark },
-  CursorColumn = { bg = C.dark },
-  ColorColumn = { bg = C.dark },
-  NormalFloat = { bg = C.dark },
-  Visual = { bg = C.ui_blue },
-  VisualNOS = { bg = C.alt_bg },
-  WarningMsg = { fg = C.error_red, bg = C.bg },
-  DiffAdd = { fg = C.alt_bg, bg = C.sign_add },
-  DiffChange = { fg = C.alt_bg, bg = C.sign_change, style = 'underline' },
-  DiffDelete = { fg = C.alt_bg, bg = C.sign_delete },
-  QuickFixLine = { bg = C.dark_gray },
-  PmenuSbar = { bg = C.alt_bg },
-  PmenuThumb = { bg = C.gray },
+  Normal = { fg = C.base1, bg = Config.transparent_background and 'NONE' or C.base03 },
+  SignColumn = { fg = C.base0 },
+  MsgArea = { fg = C.base1, bg = Config.transparent_background and 'NONE' or C.base02 },
+  ModeMsg = { fg = C.blue },
+  MsgSeparator = { fg = C.base1, bg = C.base02 },
+  SpellBad = { fg = C.red, style = 'underline' },
+  SpellCap = { fg = C.violet, style = 'underline' },
+  SpellLocal = { fg = C.yellow, style = 'underline' },
+  SpellRare = { fg = C.cyan, style = 'underline' },
+  NormalNC = { fg = C.base1, bg = Config.transparent_background and 'NONE' or C.base02 },
+  Pmenu = { fg = C.base0, bg = C.base02 },
+  PmenuSel = { fg = C.base01, bg = C.base2 },
+  WildMenu = { fg = C.base2, bg = C.base02 },
+  CursorLineNr = { bg = C.base02, style = 'bold' },
+  Comment = { fg = C.base0, style = 'italic' },
+  Folded = { fg = C.base0, bg = C.base02 },
+  FoldColumn = { fg = C.base0, bg = C.base02 },
+  LineNr = { fg = C.base01, bg = C.base02 },
+  FloatBoder = { fg = C.base0, bg = C.base02 },
+  Whitespace = { fg = C.base02 },
+  VertSplit = { fg = C.base00, bg = is_transparent(C.base00)},
+  CursorLine = { bg = C.base02 },
+  CursorColumn = { bg = C.base02 },
+  ColorColumn = { bg = C.base02 },
+  NormalFloat = { bg = C.base02 },
+  Visual = { fg = C.base01, bg = C.base03 },
+  VisualNOS = { bg = C.base02 },
+  WarningMsg = { fg = C.red, style = 'bold' },
+  DiffAdd = { fg = C.green },
+  DiffChange = { fg = C.yellow, style = 'underline' },
+  DiffDelete = { fg = C.red },
+  QuickFixLine = { bg = C.base02 },
+  PmenuSbar = { fg = C.base2, bg = C.base0 },
+  PmenuThumb = { fg = C.base0, bg = C.base03 },
   MatchWord = { style = 'underline' },
-  MatchParen = { fg = C.hint_blue, bg = C.bg, style = 'underline' },
+  MatchParen = { fg = C.red, bg = C.base01, style = 'underline' },
   MatchWordCur = { style = 'underline' },
   MatchParenCur = { style = 'underline' },
-  Cursor = { fg = C.cursor_fg, bg = C.cursor_bg },
-  lCursor = { fg = C.cursor_fg, bg = C.cursor_bg },
-  CursorIM = { fg = C.cursor_fg, bg = C.cursor_bg },
-  TermCursor = { fg = C.cursor_fg, bg = C.cursor_bg },
-  TermCursorNC = { fg = C.cursor_fg, bg = C.cursor_bg },
-  Conceal = { fg = C.accent },
+  Cursor = { fg = C.base03, bg = C.base0 },
+  lCursor = { fg = C.base03, bg = C.base0 },
+  CursorIM = { fg = C.base01, bg = C.base0 },
+  TermCursor = { fg = C.base03, bg = C.base0 },
+  TermCursorNC = { fg = C.base03, bg = C.base0 },
+  Conceal = { fg = C.blue },
   Directory = { fg = C.blue },
   SpecialKey = { fg = C.blue, style = 'bold' },
-  Title = { fg = C.blue, style = 'bold' },
-  ErrorMsg = { fg = C.error_red, bg = C.bg, style = 'bold' },
-  Search = { fg = C.light_gray, bg = C.search_blue },
-  IncSearch = { fg = C.light_gray, bg = C.search_blue },
-  Substitute = { fg = C.light_gray, bg = C.search_orange },
-  MoreMsg = { fg = C.orange },
-  Question = { fg = C.orange },
-  EndOfBuffer = { fg = C.bg },
-  NonText = { fg = C.context },
+  Title = { fg = C.orange, style = 'bold' },
+  ErrorMsg = { fg = C.red, bg = C.base02, style = 'bold' },
+  Search = { fg = C.yellow },
+  IncSearch = { fg = C.orange },
+  Substitute = { fg = C.base0, bg = C.orange },
+  MoreMsg = { fg = C.blue },
+  Question = { fg = C.cyan },
+  EndOfBuffer = { fg = C.base02 },
+  NonText = { fg = C.base00 },
   Variable = { fg = C.cyan },
   String = { fg = C.green },
   Character = { fg = C.green },
@@ -61,39 +70,39 @@ local highlights = {
   Number = { fg = C.orange },
   Boolean = { fg = C.orange },
   Float = { fg = C.orange },
-  Identifier = { fg = C.fg },
+  Identifier = { fg = C.base1 },
   Function = { fg = C.blue },
-  Operator = { fg = C.purple },
+  Operator = { fg = C.violet },
   Type = { fg = C.yellow },
   StorageClass = { fg = C.cyan },
-  Structure = { fg = C.purple },
-  Typedef = { fg = C.purple },
-  Keyword = { fg = C.purple },
-  Statement = { fg = C.purple },
-  Conditional = { fg = C.purple },
-  Repeat = { fg = C.purple },
+  Structure = { fg = C.violet },
+  Typedef = { fg = C.violet },
+  Keyword = { fg = C.violet },
+  Statement = { fg = C.violet },
+  Conditional = { fg = C.violet },
+  Repeat = { fg = C.violet },
   Label = { fg = C.blue },
-  Exception = { fg = C.purple },
-  Include = { fg = C.purple },
-  PreProc = { fg = C.purple },
-  Define = { fg = C.purple },
-  Macro = { fg = C.purple },
-  PreCondit = { fg = C.purple },
-  Special = { fg = C.purple },
-  SpecialChar = { fg = C.fg },
+  Exception = { fg = C.violet },
+  Include = { fg = C.violet },
+  PreProc = { fg = C.violet },
+  Define = { fg = C.violet },
+  Macro = { fg = C.violet },
+  PreCondit = { fg = C.violet },
+  Special = { fg = C.base02 },
+  SpecialChar = { fg = C.base1 },
   Tag = { fg = C.blue },
   Debug = { fg = C.red },
-  Delimiter = { fg = C.fg },
-  SpecialComment = { fg = C.gray },
+  Delimiter = { fg = C.base1 },
+  SpecialComment = { fg = C.base0 },
   Underlined = { style = 'underline' },
   Bold = { style = 'bold' },
   Italic = { style = 'italic' },
-  Ignore = { fg = C.cyan, bg = C.bg, style = 'bold' },
-  Todo = { fg = C.red, bg = C.bg, style = 'bold' },
-  Error = { fg = C.error_red, bg = C.bg, style = 'bold' },
-  TabLine = { fg = C.light_gray, bg = C.alt_bg },
-  TabLineSel = { fg = C.fg, bg = C.alt_bg },
-  TabLineFill = { fg = C.fg, bg = C.alt_bg },
+  Ignore = { fg = C.cyan, bg = C.base02, style = 'bold' },
+  Todo = { fg = C.red, bg = C.base02, style = 'bold' },
+  Error = { fg = C.red, bg = C.base02, style = 'bold' },
+  TabLine = { fg = C.base0, bg = C.base02 },
+  TabLineSel = { fg = C.base01, bg = C.base2 },
+  TabLineFill = { fg = C.base0, bg = C.base02 },
 }
 
 return highlights
diff --git a/lua/solarized/markdown.lua b/lua/solarized/markdown.lua
index 6c760d5..3a09083 100644
--- a/lua/solarized/markdown.lua
+++ b/lua/solarized/markdown.lua
@@ -1,5 +1,5 @@
 local markdown = {
-  markdownBlockquote = { fg = C.accent },
+  markdownBlockquote = { fg = C.base0 },
   markdownBold = { fg = C.yellow, style = 'bold' },
   markdownCode = { fg = C.green },
   markdownCodeBlock = { fg = C.green },
@@ -11,16 +11,16 @@ local markdown = {
   markdownH5 = { fg = C.blue },
   markdownH6 = { fg = C.blue },
   markdownHeadingDelimiter = { fg = C.blue },
-  markdownHeadingRule = { fg = C.accent },
-  markdownId = { fg = C.purple },
+  markdownHeadingRule = { fg = C.base0 },
+  markdownId = { fg = C.violet },
   markdownIdDeclaration = { fg = C.blue },
-  markdownIdDelimiter = { fg = C.light_gray },
-  markdownLinkDelimiter = { fg = C.light_gray },
+  markdownIdDelimiter = { fg = C.base0 },
+  markdownLinkDelimiter = { fg = C.base0 },
   markdownItalic = { style = 'italic' },
   markdownLinkText = { fg = C.blue },
   markdownListMarker = { fg = C.red },
   markdownOrderedListMarker = { fg = C.red },
-  markdownRule = { fg = C.accent },
+  markdownRule = { fg = C.base0 },
   markdownUrl = { fg = C.cyan, style = 'underline' },
 }
 
diff --git a/lua/solarized/palette.lua b/lua/solarized/palette.lua
index 87bcb5e..e267618 100644
--- a/lua/solarized/palette.lua
+++ b/lua/solarized/palette.lua
@@ -1,39 +1,20 @@
 local colors = {
-  fg = '#93a1a1',
-  bg = '#002b36',
-  alt_bg = '#073642',
-  dark = '#073642',
-  accent = '#839496',
-  dark_gray = '#657373',
-  context = '#657683',
-  popup_back = '#073642',
-  search_orange = '#cb4b16',
-  search_blue = '#185682',
-  gray = '#5c6370',
-  light_gray = '#657b83',
-  blue = '#268bd2',
-  dark_blue = '#185682',
-  green = '#859900',
-  cyan = '#2aa198',
-  red = '#dc322f',
-  orange = '#cb4b16',
-  light_red = '#e77371',
+  base03 = '#002b38',
+  base02 = '#073642',
+  base01 = '#586e75',
+  base00 = ' #657b83',
+  base0 = '#839496',
+  base1 = '#93a1a1',
+  base2 = '#eee8d5',
+  base3 = '#fdf6e3',
   yellow = '#b58900',
-  yellow_orange = '#feb614',
-  purple = '#6c71c4',
-  magenta = '#D16D9E',
-  cursor_fg = '#515052',
-  cursor_bg = '#AEAFAD',
-  sign_add = '#859900',
-  sign_change = '#268bd2',
-  sign_delete = '#dc2322',
-  error_red = '#dc2322',
-  warning_orange = '#cb4b16',
-  info_yellow = '#b58900',
-  hint_blue = '#268bd2',
-  purple_test = '#d33682',
-  cyan_test = '#268bd2',
-  ui_blue = '#134568',
+  orange = '#cb4b16',
+  red = '#dc322f',
+  magenta = '#d33682',
+  violet = '#6c71c4',
+  blue = '#268bd2',
+  cyan = '#2aa198',
+  green = '#859900',
 }
 
 return colors