diff --git a/extras/fish/tokyonight_day.fish b/extras/fish/tokyonight_day.fish
index 00d6736..0a73a06 100644
--- a/extras/fish/tokyonight_day.fish
+++ b/extras/fish/tokyonight_day.fish
@@ -9,7 +9,7 @@
     set -l purple 7847bd
     set -l cyan 007197
     set -l pink 9854f1
-    
+
     # Syntax Highlighting Colors
     set -g fish_color_normal $foreground
     set -g fish_color_command $cyan
@@ -25,11 +25,12 @@
     set -g fish_color_operator $green
     set -g fish_color_escape $pink
     set -g fish_color_autosuggestion $comment
-    
+
     # Completion Pager Colors
     set -g fish_pager_color_progress $comment
     set -g fish_pager_color_prefix $cyan
     set -g fish_pager_color_completion $foreground
     set -g fish_pager_color_description $comment
-    
+    set -g fish_pager_color_selected_background --background=$selection
+
   
\ No newline at end of file
diff --git a/extras/fish/tokyonight_moon.fish b/extras/fish/tokyonight_moon.fish
index 332d50d..2acc461 100644
--- a/extras/fish/tokyonight_moon.fish
+++ b/extras/fish/tokyonight_moon.fish
@@ -9,7 +9,7 @@
     set -l purple fca7ea
     set -l cyan 86e1fc
     set -l pink c099ff
-    
+
     # Syntax Highlighting Colors
     set -g fish_color_normal $foreground
     set -g fish_color_command $cyan
@@ -25,11 +25,12 @@
     set -g fish_color_operator $green
     set -g fish_color_escape $pink
     set -g fish_color_autosuggestion $comment
-    
+
     # Completion Pager Colors
     set -g fish_pager_color_progress $comment
     set -g fish_pager_color_prefix $cyan
     set -g fish_pager_color_completion $foreground
     set -g fish_pager_color_description $comment
-    
+    set -g fish_pager_color_selected_background --background=$selection
+
   
\ No newline at end of file
diff --git a/extras/fish/tokyonight_night.fish b/extras/fish/tokyonight_night.fish
index 0558b11..58edd99 100644
--- a/extras/fish/tokyonight_night.fish
+++ b/extras/fish/tokyonight_night.fish
@@ -9,7 +9,7 @@
     set -l purple 9d7cd8
     set -l cyan 7dcfff
     set -l pink bb9af7
-    
+
     # Syntax Highlighting Colors
     set -g fish_color_normal $foreground
     set -g fish_color_command $cyan
@@ -25,11 +25,12 @@
     set -g fish_color_operator $green
     set -g fish_color_escape $pink
     set -g fish_color_autosuggestion $comment
-    
+
     # Completion Pager Colors
     set -g fish_pager_color_progress $comment
     set -g fish_pager_color_prefix $cyan
     set -g fish_pager_color_completion $foreground
     set -g fish_pager_color_description $comment
-    
+    set -g fish_pager_color_selected_background --background=$selection
+
   
\ No newline at end of file
diff --git a/extras/fish/tokyonight_storm.fish b/extras/fish/tokyonight_storm.fish
index 4f6b1f0..0fd59a7 100644
--- a/extras/fish/tokyonight_storm.fish
+++ b/extras/fish/tokyonight_storm.fish
@@ -9,7 +9,7 @@
     set -l purple 9d7cd8
     set -l cyan 7dcfff
     set -l pink bb9af7
-    
+
     # Syntax Highlighting Colors
     set -g fish_color_normal $foreground
     set -g fish_color_command $cyan
@@ -25,11 +25,12 @@
     set -g fish_color_operator $green
     set -g fish_color_escape $pink
     set -g fish_color_autosuggestion $comment
-    
+
     # Completion Pager Colors
     set -g fish_pager_color_progress $comment
     set -g fish_pager_color_prefix $cyan
     set -g fish_pager_color_completion $foreground
     set -g fish_pager_color_description $comment
-    
+    set -g fish_pager_color_selected_background --background=$selection
+
   
\ No newline at end of file
diff --git a/extras/lua/tokyonight_day.lua b/extras/lua/tokyonight_day.lua
index dfc3fa2..1f60c66 100644
--- a/extras/lua/tokyonight_day.lua
+++ b/extras/lua/tokyonight_day.lua
@@ -104,7 +104,7 @@ local highlights = {
     fg = "#f52a65"
   },
   BufferLineIndicatorSelected = {
-    fg = "#506d9b"
+    fg = "#6183b9"
   },
   BufferTabpage = {
     bg = "#e9e9ec",
@@ -403,22 +403,22 @@ local highlights = {
     style = {}
   },
   GitGutterAdd = {
-    fg = "#399a96"
+    fg = "#266d6a"
   },
   GitGutterChange = {
-    fg = "#6382bd"
+    fg = "#526c9e"
   },
   GitGutterDelete = {
-    fg = "#c25d64"
+    fg = "#b2555b"
   },
   GitSignsAdd = {
-    fg = "#399a96"
+    fg = "#266d6a"
   },
   GitSignsChange = {
-    fg = "#6382bd"
+    fg = "#526c9e"
   },
   GitSignsDelete = {
-    fg = "#c25d64"
+    fg = "#b2555b"
   },
   GlyphPalette1 = {
     fg = "#c64343"
@@ -762,6 +762,122 @@ local highlights = {
   MsgArea = {
     fg = "#6172b0"
   },
+  NavicIconsArray = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NavicIconsBoolean = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NavicIconsClass = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NavicIconsConstant = {
+    bg = "NONE",
+    fg = "#9854f1"
+  },
+  NavicIconsConstructor = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NavicIconsEnum = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NavicIconsEnumMember = {
+    bg = "NONE",
+    fg = "#387068"
+  },
+  NavicIconsEvent = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NavicIconsField = {
+    bg = "NONE",
+    fg = "#387068"
+  },
+  NavicIconsFile = {
+    bg = "NONE",
+    fg = "#3760bf"
+  },
+  NavicIconsFunction = {
+    bg = "NONE",
+    fg = "#2e7de9"
+  },
+  NavicIconsInterface = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NavicIconsKey = {
+    bg = "NONE",
+    fg = "#7847bd"
+  },
+  NavicIconsKeyword = {
+    bg = "NONE",
+    fg = "#7847bd"
+  },
+  NavicIconsMethod = {
+    bg = "NONE",
+    fg = "#2e7de9"
+  },
+  NavicIconsModule = {
+    bg = "NONE",
+    fg = "#8c6c3e"
+  },
+  NavicIconsNamespace = {
+    bg = "NONE",
+    fg = "#3760bf"
+  },
+  NavicIconsNull = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NavicIconsNumber = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NavicIconsObject = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NavicIconsOperator = {
+    bg = "NONE",
+    fg = "#3760bf"
+  },
+  NavicIconsPackage = {
+    bg = "NONE",
+    fg = "#3760bf"
+  },
+  NavicIconsProperty = {
+    bg = "NONE",
+    fg = "#387068"
+  },
+  NavicIconsString = {
+    bg = "NONE",
+    fg = "#587539"
+  },
+  NavicIconsStruct = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NavicIconsTypeParameter = {
+    bg = "NONE",
+    fg = "#387068"
+  },
+  NavicIconsVariable = {
+    bg = "NONE",
+    fg = "#9854f1"
+  },
+  NavicSeparator = {
+    bg = "NONE",
+    fg = "#3760bf"
+  },
+  NavicText = {
+    bg = "NONE",
+    fg = "#3760bf"
+  },
   NeoTreeNormal = {
     bg = "#e9e9ec",
     fg = "#6172b0"
@@ -775,7 +891,7 @@ local highlights = {
   },
   NeogitDiffAddHighlight = {
     bg = "#aecde6",
-    fg = "#4097a3"
+    fg = "#2c6c75"
   },
   NeogitDiffContextHighlight = {
     bg = "#c3c6d8",
@@ -783,7 +899,7 @@ local highlights = {
   },
   NeogitDiffDeleteHighlight = {
     bg = "#dfccd4",
-    fg = "#c47981"
+    fg = "#914c54"
   },
   NeogitHunkHeader = {
     bg = "#c4c8da",
@@ -820,13 +936,13 @@ local highlights = {
     fg = "#8c6c3e"
   },
   NvimTreeGitDeleted = {
-    fg = "#c47981"
+    fg = "#914c54"
   },
   NvimTreeGitDirty = {
-    fg = "#506d9b"
+    fg = "#6183b9"
   },
   NvimTreeGitNew = {
-    fg = "#4097a3"
+    fg = "#2c6c75"
   },
   NvimTreeImageFile = {
     fg = "#6172b0"
@@ -856,6 +972,10 @@ local highlights = {
   NvimTreeSymlink = {
     fg = "#2e7de9"
   },
+  NvimTreeWinSeparator = {
+    bg = "#e9e9ec",
+    fg = "#e9e9ec"
+  },
   Operator = {
     fg = "#006a83"
   },
@@ -1161,10 +1281,10 @@ local highlights = {
     bg = "#e9e9ec"
   },
   diffAdded = {
-    fg = "#4097a3"
+    fg = "#2c6c75"
   },
   diffChanged = {
-    fg = "#506d9b"
+    fg = "#6183b9"
   },
   diffFile = {
     fg = "#2e7de9"
@@ -1182,7 +1302,7 @@ local highlights = {
     fg = "#8c6c3e"
   },
   diffRemoved = {
-    fg = "#c47981"
+    fg = "#914c54"
   },
   healthError = {
     fg = "#c64343"
diff --git a/extras/lua/tokyonight_moon.lua b/extras/lua/tokyonight_moon.lua
index 365ac5d..97226cf 100644
--- a/extras/lua/tokyonight_moon.lua
+++ b/extras/lua/tokyonight_moon.lua
@@ -779,6 +779,122 @@ local highlights = {
   MsgArea = {
     fg = "#828bb8"
   },
+  NavicIconsArray = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NavicIconsBoolean = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NavicIconsClass = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NavicIconsConstant = {
+    bg = "NONE",
+    fg = "#c099ff"
+  },
+  NavicIconsConstructor = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NavicIconsEnum = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NavicIconsEnumMember = {
+    bg = "NONE",
+    fg = "#4fd6be"
+  },
+  NavicIconsEvent = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NavicIconsField = {
+    bg = "NONE",
+    fg = "#4fd6be"
+  },
+  NavicIconsFile = {
+    bg = "NONE",
+    fg = "#c8d3f5"
+  },
+  NavicIconsFunction = {
+    bg = "NONE",
+    fg = "#82aaff"
+  },
+  NavicIconsInterface = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NavicIconsKey = {
+    bg = "NONE",
+    fg = "#fca7ea"
+  },
+  NavicIconsKeyword = {
+    bg = "NONE",
+    fg = "#fca7ea"
+  },
+  NavicIconsMethod = {
+    bg = "NONE",
+    fg = "#82aaff"
+  },
+  NavicIconsModule = {
+    bg = "NONE",
+    fg = "#ffc777"
+  },
+  NavicIconsNamespace = {
+    bg = "NONE",
+    fg = "#c8d3f5"
+  },
+  NavicIconsNull = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NavicIconsNumber = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NavicIconsObject = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NavicIconsOperator = {
+    bg = "NONE",
+    fg = "#c8d3f5"
+  },
+  NavicIconsPackage = {
+    bg = "NONE",
+    fg = "#c8d3f5"
+  },
+  NavicIconsProperty = {
+    bg = "NONE",
+    fg = "#4fd6be"
+  },
+  NavicIconsString = {
+    bg = "NONE",
+    fg = "#c3e88d"
+  },
+  NavicIconsStruct = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NavicIconsTypeParameter = {
+    bg = "NONE",
+    fg = "#4fd6be"
+  },
+  NavicIconsVariable = {
+    bg = "NONE",
+    fg = "#c099ff"
+  },
+  NavicSeparator = {
+    bg = "NONE",
+    fg = "#c8d3f5"
+  },
+  NavicText = {
+    bg = "NONE",
+    fg = "#c8d3f5"
+  },
   NeoTreeNormal = {
     bg = "#1e2030",
     fg = "#828bb8"
@@ -873,6 +989,10 @@ local highlights = {
   NvimTreeSymlink = {
     fg = "#82aaff"
   },
+  NvimTreeWinSeparator = {
+    bg = "#1e2030",
+    fg = "#1e2030"
+  },
   Operator = {
     fg = "#89ddff"
   },
diff --git a/extras/lua/tokyonight_night.lua b/extras/lua/tokyonight_night.lua
index c5de5b8..30ff3dd 100644
--- a/extras/lua/tokyonight_night.lua
+++ b/extras/lua/tokyonight_night.lua
@@ -34,15 +34,15 @@ local colors = {
   fg_gutter = "#3b4261",
   fg_sidebar = "#a9b1d6",
   git = {
-    add = "#4097a3",
-    change = "#506d9b",
-    delete = "#c47981",
+    add = "#2c6c75",
+    change = "#6183b9",
+    delete = "#914c54",
     ignore = "#545c7e"
   },
   gitSigns = {
-    add = "#399a96",
-    change = "#6382bd",
-    delete = "#c25d64"
+    add = "#266d6a",
+    change = "#526c9e",
+    delete = "#b2555b"
   },
   green = "#9ece6a",
   green1 = "#73daca",
@@ -121,7 +121,7 @@ local highlights = {
     fg = "#f7768e"
   },
   BufferLineIndicatorSelected = {
-    fg = "#506d9b"
+    fg = "#6183b9"
   },
   BufferTabpage = {
     bg = "#16161e",
@@ -420,22 +420,22 @@ local highlights = {
     style = {}
   },
   GitGutterAdd = {
-    fg = "#399a96"
+    fg = "#266d6a"
   },
   GitGutterChange = {
-    fg = "#6382bd"
+    fg = "#526c9e"
   },
   GitGutterDelete = {
-    fg = "#c25d64"
+    fg = "#b2555b"
   },
   GitSignsAdd = {
-    fg = "#399a96"
+    fg = "#266d6a"
   },
   GitSignsChange = {
-    fg = "#6382bd"
+    fg = "#526c9e"
   },
   GitSignsDelete = {
-    fg = "#c25d64"
+    fg = "#b2555b"
   },
   GlyphPalette1 = {
     fg = "#db4b4b"
@@ -779,6 +779,122 @@ local highlights = {
   MsgArea = {
     fg = "#a9b1d6"
   },
+  NavicIconsArray = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsBoolean = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsClass = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsConstant = {
+    bg = "NONE",
+    fg = "#bb9af7"
+  },
+  NavicIconsConstructor = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsEnum = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsEnumMember = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NavicIconsEvent = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsField = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NavicIconsFile = {
+    bg = "NONE",
+    fg = "#c0caf5"
+  },
+  NavicIconsFunction = {
+    bg = "NONE",
+    fg = "#7aa2f7"
+  },
+  NavicIconsInterface = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsKey = {
+    bg = "NONE",
+    fg = "#9d7cd8"
+  },
+  NavicIconsKeyword = {
+    bg = "NONE",
+    fg = "#9d7cd8"
+  },
+  NavicIconsMethod = {
+    bg = "NONE",
+    fg = "#7aa2f7"
+  },
+  NavicIconsModule = {
+    bg = "NONE",
+    fg = "#e0af68"
+  },
+  NavicIconsNamespace = {
+    bg = "NONE",
+    fg = "#c0caf5"
+  },
+  NavicIconsNull = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsNumber = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsObject = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsOperator = {
+    bg = "NONE",
+    fg = "#c0caf5"
+  },
+  NavicIconsPackage = {
+    bg = "NONE",
+    fg = "#c0caf5"
+  },
+  NavicIconsProperty = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NavicIconsString = {
+    bg = "NONE",
+    fg = "#9ece6a"
+  },
+  NavicIconsStruct = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsTypeParameter = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NavicIconsVariable = {
+    bg = "NONE",
+    fg = "#bb9af7"
+  },
+  NavicSeparator = {
+    bg = "NONE",
+    fg = "#c0caf5"
+  },
+  NavicText = {
+    bg = "NONE",
+    fg = "#c0caf5"
+  },
   NeoTreeNormal = {
     bg = "#16161e",
     fg = "#a9b1d6"
@@ -792,7 +908,7 @@ local highlights = {
   },
   NeogitDiffAddHighlight = {
     bg = "#20303b",
-    fg = "#4097a3"
+    fg = "#2c6c75"
   },
   NeogitDiffContextHighlight = {
     bg = "#2b2f44",
@@ -800,7 +916,7 @@ local highlights = {
   },
   NeogitDiffDeleteHighlight = {
     bg = "#37222c",
-    fg = "#c47981"
+    fg = "#914c54"
   },
   NeogitHunkHeader = {
     bg = "#292e42",
@@ -837,13 +953,13 @@ local highlights = {
     fg = "#e0af68"
   },
   NvimTreeGitDeleted = {
-    fg = "#c47981"
+    fg = "#914c54"
   },
   NvimTreeGitDirty = {
-    fg = "#506d9b"
+    fg = "#6183b9"
   },
   NvimTreeGitNew = {
-    fg = "#4097a3"
+    fg = "#2c6c75"
   },
   NvimTreeImageFile = {
     fg = "#a9b1d6"
@@ -873,6 +989,10 @@ local highlights = {
   NvimTreeSymlink = {
     fg = "#7aa2f7"
   },
+  NvimTreeWinSeparator = {
+    bg = "#16161e",
+    fg = "#16161e"
+  },
   Operator = {
     fg = "#89ddff"
   },
@@ -1178,10 +1298,10 @@ local highlights = {
     bg = "#16161e"
   },
   diffAdded = {
-    fg = "#4097a3"
+    fg = "#2c6c75"
   },
   diffChanged = {
-    fg = "#506d9b"
+    fg = "#6183b9"
   },
   diffFile = {
     fg = "#7aa2f7"
@@ -1199,7 +1319,7 @@ local highlights = {
     fg = "#e0af68"
   },
   diffRemoved = {
-    fg = "#c47981"
+    fg = "#914c54"
   },
   healthError = {
     fg = "#db4b4b"
diff --git a/extras/lua/tokyonight_storm.lua b/extras/lua/tokyonight_storm.lua
index 965d62b..cb9e654 100644
--- a/extras/lua/tokyonight_storm.lua
+++ b/extras/lua/tokyonight_storm.lua
@@ -34,15 +34,15 @@ local colors = {
   fg_gutter = "#3b4261",
   fg_sidebar = "#a9b1d6",
   git = {
-    add = "#4097a3",
-    change = "#506d9b",
-    delete = "#c47981",
+    add = "#2c6c75",
+    change = "#6183b9",
+    delete = "#914c54",
     ignore = "#545c7e"
   },
   gitSigns = {
-    add = "#399a96",
-    change = "#6382bd",
-    delete = "#c25d64"
+    add = "#266d6a",
+    change = "#526c9e",
+    delete = "#b2555b"
   },
   green = "#9ece6a",
   green1 = "#73daca",
@@ -121,7 +121,7 @@ local highlights = {
     fg = "#f7768e"
   },
   BufferLineIndicatorSelected = {
-    fg = "#506d9b"
+    fg = "#6183b9"
   },
   BufferTabpage = {
     bg = "#1f2335",
@@ -420,22 +420,22 @@ local highlights = {
     style = {}
   },
   GitGutterAdd = {
-    fg = "#399a96"
+    fg = "#266d6a"
   },
   GitGutterChange = {
-    fg = "#6382bd"
+    fg = "#526c9e"
   },
   GitGutterDelete = {
-    fg = "#c25d64"
+    fg = "#b2555b"
   },
   GitSignsAdd = {
-    fg = "#399a96"
+    fg = "#266d6a"
   },
   GitSignsChange = {
-    fg = "#6382bd"
+    fg = "#526c9e"
   },
   GitSignsDelete = {
-    fg = "#c25d64"
+    fg = "#b2555b"
   },
   GlyphPalette1 = {
     fg = "#db4b4b"
@@ -779,6 +779,122 @@ local highlights = {
   MsgArea = {
     fg = "#a9b1d6"
   },
+  NavicIconsArray = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsBoolean = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsClass = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsConstant = {
+    bg = "NONE",
+    fg = "#bb9af7"
+  },
+  NavicIconsConstructor = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsEnum = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsEnumMember = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NavicIconsEvent = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsField = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NavicIconsFile = {
+    bg = "NONE",
+    fg = "#c0caf5"
+  },
+  NavicIconsFunction = {
+    bg = "NONE",
+    fg = "#7aa2f7"
+  },
+  NavicIconsInterface = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsKey = {
+    bg = "NONE",
+    fg = "#9d7cd8"
+  },
+  NavicIconsKeyword = {
+    bg = "NONE",
+    fg = "#9d7cd8"
+  },
+  NavicIconsMethod = {
+    bg = "NONE",
+    fg = "#7aa2f7"
+  },
+  NavicIconsModule = {
+    bg = "NONE",
+    fg = "#e0af68"
+  },
+  NavicIconsNamespace = {
+    bg = "NONE",
+    fg = "#c0caf5"
+  },
+  NavicIconsNull = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsNumber = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsObject = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsOperator = {
+    bg = "NONE",
+    fg = "#c0caf5"
+  },
+  NavicIconsPackage = {
+    bg = "NONE",
+    fg = "#c0caf5"
+  },
+  NavicIconsProperty = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NavicIconsString = {
+    bg = "NONE",
+    fg = "#9ece6a"
+  },
+  NavicIconsStruct = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NavicIconsTypeParameter = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NavicIconsVariable = {
+    bg = "NONE",
+    fg = "#bb9af7"
+  },
+  NavicSeparator = {
+    bg = "NONE",
+    fg = "#c0caf5"
+  },
+  NavicText = {
+    bg = "NONE",
+    fg = "#c0caf5"
+  },
   NeoTreeNormal = {
     bg = "#1f2335",
     fg = "#a9b1d6"
@@ -792,7 +908,7 @@ local highlights = {
   },
   NeogitDiffAddHighlight = {
     bg = "#283b4d",
-    fg = "#4097a3"
+    fg = "#2c6c75"
   },
   NeogitDiffContextHighlight = {
     bg = "#30354e",
@@ -800,7 +916,7 @@ local highlights = {
   },
   NeogitDiffDeleteHighlight = {
     bg = "#3f2d3d",
-    fg = "#c47981"
+    fg = "#914c54"
   },
   NeogitHunkHeader = {
     bg = "#292e42",
@@ -837,13 +953,13 @@ local highlights = {
     fg = "#e0af68"
   },
   NvimTreeGitDeleted = {
-    fg = "#c47981"
+    fg = "#914c54"
   },
   NvimTreeGitDirty = {
-    fg = "#506d9b"
+    fg = "#6183b9"
   },
   NvimTreeGitNew = {
-    fg = "#4097a3"
+    fg = "#2c6c75"
   },
   NvimTreeImageFile = {
     fg = "#a9b1d6"
@@ -873,6 +989,10 @@ local highlights = {
   NvimTreeSymlink = {
     fg = "#7aa2f7"
   },
+  NvimTreeWinSeparator = {
+    bg = "#1f2335",
+    fg = "#1f2335"
+  },
   Operator = {
     fg = "#89ddff"
   },
@@ -1178,10 +1298,10 @@ local highlights = {
     bg = "#1f2335"
   },
   diffAdded = {
-    fg = "#4097a3"
+    fg = "#2c6c75"
   },
   diffChanged = {
-    fg = "#506d9b"
+    fg = "#6183b9"
   },
   diffFile = {
     fg = "#7aa2f7"
@@ -1199,7 +1319,7 @@ local highlights = {
     fg = "#e0af68"
   },
   diffRemoved = {
-    fg = "#c47981"
+    fg = "#914c54"
   },
   healthError = {
     fg = "#db4b4b"