diff --git a/README.md b/README.md
index 7831b8a..3445f76 100644
--- a/README.md
+++ b/README.md
@@ -104,6 +104,7 @@ require('solarized').setup({
       dashboard = true,
       editor = true,
       gitsign = true,
+      hop = true,
       indentblankline = true,
       lsp = true,
       lspsaga = true,
diff --git a/lua/solarized/themes/default/editor.lua b/lua/solarized/themes/default/editor.lua
index dae0445..b39072e 100644
--- a/lua/solarized/themes/default/editor.lua
+++ b/lua/solarized/themes/default/editor.lua
@@ -67,7 +67,7 @@ return function(c, config)
   set_hl('Visual', { bg = c.base02, standout = true }) -- Visual mode selection.
   set_hl('VisualNOS', { link = 'Visual' }) -- Visual mode selection when vim is "Not Owning the Selection".
   set_hl('WarningMsg', { fg = c.warning, bold = true }) -- Warning messages.
-  -- set_hl('Whitespace', { bg = c.base02 }) -- "nbsp", "space", "tab", "multispace", "lead" and "trail" in 'listchars'.
+  set_hl('Whitespace', { fg = c.base01 }) -- "nbsp", "space", "tab", "multispace", "lead" and "trail" in 'listchars'.
   set_hl('WildMenu', { fg = c.base2, bg = c.base02 }) -- Current match in 'wildmenu' completion.
   set_hl('WinBar', { link = 'Pmenu' }) -- Window bar of current window.
   set_hl('WinBarNC', { link = 'WinBar' }) -- Window bar of not-current windows.
diff --git a/lua/solarized/themes/default/indentblankline.lua b/lua/solarized/themes/default/indentblankline.lua
index 58bc9bb..b36e21a 100644
--- a/lua/solarized/themes/default/indentblankline.lua
+++ b/lua/solarized/themes/default/indentblankline.lua
@@ -2,10 +2,18 @@ return function(c, config)
   local utils = require('solarized.utils')
   local set_hl = utils.set_hl
 
-  set_hl('IndentBlanklineChar', { fg = c.base01, bg = c.base03 }, { transparent = config.transparent }) -- Highlight of indent character.
-  set_hl('IndentBlanklineSpaceChar', { fg = c.base01, bg = c.base03 }, { transparent = config.transparent }) -- Highlight of space character.
-  -- set_hl('IndentBlanklineSpaceCharBlankline') -- Highlight of space character on blank lines.
-  set_hl('IndentBlanklineContextChar', { link = 'Keyword' }) -- Highlight of indent character when base of current context.
-  set_hl('IndentBlanklineContextSpaceChar', { link = 'Keyword' }) -- Highlight of space characters one indent level of the current context.
-  -- set_hl('IndentBlanklineContextStart') -- Highlight of the first line of the current context.
+  if vim.o.background == 'dark' then
+    set_hl('IndentBlanklineChar', { fg = '#475252' }) -- Highlight of indent character. Default: Whitespace
+    set_hl('IndentBlanklineSpaceChar', { link = 'IndentBlanklineChar' }) -- Highlight of space character. Default: Whitespace
+    set_hl('IndentBlanklineContextChar', { fg = '#647373' }) -- Highlight of indent character when base of current context. Default: Label
+    set_hl('IndentBlanklineContextSpaceChar', { link = 'IndentBlanklineContextSpaceChar' }) -- Highlight of space characters one indent level of the current context. Default: Label
+  else
+    set_hl('IndentBlanklineChar', { fg = '#cbd5d8' }) -- Highlight of indent character. Default: Whitespace
+    set_hl('IndentBlanklineSpaceChar', { link = 'IndentBlanklineChar' }) -- Highlight of space character. Default: Whitespace
+    set_hl('IndentBlanklineContextChar', { fg = '#a8b8bd' }) -- Highlight of indent character when base of current context. Default: Label
+    set_hl('IndentBlanklineContextSpaceChar', { link = 'IndentBlanklineContextSpaceChar' }) -- Highlight of space characters one indent level of the current context. Default: Label
+  end
+
+  -- set_hl('IndentBlanklineSpaceCharBlankline', {}) -- Highlight of space character on blank lines. Default: Whitespace
+  -- set_hl('IndentBlanklineContextStart', {}) -- Highlight of the first line of the current context. Default: Label
 end
diff --git a/lua/solarized/themes/default/treesitter.lua b/lua/solarized/themes/default/treesitter.lua
index 91885a1..12e86e1 100644
--- a/lua/solarized/themes/default/treesitter.lua
+++ b/lua/solarized/themes/default/treesitter.lua
@@ -87,7 +87,7 @@ return function(c, config)
   set_hl('@text.reference', { link = 'Underlined' }) -- text references, footnotes, citations, etc.
 
   set_hl('@text.literal', { link = '@text' }) -- literal or verbatim text (e.g., inline code)
-  set_hl('@text.literal.block', { link = '@text.environment.name' }) -- literal or verbatim text as a stand-alone block
+  set_hl('@text.literal.block', { link = '@text' }) -- literal or verbatim text as a stand-alone block
 
   set_hl('@text.todo', { link = 'Todo' }) -- todo notes
   set_hl('@text.note', { fg = c.info }) -- info notes
diff --git a/lua/solarized/themes/neo/editor.lua b/lua/solarized/themes/neo/editor.lua
index 34d810b..069fef4 100644
--- a/lua/solarized/themes/neo/editor.lua
+++ b/lua/solarized/themes/neo/editor.lua
@@ -73,7 +73,7 @@ return function(c, config)
   set_hl('Visual', { bg = c.base02 }) -- Visual mode selection.
   set_hl('VisualNOS', { link = 'Visual' }) -- Visual mode selection when vim is "Not Owning the Selection".
   set_hl('WarningMsg', { fg = c.warning }) -- Warning messages.
-  set_hl('Whitespace', { bg = c.base02 }) -- "nbsp", "space", "tab", "multispace", "lead" and "trail" in 'listchars'.
+  set_hl('Whitespace', { fg = c.base01 }) -- "nbsp", "space", "tab", "multispace", "lead" and "trail" in 'listchars'.
   set_hl('WildMenu', { bg = c.base02 }) -- Current match in 'wildmenu' completion.
   set_hl('WinBar', { link = 'Pmenu' }) -- Window bar of current window.
   set_hl('WinBarNC', { link = 'WinBar' }) -- Window bar of not-current windows.
diff --git a/lua/solarized/themes/neo/indentblankline.lua b/lua/solarized/themes/neo/indentblankline.lua
index 58bc9bb..a191f4d 100644
--- a/lua/solarized/themes/neo/indentblankline.lua
+++ b/lua/solarized/themes/neo/indentblankline.lua
@@ -2,10 +2,18 @@ return function(c, config)
   local utils = require('solarized.utils')
   local set_hl = utils.set_hl
 
-  set_hl('IndentBlanklineChar', { fg = c.base01, bg = c.base03 }, { transparent = config.transparent }) -- Highlight of indent character.
-  set_hl('IndentBlanklineSpaceChar', { fg = c.base01, bg = c.base03 }, { transparent = config.transparent }) -- Highlight of space character.
-  -- set_hl('IndentBlanklineSpaceCharBlankline') -- Highlight of space character on blank lines.
-  set_hl('IndentBlanklineContextChar', { link = 'Keyword' }) -- Highlight of indent character when base of current context.
-  set_hl('IndentBlanklineContextSpaceChar', { link = 'Keyword' }) -- Highlight of space characters one indent level of the current context.
-  -- set_hl('IndentBlanklineContextStart') -- Highlight of the first line of the current context.
+  if vim.o.background == 'dark' then
+    set_hl('IndentBlanklineChar', { fg = '#424d00' }) -- Highlight of indent character. Default: Whitespace
+    set_hl('IndentBlanklineSpaceChar', { link = 'IndentBlanklineChar' }) -- Highlight of space character. Default: Whitespace
+    set_hl('IndentBlanklineContextChar', { fg = '#5d6b00' }) -- Highlight of indent character when base of current context. Default: Label
+    set_hl('IndentBlanklineContextSpaceChar', { link = 'IndentBlanklineContextSpaceChar' }) -- Highlight of space characters one indent level of the current context. Default: Label
+  else
+    set_hl('IndentBlanklineChar', { fg = '#bddcf3' }) -- Highlight of indent character. Default: Whitespace
+    set_hl('IndentBlanklineSpaceChar', { link = 'IndentBlanklineChar' }) -- Highlight of space character. Default: Whitespace
+    set_hl('IndentBlanklineContextChar', { fg = '#91c5eb' }) -- Highlight of indent character when base of current context. Default: Label
+    set_hl('IndentBlanklineContextSpaceChar', { link = 'IndentBlanklineContextChar' }) -- Highlight of space characters one indent level of the current context. Default: Label
+  end
+
+  -- set_hl('IndentBlanklineSpaceCharBlankline', {}) -- Highlight of space character on blank lines. Default: Whitespace
+  -- set_hl('IndentBlanklineContextStart', {}) -- Highlight of the first line of the current context. Default: Label
 end
diff --git a/lua/solarized/themes/neo/treesitter.lua b/lua/solarized/themes/neo/treesitter.lua
index a4707e8..ceeefc9 100644
--- a/lua/solarized/themes/neo/treesitter.lua
+++ b/lua/solarized/themes/neo/treesitter.lua
@@ -87,7 +87,7 @@ return function(c, config)
   set_hl('@text.reference', { link = 'Underlined' }) -- text references, footnotes, citations, etc.
 
   set_hl('@text.literal', { link = '@text' }) -- literal or verbatim text (e.g., inline code)
-  set_hl('@text.literal.block', { link = '@text.environment.name' }) -- literal or verbatim text as a stand-alone block
+  set_hl('@text.literal.block', { link = '@text' }) -- literal or verbatim text as a stand-alone block
 
   set_hl('@text.todo', { link = 'Todo' }) -- todo notes
   set_hl('@text.note', { fg = c.info }) -- info notes