diff --git a/lua/lualine/themes/solarized.lua b/lua/lualine/themes/solarized.lua
index ef1e2ed..725423f 100644
--- a/lua/lualine/themes/solarized.lua
+++ b/lua/lualine/themes/solarized.lua
@@ -6,7 +6,7 @@ local darken = colortool.darken
 local M = {
   normal = {
     a = { fg = darken(colors.blue), bg = colors.blue, gui = 'bold' },
-    b = { fg = darken(colors.content), bg = colors.content },
+    b = { fg = colors.bg_alt, bg = colors.content },
     c = { fg = colors.content, bg = solarized:is_transparent(colors.bg_alt) },
     z = { fg = darken(colors.primary), bg = colors.blue },
   },
diff --git a/lua/solarized/src/themes/neovim.lua b/lua/solarized/src/themes/neovim.lua
index 50ecd39..c63b3c3 100644
--- a/lua/solarized/src/themes/neovim.lua
+++ b/lua/solarized/src/themes/neovim.lua
@@ -36,11 +36,11 @@ solarized.highlights = {
   TabLine = { fg = colors.fg, bg = colors.bg_alt, sp = colors.fg },
   TabLineSel = { fg = colors.secondary, bg = colors.bg_alt_invert, sp = colors.fg, reverse = true },
   TabLineFill = { fg = colors.fg, bg = colors.bg_alt, sp = colors.fg },
-  Search = { fg = colors.yellow, reverse = true },
-  IncSearch = { fg = colors.orange },
-  CurSearch = { link = 'IncSearch' },
   Visual = { fg = colors.secondary, bg = colors.bg, reverse = true, bold = true },
-  VisualNOS = { bg = colors.bg_alt, reverse = true, bold = true },
+  VisualNOS = { reverse = true },
+  Search = { link = 'VisualNOS' },
+  IncSearch = { link = 'Visual' },
+  CurSearch = { link = 'IncSearch' },
   Folded = { fg = colors.fg, bg = colors.bg_alt, sp = colors.bg },
   FoldColumn = { fg = colors.fg, bg = colors.bg_alt },
   ColorColumn = { bg = colors.bg_alt },
@@ -423,8 +423,8 @@ solarized.highlights = {
   TelescopePreviewTitle = { fg = colors.bg, bg = colors.blue },
   TelescopeResultsTitle = { fg = colors.bg, bg = colors.blue },
   TelescopePromptTitle = { fg = colors.bg, bg = colors.blue },
-  TelescopeSelection = { fg = colors.yellow },
-  TelescopeMatching = { fg = colors.yellow, reverse = true },
+  TelescopeSelection = { link = 'Visual' },
+  TelescopeMatching = { link = 'VisualNOS' },
 
   -- DASHBOARD
   DashboardHeader = { fg = colors.primary },
diff --git a/lua/solarized/src/themes/vim.lua b/lua/solarized/src/themes/vim.lua
index 1c5d98b..b161d18 100644
--- a/lua/solarized/src/themes/vim.lua
+++ b/lua/solarized/src/themes/vim.lua
@@ -33,11 +33,11 @@ solarized.highlights = {
   TabLine = { fg = colors.fg, bg = colors.bg_alt, sp = colors.fg },
   TabLineSel = { fg = colors.secondary, bg = colors.bg_alt_invert, sp = colors.fg, reverse = true },
   TabLineFill = { fg = colors.fg, bg = colors.bg_alt, sp = colors.fg },
-  Search = { fg = colors.yellow, reverse = true },
-  IncSearch = { fg = colors.orange },
-  CurSearch = { link = 'IncSearch' },
   Visual = { fg = colors.secondary, bg = colors.bg, reverse = true, bold = true },
-  VisualNOS = { bg = colors.bg_alt, reverse = true, bold = true },
+  VisualNOS = { reverse = true },
+  Search = { link = 'VisualNOS' },
+  IncSearch = { link = 'Visual' },
+  CurSearch = { link = 'IncSearch' },
   Folded = { fg = colors.fg, bg = colors.bg_alt, sp = colors.bg },
   FoldColumn = { fg = colors.fg, bg = colors.bg_alt },
   ColorColumn = { bg = colors.bg_alt },
@@ -303,8 +303,8 @@ solarized.highlights = {
   TelescopePreviewTitle = { fg = colors.bg, bg = colors.blue },
   TelescopeResultsTitle = { fg = colors.bg, bg = colors.blue },
   TelescopePromptTitle = { fg = colors.bg, bg = colors.blue },
-  TelescopeSelection = { fg = colors.yellow },
-  TelescopeMatching = { fg = colors.yellow, reverse = true },
+  TelescopeSelection = { link = 'Visual' },
+  TelescopeMatching = { link = 'VisualNOS' },
 
   -- Dashboard
   DashboardHeader = { fg = colors.primary },
diff --git a/lua/solarized/src/themes/vscode.lua b/lua/solarized/src/themes/vscode.lua
index 54d3a2c..921aa8f 100644
--- a/lua/solarized/src/themes/vscode.lua
+++ b/lua/solarized/src/themes/vscode.lua
@@ -36,11 +36,11 @@ solarized.highlights = {
   TabLine = { fg = colors.fg, bg = colors.bg_alt, sp = colors.fg },
   TabLineSel = { fg = colors.secondary, bg = colors.bg_alt_invert, sp = colors.fg, reverse = true },
   TabLineFill = { fg = colors.fg, bg = colors.bg_alt, sp = colors.fg },
-  Search = { fg = colors.yellow, reverse = true },
-  IncSearch = { fg = colors.orange },
+  Visual = { fg = colors.cyan, bg = blend(colors.cyan, colors.bg, 0.15) },
+  VisualNOS = { reverse = true },
+  Search = { link = 'VisualNOS' },
+  IncSearch = { link = 'Visual' },
   CurSearch = { link = 'IncSearch' },
-  Visual = { fg = colors.secondary, bg = colors.bg, reverse = true, bold = true },
-  VisualNOS = { bg = colors.bg_alt, reverse = true, bold = true },
   Folded = { fg = colors.fg, bg = colors.bg_alt, sp = colors.bg },
   FoldColumn = { fg = colors.fg, bg = colors.bg_alt },
   ColorColumn = { bg = colors.bg_alt },
@@ -423,8 +423,8 @@ solarized.highlights = {
   TelescopePreviewTitle = { fg = colors.bg, bg = colors.blue },
   TelescopeResultsTitle = { fg = colors.bg, bg = colors.blue },
   TelescopePromptTitle = { fg = colors.bg, bg = colors.blue },
-  TelescopeSelection = { fg = colors.yellow },
-  TelescopeMatching = { fg = colors.yellow, reverse = true },
+  TelescopeSelection = { link = 'Visual' },
+  TelescopeMatching = { link = 'VisualNOS' },
 
   -- DASHBOARD
   DashboardHeader = { fg = colors.primary },