diff --git a/extras/delta/tokyonight_day.gitconfig b/extras/delta/tokyonight_day.gitconfig
index c45ecc7..3ec24fd 100644
--- a/extras/delta/tokyonight_day.gitconfig
+++ b/extras/delta/tokyonight_day.gitconfig
@@ -3,10 +3,10 @@
   minus-non-emph-style          = syntax "#dfccd4"
   minus-emph-style              = syntax "#672d33"
   minus-empty-line-marker-style = syntax "#dfccd4"
-  line-numbers-minus-style      = "#b2555b"
+  line-numbers-minus-style      = "#c25d64"
   plus-style                    = syntax "#aecde6"
   plus-non-emph-style           = syntax "#aecde6"
   plus-emph-style               = syntax "#28505c"
   plus-empty-line-marker-style  = syntax "#aecde6"
-  line-numbers-plus-style       = "#266d6a"
+  line-numbers-plus-style       = "#399a96"
   line-numbers-zero-style       = "#a8aecb"
diff --git a/extras/delta/tokyonight_storm.gitconfig b/extras/delta/tokyonight_storm.gitconfig
index 09be967..ebce40e 100644
--- a/extras/delta/tokyonight_storm.gitconfig
+++ b/extras/delta/tokyonight_storm.gitconfig
@@ -3,10 +3,10 @@
   minus-non-emph-style          = syntax "#3f2d3d"
   minus-emph-style              = syntax "#763842"
   minus-empty-line-marker-style = syntax "#3f2d3d"
-  line-numbers-minus-style      = "#b2555b"
+  line-numbers-minus-style      = "#c25d64"
   plus-style                    = syntax "#283b4d"
   plus-non-emph-style           = syntax "#283b4d"
   plus-emph-style               = syntax "#316172"
   plus-empty-line-marker-style  = syntax "#283b4d"
-  line-numbers-plus-style       = "#266d6a"
+  line-numbers-plus-style       = "#399a96"
   line-numbers-zero-style       = "#3b4261"
diff --git a/extras/fish/tokyonight_moon.fish b/extras/fish/tokyonight_moon.fish
index 2acc461..f0e0951 100644
--- a/extras/fish/tokyonight_moon.fish
+++ b/extras/fish/tokyonight_moon.fish
@@ -1,7 +1,7 @@
     # TokyoNight Color Palette
     set -l foreground c8d3f5
     set -l selection 3654a7
-    set -l comment 7a88cf
+    set -l comment 636da6
     set -l red ff757f
     set -l orange ff966c
     set -l yellow ffc777
diff --git a/extras/lua/tokyonight_day.lua b/extras/lua/tokyonight_day.lua
index d83ac3e..f618040 100644
--- a/extras/lua/tokyonight_day.lua
+++ b/extras/lua/tokyonight_day.lua
@@ -31,7 +31,7 @@ local colors = {
   error = "#c64343",
   fg = "#3760bf",
   fg_dark = "#6172b0",
-  fg_float = "#6172b0",
+  fg_float = "#3760bf",
   fg_gutter = "#a8aecb",
   fg_sidebar = "#6172b0",
   git = {
@@ -115,6 +115,15 @@ local highlights = {
     bg = "#c64343",
     fg = "#e1e2e7"
   },
+  ["@text.diff.add"] = {
+    link = "DiffAdd"
+  },
+  ["@text.diff.delete"] = {
+    link = "DiffDelete"
+  },
+  ["@text.literal.markdown"] = {
+    link = "Normal"
+  },
   ["@text.literal.markdown_inline"] = {
     bg = "#a1a6c5",
     fg = "#2e7de9"
@@ -122,6 +131,12 @@ local highlights = {
   ["@text.reference"] = {
     fg = "#118c74"
   },
+  ["@text.todo.checked"] = {
+    fg = "#387068"
+  },
+  ["@text.todo.unchecked"] = {
+    fg = "#2e7de9"
+  },
   ["@text.warning"] = {
     bg = "#8c6c3e",
     fg = "#e1e2e7"
@@ -139,7 +154,7 @@ local highlights = {
     fg = "#8c6c3e"
   },
   AlphaButtons = {
-    fg = "#9854f1"
+    fg = "#007197"
   },
   AlphaFooter = {
     fg = "#8c6c3e",
@@ -152,15 +167,63 @@ local highlights = {
     fg = "#b15c00"
   },
   AlphaShortcut = {
-    fg = "#007197"
+    fg = "#b15c00"
   },
   Bold = {
     bold = true
   },
+  BufferAlternate = {
+    bg = "#a8aecb",
+    fg = "#3760bf"
+  },
+  BufferAlternateERROR = {
+    bg = "#a8aecb",
+    fg = "#c64343"
+  },
+  BufferAlternateHINT = {
+    bg = "#a8aecb",
+    fg = "#118c74"
+  },
+  BufferAlternateINFO = {
+    bg = "#a8aecb",
+    fg = "#07879d"
+  },
+  BufferAlternateIndex = {
+    bg = "#a8aecb",
+    fg = "#07879d"
+  },
+  BufferAlternateMod = {
+    bg = "#a8aecb",
+    fg = "#8c6c3e"
+  },
+  BufferAlternateSign = {
+    bg = "#a8aecb",
+    fg = "#07879d"
+  },
+  BufferAlternateTarget = {
+    bg = "#a8aecb",
+    fg = "#f52a65"
+  },
+  BufferAlternateWARN = {
+    bg = "#a8aecb",
+    fg = "#8c6c3e"
+  },
   BufferCurrent = {
     bg = "#a8aecb",
     fg = "#3760bf"
   },
+  BufferCurrentERROR = {
+    bg = "#a8aecb",
+    fg = "#c64343"
+  },
+  BufferCurrentHINT = {
+    bg = "#a8aecb",
+    fg = "#118c74"
+  },
+  BufferCurrentINFO = {
+    bg = "#a8aecb",
+    fg = "#07879d"
+  },
   BufferCurrentIndex = {
     bg = "#a8aecb",
     fg = "#07879d"
@@ -177,10 +240,26 @@ local highlights = {
     bg = "#a8aecb",
     fg = "#f52a65"
   },
+  BufferCurrentWARN = {
+    bg = "#a8aecb",
+    fg = "#8c6c3e"
+  },
   BufferInactive = {
     bg = "#e9e9ec",
     fg = "#68709a"
   },
+  BufferInactiveERROR = {
+    bg = "#e9e9ec",
+    fg = "#d97274"
+  },
+  BufferInactiveHINT = {
+    bg = "#e9e9ec",
+    fg = "#177f6e"
+  },
+  BufferInactiveINFO = {
+    bg = "#e9e9ec",
+    fg = "#0e7a90"
+  },
   BufferInactiveIndex = {
     bg = "#e9e9ec",
     fg = "#68709a"
@@ -197,12 +276,20 @@ local highlights = {
     bg = "#e9e9ec",
     fg = "#f52a65"
   },
+  BufferInactiveWARN = {
+    bg = "#e9e9ec",
+    fg = "#7b613d"
+  },
   BufferLineIndicatorSelected = {
     fg = "#506d9b"
   },
-  BufferTabpage = {
+  BufferOffset = {
     bg = "#e9e9ec",
-    fg = "#2496ac"
+    fg = "#68709a"
+  },
+  BufferTabpageFill = {
+    bg = "#e9e9ec",
+    fg = "#68709a"
   },
   BufferTabpages = {
     bg = "#e9e9ec",
@@ -212,6 +299,18 @@ local highlights = {
     bg = "#e9e9ec",
     fg = "#3760bf"
   },
+  BufferVisibleERROR = {
+    bg = "#e9e9ec",
+    fg = "#c64343"
+  },
+  BufferVisibleHINT = {
+    bg = "#e9e9ec",
+    fg = "#118c74"
+  },
+  BufferVisibleINFO = {
+    bg = "#e9e9ec",
+    fg = "#07879d"
+  },
   BufferVisibleIndex = {
     bg = "#e9e9ec",
     fg = "#07879d"
@@ -228,6 +327,10 @@ local highlights = {
     bg = "#e9e9ec",
     fg = "#f52a65"
   },
+  BufferVisibleWARN = {
+    bg = "#e9e9ec",
+    fg = "#8c6c3e"
+  },
   Character = {
     fg = "#587539"
   },
@@ -538,6 +641,9 @@ local highlights = {
   GlyphPalette9 = {
     fg = "#f52a65"
   },
+  Hlargs = {
+    fg = "#8c6c3e"
+  },
   HopNextKey = {
     bold = true,
     fg = "#d20065"
@@ -586,6 +692,14 @@ local highlights = {
       italic = true
     }
   },
+  LazyProgressDone = {
+    bold = true,
+    fg = "#d20065"
+  },
+  LazyProgressTodo = {
+    bold = true,
+    fg = "#a8aecb"
+  },
   LeapBackdrop = {
     fg = "#8990b3"
   },
@@ -1162,7 +1276,7 @@ local highlights = {
   },
   NormalFloat = {
     bg = "#e9e9ec",
-    fg = "#6172b0"
+    fg = "#3760bf"
   },
   NormalNC = {
     bg = "#e1e2e7",
@@ -1471,6 +1585,9 @@ local highlights = {
     bg = "#8c6c3e",
     fg = "#e1e2e7"
   },
+  TreesitterContext = {
+    bg = "#b3b8d1"
+  },
   TroubleCount = {
     bg = "#a8aecb",
     fg = "#9854f1"
@@ -1577,6 +1694,10 @@ local highlights = {
   healthWarning = {
     fg = "#8c6c3e"
   },
+  helpCommand = {
+    bg = "#a1a6c5",
+    fg = "#2e7de9"
+  },
   htmlH1 = {
     bold = true,
     fg = "#9854f1"
diff --git a/extras/lua/tokyonight_moon.lua b/extras/lua/tokyonight_moon.lua
index a32580d..1846f77 100644
--- a/extras/lua/tokyonight_moon.lua
+++ b/extras/lua/tokyonight_moon.lua
@@ -18,7 +18,7 @@ local colors = {
   blue7 = "#394b70",
   border = "#1b1d2b",
   border_highlight = "#589ed7",
-  comment = "#7a88cf",
+  comment = "#636da6",
   cyan = "#86e1fc",
   dark3 = "#545c7e",
   dark5 = "#737aa2",
@@ -31,7 +31,7 @@ local colors = {
   error = "#c53b53",
   fg = "#c8d3f5",
   fg_dark = "#828bb8",
-  fg_float = "#828bb8",
+  fg_float = "#c8d3f5",
   fg_gutter = "#3b4261",
   fg_sidebar = "#828bb8",
   git = {
@@ -115,6 +115,15 @@ local highlights = {
     bg = "#c53b53",
     fg = "#222436"
   },
+  ["@text.diff.add"] = {
+    link = "DiffAdd"
+  },
+  ["@text.diff.delete"] = {
+    link = "DiffDelete"
+  },
+  ["@text.literal.markdown"] = {
+    link = "Normal"
+  },
   ["@text.literal.markdown_inline"] = {
     bg = "#444a73",
     fg = "#82aaff"
@@ -122,6 +131,12 @@ local highlights = {
   ["@text.reference"] = {
     fg = "#4fd6be"
   },
+  ["@text.todo.checked"] = {
+    fg = "#4fd6be"
+  },
+  ["@text.todo.unchecked"] = {
+    fg = "#82aaff"
+  },
   ["@text.warning"] = {
     bg = "#ffc777",
     fg = "#222436"
@@ -139,7 +154,7 @@ local highlights = {
     fg = "#ffc777"
   },
   AlphaButtons = {
-    fg = "#c099ff"
+    fg = "#86e1fc"
   },
   AlphaFooter = {
     fg = "#ffc777",
@@ -152,15 +167,63 @@ local highlights = {
     fg = "#ff966c"
   },
   AlphaShortcut = {
-    fg = "#86e1fc"
+    fg = "#ff966c"
   },
   Bold = {
     bold = true
   },
+  BufferAlternate = {
+    bg = "#3b4261",
+    fg = "#c8d3f5"
+  },
+  BufferAlternateERROR = {
+    bg = "#3b4261",
+    fg = "#c53b53"
+  },
+  BufferAlternateHINT = {
+    bg = "#3b4261",
+    fg = "#4fd6be"
+  },
+  BufferAlternateINFO = {
+    bg = "#3b4261",
+    fg = "#0db9d7"
+  },
+  BufferAlternateIndex = {
+    bg = "#3b4261",
+    fg = "#0db9d7"
+  },
+  BufferAlternateMod = {
+    bg = "#3b4261",
+    fg = "#ffc777"
+  },
+  BufferAlternateSign = {
+    bg = "#3b4261",
+    fg = "#0db9d7"
+  },
+  BufferAlternateTarget = {
+    bg = "#3b4261",
+    fg = "#ff757f"
+  },
+  BufferAlternateWARN = {
+    bg = "#3b4261",
+    fg = "#ffc777"
+  },
   BufferCurrent = {
     bg = "#3b4261",
     fg = "#c8d3f5"
   },
+  BufferCurrentERROR = {
+    bg = "#3b4261",
+    fg = "#c53b53"
+  },
+  BufferCurrentHINT = {
+    bg = "#3b4261",
+    fg = "#4fd6be"
+  },
+  BufferCurrentINFO = {
+    bg = "#3b4261",
+    fg = "#0db9d7"
+  },
   BufferCurrentIndex = {
     bg = "#3b4261",
     fg = "#0db9d7"
@@ -177,10 +240,26 @@ local highlights = {
     bg = "#3b4261",
     fg = "#ff757f"
   },
+  BufferCurrentWARN = {
+    bg = "#3b4261",
+    fg = "#ffc777"
+  },
   BufferInactive = {
     bg = "#1e2030",
     fg = "#737aa2"
   },
+  BufferInactiveERROR = {
+    bg = "#1e2030",
+    fg = "#94344a"
+  },
+  BufferInactiveHINT = {
+    bg = "#1e2030",
+    fg = "#42a195"
+  },
+  BufferInactiveINFO = {
+    bg = "#1e2030",
+    fg = "#138ca7"
+  },
   BufferInactiveIndex = {
     bg = "#1e2030",
     fg = "#737aa2"
@@ -197,12 +276,20 @@ local highlights = {
     bg = "#1e2030",
     fg = "#ff757f"
   },
+  BufferInactiveWARN = {
+    bg = "#1e2030",
+    fg = "#bd9664"
+  },
   BufferLineIndicatorSelected = {
     fg = "#7ca1f2"
   },
-  BufferTabpage = {
+  BufferOffset = {
     bg = "#1e2030",
-    fg = "#589ed7"
+    fg = "#737aa2"
+  },
+  BufferTabpageFill = {
+    bg = "#1e2030",
+    fg = "#737aa2"
   },
   BufferTabpages = {
     bg = "#1e2030",
@@ -212,6 +299,18 @@ local highlights = {
     bg = "#1e2030",
     fg = "#c8d3f5"
   },
+  BufferVisibleERROR = {
+    bg = "#1e2030",
+    fg = "#c53b53"
+  },
+  BufferVisibleHINT = {
+    bg = "#1e2030",
+    fg = "#4fd6be"
+  },
+  BufferVisibleINFO = {
+    bg = "#1e2030",
+    fg = "#0db9d7"
+  },
   BufferVisibleIndex = {
     bg = "#1e2030",
     fg = "#0db9d7"
@@ -228,6 +327,10 @@ local highlights = {
     bg = "#1e2030",
     fg = "#ff757f"
   },
+  BufferVisibleWARN = {
+    bg = "#1e2030",
+    fg = "#ffc777"
+  },
   Character = {
     fg = "#c3e88d"
   },
@@ -346,13 +449,13 @@ local highlights = {
   },
   CmpItemMenu = {
     bg = "NONE",
-    fg = "#7a88cf"
+    fg = "#636da6"
   },
   ColorColumn = {
     bg = "#1b1d2b"
   },
   Comment = {
-    fg = "#7a88cf",
+    fg = "#636da6",
     style = {
       italic = true
     }
@@ -485,7 +588,7 @@ local highlights = {
   },
   FoldColumn = {
     bg = "#222436",
-    fg = "#7a88cf"
+    fg = "#636da6"
   },
   Folded = {
     bg = "#3b4261",
@@ -538,6 +641,9 @@ local highlights = {
   GlyphPalette9 = {
     fg = "#ff757f"
   },
+  Hlargs = {
+    fg = "#ffc777"
+  },
   HopNextKey = {
     bold = true,
     fg = "#ff007c"
@@ -586,6 +692,14 @@ local highlights = {
       italic = true
     }
   },
+  LazyProgressDone = {
+    bold = true,
+    fg = "#ff007c"
+  },
+  LazyProgressTodo = {
+    bold = true,
+    fg = "#3b4261"
+  },
   LeapBackdrop = {
     fg = "#545c7e"
   },
@@ -649,7 +763,7 @@ local highlights = {
     fg = "#3b4261"
   },
   LspCodeLens = {
-    fg = "#7a88cf"
+    fg = "#636da6"
   },
   LspFloatWinBorder = {
     fg = "#589ed7"
@@ -740,7 +854,7 @@ local highlights = {
     fg = "#82aaff"
   },
   MiniStarterInactive = {
-    fg = "#7a88cf",
+    fg = "#636da6",
     style = {
       italic = true
     }
@@ -1162,7 +1276,7 @@ local highlights = {
   },
   NormalFloat = {
     bg = "#1e2030",
-    fg = "#828bb8"
+    fg = "#c8d3f5"
   },
   NormalNC = {
     bg = "#222436",
@@ -1178,13 +1292,13 @@ local highlights = {
   },
   NotifyDEBUGBorder = {
     bg = "#222436",
-    fg = "#3c4264"
+    fg = "#363a58"
   },
   NotifyDEBUGIcon = {
-    fg = "#7a88cf"
+    fg = "#636da6"
   },
   NotifyDEBUGTitle = {
-    fg = "#7a88cf"
+    fg = "#636da6"
   },
   NotifyERRORBody = {
     bg = "#222436",
@@ -1471,6 +1585,9 @@ local highlights = {
     bg = "#ffc777",
     fg = "#222436"
   },
+  TreesitterContext = {
+    bg = "#363c58"
+  },
   TroubleCount = {
     bg = "#3b4261",
     fg = "#c099ff"
@@ -1513,10 +1630,10 @@ local highlights = {
     fg = "#82aaff"
   },
   WhichKeySeparator = {
-    fg = "#7a88cf"
+    fg = "#636da6"
   },
   WhichKeySeperator = {
-    fg = "#7a88cf"
+    fg = "#636da6"
   },
   WhichKeyValue = {
     fg = "#737aa2"
@@ -1557,7 +1674,7 @@ local highlights = {
     fg = "#c099ff"
   },
   diffLine = {
-    fg = "#7a88cf"
+    fg = "#636da6"
   },
   diffNewFile = {
     fg = "#ff966c"
@@ -1577,6 +1694,10 @@ local highlights = {
   healthWarning = {
     fg = "#ffc777"
   },
+  helpCommand = {
+    bg = "#444a73",
+    fg = "#82aaff"
+  },
   htmlH1 = {
     bold = true,
     fg = "#c099ff"
diff --git a/extras/lua/tokyonight_night.lua b/extras/lua/tokyonight_night.lua
index 940684f..b02ba58 100644
--- a/extras/lua/tokyonight_night.lua
+++ b/extras/lua/tokyonight_night.lua
@@ -31,7 +31,7 @@ local colors = {
   error = "#db4b4b",
   fg = "#c0caf5",
   fg_dark = "#a9b1d6",
-  fg_float = "#a9b1d6",
+  fg_float = "#c0caf5",
   fg_gutter = "#3b4261",
   fg_sidebar = "#a9b1d6",
   git = {
@@ -115,6 +115,15 @@ local highlights = {
     bg = "#db4b4b",
     fg = "#1a1b26"
   },
+  ["@text.diff.add"] = {
+    link = "DiffAdd"
+  },
+  ["@text.diff.delete"] = {
+    link = "DiffDelete"
+  },
+  ["@text.literal.markdown"] = {
+    link = "Normal"
+  },
   ["@text.literal.markdown_inline"] = {
     bg = "#414868",
     fg = "#7aa2f7"
@@ -122,6 +131,12 @@ local highlights = {
   ["@text.reference"] = {
     fg = "#1abc9c"
   },
+  ["@text.todo.checked"] = {
+    fg = "#73daca"
+  },
+  ["@text.todo.unchecked"] = {
+    fg = "#7aa2f7"
+  },
   ["@text.warning"] = {
     bg = "#e0af68",
     fg = "#1a1b26"
@@ -139,7 +154,7 @@ local highlights = {
     fg = "#e0af68"
   },
   AlphaButtons = {
-    fg = "#bb9af7"
+    fg = "#7dcfff"
   },
   AlphaFooter = {
     fg = "#e0af68",
@@ -152,15 +167,63 @@ local highlights = {
     fg = "#ff9e64"
   },
   AlphaShortcut = {
-    fg = "#7dcfff"
+    fg = "#ff9e64"
   },
   Bold = {
     bold = true
   },
+  BufferAlternate = {
+    bg = "#3b4261",
+    fg = "#c0caf5"
+  },
+  BufferAlternateERROR = {
+    bg = "#3b4261",
+    fg = "#db4b4b"
+  },
+  BufferAlternateHINT = {
+    bg = "#3b4261",
+    fg = "#1abc9c"
+  },
+  BufferAlternateINFO = {
+    bg = "#3b4261",
+    fg = "#0db9d7"
+  },
+  BufferAlternateIndex = {
+    bg = "#3b4261",
+    fg = "#0db9d7"
+  },
+  BufferAlternateMod = {
+    bg = "#3b4261",
+    fg = "#e0af68"
+  },
+  BufferAlternateSign = {
+    bg = "#3b4261",
+    fg = "#0db9d7"
+  },
+  BufferAlternateTarget = {
+    bg = "#3b4261",
+    fg = "#f7768e"
+  },
+  BufferAlternateWARN = {
+    bg = "#3b4261",
+    fg = "#e0af68"
+  },
   BufferCurrent = {
     bg = "#3b4261",
     fg = "#c0caf5"
   },
+  BufferCurrentERROR = {
+    bg = "#3b4261",
+    fg = "#db4b4b"
+  },
+  BufferCurrentHINT = {
+    bg = "#3b4261",
+    fg = "#1abc9c"
+  },
+  BufferCurrentINFO = {
+    bg = "#3b4261",
+    fg = "#0db9d7"
+  },
   BufferCurrentIndex = {
     bg = "#3b4261",
     fg = "#0db9d7"
@@ -177,10 +240,26 @@ local highlights = {
     bg = "#3b4261",
     fg = "#f7768e"
   },
+  BufferCurrentWARN = {
+    bg = "#3b4261",
+    fg = "#e0af68"
+  },
   BufferInactive = {
     bg = "#16161e",
     fg = "#737aa2"
   },
+  BufferInactiveERROR = {
+    bg = "#16161e",
+    fg = "#a13d40"
+  },
+  BufferInactiveHINT = {
+    bg = "#16161e",
+    fg = "#1a8c79"
+  },
+  BufferInactiveINFO = {
+    bg = "#16161e",
+    fg = "#118aa2"
+  },
   BufferInactiveIndex = {
     bg = "#16161e",
     fg = "#737aa2"
@@ -197,12 +276,20 @@ local highlights = {
     bg = "#16161e",
     fg = "#f7768e"
   },
+  BufferInactiveWARN = {
+    bg = "#16161e",
+    fg = "#a58354"
+  },
   BufferLineIndicatorSelected = {
     fg = "#506d9b"
   },
-  BufferTabpage = {
+  BufferOffset = {
     bg = "#16161e",
-    fg = "#27a1b9"
+    fg = "#737aa2"
+  },
+  BufferTabpageFill = {
+    bg = "#16161e",
+    fg = "#737aa2"
   },
   BufferTabpages = {
     bg = "#16161e",
@@ -212,6 +299,18 @@ local highlights = {
     bg = "#16161e",
     fg = "#c0caf5"
   },
+  BufferVisibleERROR = {
+    bg = "#16161e",
+    fg = "#db4b4b"
+  },
+  BufferVisibleHINT = {
+    bg = "#16161e",
+    fg = "#1abc9c"
+  },
+  BufferVisibleINFO = {
+    bg = "#16161e",
+    fg = "#0db9d7"
+  },
   BufferVisibleIndex = {
     bg = "#16161e",
     fg = "#0db9d7"
@@ -228,6 +327,10 @@ local highlights = {
     bg = "#16161e",
     fg = "#f7768e"
   },
+  BufferVisibleWARN = {
+    bg = "#16161e",
+    fg = "#e0af68"
+  },
   Character = {
     fg = "#9ece6a"
   },
@@ -538,6 +641,9 @@ local highlights = {
   GlyphPalette9 = {
     fg = "#f7768e"
   },
+  Hlargs = {
+    fg = "#e0af68"
+  },
   HopNextKey = {
     bold = true,
     fg = "#ff007c"
@@ -586,6 +692,14 @@ local highlights = {
       italic = true
     }
   },
+  LazyProgressDone = {
+    bold = true,
+    fg = "#ff007c"
+  },
+  LazyProgressTodo = {
+    bold = true,
+    fg = "#3b4261"
+  },
   LeapBackdrop = {
     fg = "#545c7e"
   },
@@ -1162,7 +1276,7 @@ local highlights = {
   },
   NormalFloat = {
     bg = "#16161e",
-    fg = "#a9b1d6"
+    fg = "#c0caf5"
   },
   NormalNC = {
     bg = "#1a1b26",
@@ -1471,6 +1585,9 @@ local highlights = {
     bg = "#e0af68",
     fg = "#1a1b26"
   },
+  TreesitterContext = {
+    bg = "#343a55"
+  },
   TroubleCount = {
     bg = "#3b4261",
     fg = "#bb9af7"
@@ -1577,6 +1694,10 @@ local highlights = {
   healthWarning = {
     fg = "#e0af68"
   },
+  helpCommand = {
+    bg = "#414868",
+    fg = "#7aa2f7"
+  },
   htmlH1 = {
     bold = true,
     fg = "#bb9af7"
diff --git a/extras/lua/tokyonight_storm.lua b/extras/lua/tokyonight_storm.lua
index 44686ef..8e54a63 100644
--- a/extras/lua/tokyonight_storm.lua
+++ b/extras/lua/tokyonight_storm.lua
@@ -31,7 +31,7 @@ local colors = {
   error = "#db4b4b",
   fg = "#c0caf5",
   fg_dark = "#a9b1d6",
-  fg_float = "#a9b1d6",
+  fg_float = "#c0caf5",
   fg_gutter = "#3b4261",
   fg_sidebar = "#a9b1d6",
   git = {
@@ -115,6 +115,15 @@ local highlights = {
     bg = "#db4b4b",
     fg = "#24283b"
   },
+  ["@text.diff.add"] = {
+    link = "DiffAdd"
+  },
+  ["@text.diff.delete"] = {
+    link = "DiffDelete"
+  },
+  ["@text.literal.markdown"] = {
+    link = "Normal"
+  },
   ["@text.literal.markdown_inline"] = {
     bg = "#414868",
     fg = "#7aa2f7"
@@ -122,6 +131,12 @@ local highlights = {
   ["@text.reference"] = {
     fg = "#1abc9c"
   },
+  ["@text.todo.checked"] = {
+    fg = "#73daca"
+  },
+  ["@text.todo.unchecked"] = {
+    fg = "#7aa2f7"
+  },
   ["@text.warning"] = {
     bg = "#e0af68",
     fg = "#24283b"
@@ -139,7 +154,7 @@ local highlights = {
     fg = "#e0af68"
   },
   AlphaButtons = {
-    fg = "#bb9af7"
+    fg = "#7dcfff"
   },
   AlphaFooter = {
     fg = "#e0af68",
@@ -152,15 +167,63 @@ local highlights = {
     fg = "#ff9e64"
   },
   AlphaShortcut = {
-    fg = "#7dcfff"
+    fg = "#ff9e64"
   },
   Bold = {
     bold = true
   },
+  BufferAlternate = {
+    bg = "#3b4261",
+    fg = "#c0caf5"
+  },
+  BufferAlternateERROR = {
+    bg = "#3b4261",
+    fg = "#db4b4b"
+  },
+  BufferAlternateHINT = {
+    bg = "#3b4261",
+    fg = "#1abc9c"
+  },
+  BufferAlternateINFO = {
+    bg = "#3b4261",
+    fg = "#0db9d7"
+  },
+  BufferAlternateIndex = {
+    bg = "#3b4261",
+    fg = "#0db9d7"
+  },
+  BufferAlternateMod = {
+    bg = "#3b4261",
+    fg = "#e0af68"
+  },
+  BufferAlternateSign = {
+    bg = "#3b4261",
+    fg = "#0db9d7"
+  },
+  BufferAlternateTarget = {
+    bg = "#3b4261",
+    fg = "#f7768e"
+  },
+  BufferAlternateWARN = {
+    bg = "#3b4261",
+    fg = "#e0af68"
+  },
   BufferCurrent = {
     bg = "#3b4261",
     fg = "#c0caf5"
   },
+  BufferCurrentERROR = {
+    bg = "#3b4261",
+    fg = "#db4b4b"
+  },
+  BufferCurrentHINT = {
+    bg = "#3b4261",
+    fg = "#1abc9c"
+  },
+  BufferCurrentINFO = {
+    bg = "#3b4261",
+    fg = "#0db9d7"
+  },
   BufferCurrentIndex = {
     bg = "#3b4261",
     fg = "#0db9d7"
@@ -177,10 +240,26 @@ local highlights = {
     bg = "#3b4261",
     fg = "#f7768e"
   },
+  BufferCurrentWARN = {
+    bg = "#3b4261",
+    fg = "#e0af68"
+  },
   BufferInactive = {
     bg = "#1f2335",
     fg = "#737aa2"
   },
+  BufferInactiveERROR = {
+    bg = "#1f2335",
+    fg = "#a44146"
+  },
+  BufferInactiveHINT = {
+    bg = "#1f2335",
+    fg = "#1d907f"
+  },
+  BufferInactiveINFO = {
+    bg = "#1f2335",
+    fg = "#148ea8"
+  },
   BufferInactiveIndex = {
     bg = "#1f2335",
     fg = "#737aa2"
@@ -197,12 +276,20 @@ local highlights = {
     bg = "#1f2335",
     fg = "#f7768e"
   },
+  BufferInactiveWARN = {
+    bg = "#1f2335",
+    fg = "#a8875b"
+  },
   BufferLineIndicatorSelected = {
     fg = "#506d9b"
   },
-  BufferTabpage = {
+  BufferOffset = {
     bg = "#1f2335",
-    fg = "#29a4bd"
+    fg = "#737aa2"
+  },
+  BufferTabpageFill = {
+    bg = "#1f2335",
+    fg = "#737aa2"
   },
   BufferTabpages = {
     bg = "#1f2335",
@@ -212,6 +299,18 @@ local highlights = {
     bg = "#1f2335",
     fg = "#c0caf5"
   },
+  BufferVisibleERROR = {
+    bg = "#1f2335",
+    fg = "#db4b4b"
+  },
+  BufferVisibleHINT = {
+    bg = "#1f2335",
+    fg = "#1abc9c"
+  },
+  BufferVisibleINFO = {
+    bg = "#1f2335",
+    fg = "#0db9d7"
+  },
   BufferVisibleIndex = {
     bg = "#1f2335",
     fg = "#0db9d7"
@@ -228,6 +327,10 @@ local highlights = {
     bg = "#1f2335",
     fg = "#f7768e"
   },
+  BufferVisibleWARN = {
+    bg = "#1f2335",
+    fg = "#e0af68"
+  },
   Character = {
     fg = "#9ece6a"
   },
@@ -538,6 +641,9 @@ local highlights = {
   GlyphPalette9 = {
     fg = "#f7768e"
   },
+  Hlargs = {
+    fg = "#e0af68"
+  },
   HopNextKey = {
     bold = true,
     fg = "#ff007c"
@@ -586,6 +692,14 @@ local highlights = {
       italic = true
     }
   },
+  LazyProgressDone = {
+    bold = true,
+    fg = "#ff007c"
+  },
+  LazyProgressTodo = {
+    bold = true,
+    fg = "#3b4261"
+  },
   LeapBackdrop = {
     fg = "#545c7e"
   },
@@ -1162,7 +1276,7 @@ local highlights = {
   },
   NormalFloat = {
     bg = "#1f2335",
-    fg = "#a9b1d6"
+    fg = "#c0caf5"
   },
   NormalNC = {
     bg = "#24283b",
@@ -1471,6 +1585,9 @@ local highlights = {
     bg = "#e0af68",
     fg = "#24283b"
   },
+  TreesitterContext = {
+    bg = "#363d59"
+  },
   TroubleCount = {
     bg = "#3b4261",
     fg = "#bb9af7"
@@ -1577,6 +1694,10 @@ local highlights = {
   healthWarning = {
     fg = "#e0af68"
   },
+  helpCommand = {
+    bg = "#414868",
+    fg = "#7aa2f7"
+  },
   htmlH1 = {
     bold = true,
     fg = "#bb9af7"
diff --git a/extras/sublime/tokyonight_moon.tmTheme b/extras/sublime/tokyonight_moon.tmTheme
index 5ddaf0b..ec64b66 100644
--- a/extras/sublime/tokyonight_moon.tmTheme
+++ b/extras/sublime/tokyonight_moon.tmTheme
@@ -67,7 +67,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#7a88cf</string>
+				<string>#636da6</string>
 			</dict>
 		</dict>
 		<dict>
@@ -78,7 +78,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#7a88cf</string>
+				<string>#636da6</string>
 			</dict>
 		</dict>
 		<dict>
diff --git a/extras/sublime/tokyonight_night.tmTheme b/extras/sublime/tokyonight_night.tmTheme
index 08fcc78..5884285 100644
--- a/extras/sublime/tokyonight_night.tmTheme
+++ b/extras/sublime/tokyonight_night.tmTheme
@@ -744,7 +744,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#4097a3</string>
+				<string>#2c6c75</string>
 			</dict>
 		</dict>
 		<dict>
@@ -755,7 +755,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#c47981</string>
+				<string>#914c54</string>
 			</dict>
 		</dict>
 		<dict>
@@ -766,7 +766,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#506d9b</string>
+				<string>#6183b9</string>
 			</dict>
 		</dict>
 		<dict>