diff --git a/extras/kitty/tokyonight_storm.conf b/extras/kitty/tokyonight_storm.conf
index 18b6d5f..53c0096 100644
--- a/extras/kitty/tokyonight_storm.conf
+++ b/extras/kitty/tokyonight_storm.conf
@@ -23,7 +23,7 @@ inactive_tab_foreground #545c7e
 
 # Windows
 active_border_color #7aa2f7
-inactive_border_color #2f334d
+inactive_border_color #292e42
 
 # normal
 color0 #1d202f
diff --git a/extras/lua/tokyonight_day.lua b/extras/lua/tokyonight_day.lua
index 82ffe80..43fd5f7 100644
--- a/extras/lua/tokyonight_day.lua
+++ b/extras/lua/tokyonight_day.lua
@@ -17,7 +17,7 @@ local colors = {
   blue6 = "#2e5857",
   blue7 = "#92a6d5",
   border = "#e9e9ed",
-  border_highlight = "#7890dd",
+  border_highlight = "#2496ac",
   comment = "#848cb5",
   cyan = "#007197",
   dark3 = "#8990b3",
@@ -25,6 +25,7 @@ local colors = {
   error = "#c64343",
   fg = "#3760bf",
   fg_dark = "#6172b0",
+  fg_float = "#6172b0",
   fg_gutter = "#a8aecb",
   fg_sidebar = "#6172b0",
   green = "#587539",
@@ -46,20 +47,96 @@ local colors = {
 }
 
 local highlights = {
+  ["@constructor"] = {
+    fg = "#9854f1"
+  },
+  ["@field"] = {
+    fg = "#387068"
+  },
+  ["@keyword"] = {
+    fg = "#7847bd",
+    style = {
+      italic = true
+    }
+  },
+  ["@keyword.function"] = {
+    fg = "#9854f1",
+    style = {}
+  },
+  ["@label"] = {
+    fg = "#2e7de9"
+  },
+  ["@operator"] = {
+    fg = "#006a83"
+  },
+  ["@parameter"] = {
+    fg = "#8c6c3e"
+  },
+  ["@property"] = {
+    fg = "#387068"
+  },
+  ["@punctuation.bracket"] = {
+    fg = "#6172b0"
+  },
+  ["@punctuation.delimiter"] = {
+    fg = "#006a83"
+  },
+  ["@punctuation.special"] = {
+    fg = "#006a83"
+  },
   ["@punctuation.special.markdown"] = {
     bold = true,
     fg = "#b15c00"
   },
+  ["@string.escape"] = {
+    fg = "#9854f1"
+  },
+  ["@string.regex"] = {
+    fg = "#2e5857"
+  },
+  ["@text.danger"] = {
+    bg = "#c64343",
+    fg = "#e1e2e7"
+  },
   ["@text.literal.markdown_inline"] = {
     bg = "#a1a6c5",
     fg = "#2e7de9"
   },
+  ["@text.reference"] = {
+    fg = "#118c74"
+  },
+  ["@text.warning"] = {
+    bg = "#8c6c3e",
+    fg = "#e1e2e7"
+  },
+  ["@variable"] = {
+    style = {}
+  },
+  ["@variable.builtin"] = {
+    fg = "#f52a65"
+  },
   ALEErrorSign = {
     fg = "#c64343"
   },
   ALEWarningSign = {
     fg = "#8c6c3e"
   },
+  AlphaButtons = {
+    fg = "#9854f1"
+  },
+  AlphaFooter = {
+    fg = "#8c6c3e",
+    italic = true
+  },
+  AlphaHeader = {
+    fg = "#2e7de9"
+  },
+  AlphaHeaderLabel = {
+    fg = "#b15c00"
+  },
+  AlphaShortcut = {
+    fg = "#007197"
+  },
   Bold = {
     bold = true
   },
@@ -97,7 +174,7 @@ local highlights = {
   },
   BufferInactiveSign = {
     bg = "#e9e9ec",
-    fg = "#7890dd"
+    fg = "#2496ac"
   },
   BufferInactiveTarget = {
     bg = "#e9e9ec",
@@ -108,7 +185,7 @@ local highlights = {
   },
   BufferTabpage = {
     bg = "#e9e9ec",
-    fg = "#7890dd"
+    fg = "#2496ac"
   },
   BufferTabpages = {
     bg = "#e9e9ec",
@@ -143,7 +220,7 @@ local highlights = {
   },
   CmpDocumentationBorder = {
     bg = "#e9e9ec",
-    fg = "#7890dd"
+    fg = "#2496ac"
   },
   CmpItemAbbr = {
     bg = "NONE",
@@ -269,6 +346,9 @@ local highlights = {
   Constant = {
     fg = "#b15c00"
   },
+  CurSearch = {
+    link = "IncSearch"
+  },
   Cursor = {
     bg = "#3760bf",
     fg = "#e1e2e7"
@@ -384,7 +464,7 @@ local highlights = {
   },
   FloatBorder = {
     bg = "#e9e9ec",
-    fg = "#7890dd"
+    fg = "#2496ac"
   },
   FoldColumn = {
     bg = "#e1e2e7",
@@ -450,7 +530,7 @@ local highlights = {
     fg = "#07879d"
   },
   HopNextKey2 = {
-    fg = "#44bbe2"
+    fg = "#168aa3"
   },
   HopUnmatched = {
     fg = "#8990b3"
@@ -555,11 +635,15 @@ local highlights = {
     fg = "#848cb5"
   },
   LspFloatWinBorder = {
-    fg = "#7890dd"
+    fg = "#2496ac"
   },
   LspFloatWinNormal = {
     bg = "#e9e9ec"
   },
+  LspInfoBorder = {
+    bg = "#e9e9ec",
+    fg = "#2496ac"
+  },
   LspReferenceRead = {
     bg = "#a8aecb"
   },
@@ -597,7 +681,8 @@ local highlights = {
     fg = "#f52a65"
   },
   LspSignatureActiveParameter = {
-    fg = "#b15c00"
+    bg = "#c4c9e3",
+    bold = true
   },
   MatchParen = {
     bold = true,
@@ -619,8 +704,8 @@ local highlights = {
     fg = "#188092"
   },
   MiniJump = {
-    bg = "#9854f1",
-    fg = "#c4c8da"
+    bg = "#d20065",
+    fg = "#474747"
   },
   MiniJump2dSpot = {
     bold = true,
@@ -648,7 +733,7 @@ local highlights = {
     fg = "#3760bf"
   },
   MiniStarterItemBullet = {
-    fg = "#7890dd"
+    fg = "#2496ac"
   },
   MiniStarterItemPrefix = {
     fg = "#8c6c3e"
@@ -914,6 +999,143 @@ local highlights = {
   NeogitRemote = {
     fg = "#7847bd"
   },
+  NeotestAdapterName = {
+    bold = true,
+    fg = "#7847bd"
+  },
+  NeotestBorder = {
+    fg = "#2e7de9"
+  },
+  NeotestDir = {
+    fg = "#2e7de9"
+  },
+  NeotestExpandMarker = {
+    fg = "#6172b0"
+  },
+  NeotestFailed = {
+    fg = "#f52a65"
+  },
+  NeotestFile = {
+    fg = "#118c74"
+  },
+  NeotestFocused = {
+    fg = "#8c6c3e"
+  },
+  NeotestIndent = {
+    fg = "#6172b0"
+  },
+  NeotestMarked = {
+    fg = "#2e7de9"
+  },
+  NeotestNamespace = {
+    fg = "#38919f"
+  },
+  NeotestPassed = {
+    fg = "#587539"
+  },
+  NeotestRunning = {
+    fg = "#8c6c3e"
+  },
+  NeotestSkipped = {
+    fg = "#2e7de9"
+  },
+  NeotestTarget = {
+    fg = "#2e7de9"
+  },
+  NeotestTest = {
+    fg = "#6172b0"
+  },
+  NeotestWinSelect = {
+    fg = "#2e7de9"
+  },
+  NoiceCompletionItemKindClass = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NoiceCompletionItemKindConstant = {
+    bg = "NONE",
+    fg = "#9854f1"
+  },
+  NoiceCompletionItemKindConstructor = {
+    bg = "NONE",
+    fg = "#2e7de9"
+  },
+  NoiceCompletionItemKindDefault = {
+    bg = "NONE",
+    fg = "#6172b0"
+  },
+  NoiceCompletionItemKindEnum = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NoiceCompletionItemKindEnumMember = {
+    bg = "NONE",
+    fg = "#387068"
+  },
+  NoiceCompletionItemKindEvent = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NoiceCompletionItemKindField = {
+    bg = "NONE",
+    fg = "#387068"
+  },
+  NoiceCompletionItemKindFunction = {
+    bg = "NONE",
+    fg = "#2e7de9"
+  },
+  NoiceCompletionItemKindInterface = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NoiceCompletionItemKindKeyword = {
+    bg = "NONE",
+    fg = "#007197"
+  },
+  NoiceCompletionItemKindMethod = {
+    bg = "NONE",
+    fg = "#2e7de9"
+  },
+  NoiceCompletionItemKindModule = {
+    bg = "NONE",
+    fg = "#8c6c3e"
+  },
+  NoiceCompletionItemKindOperator = {
+    bg = "NONE",
+    fg = "#387068"
+  },
+  NoiceCompletionItemKindProperty = {
+    bg = "NONE",
+    fg = "#387068"
+  },
+  NoiceCompletionItemKindReference = {
+    bg = "NONE",
+    fg = "#9854f1"
+  },
+  NoiceCompletionItemKindSnippet = {
+    bg = "NONE",
+    fg = "#68709a"
+  },
+  NoiceCompletionItemKindStruct = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NoiceCompletionItemKindTypeParameter = {
+    bg = "NONE",
+    fg = "#387068"
+  },
+  NoiceCompletionItemKindUnit = {
+    bg = "NONE",
+    fg = "#b15c00"
+  },
+  NoiceCompletionItemKindValue = {
+    bg = "NONE",
+    fg = "#9854f1"
+  },
+  NoiceCompletionItemKindVariable = {
+    bg = "NONE",
+    fg = "#9854f1"
+  },
   NonText = {
     fg = "#8990b3"
   },
@@ -923,7 +1145,7 @@ local highlights = {
   },
   NormalFloat = {
     bg = "#e9e9ec",
-    fg = "#3760bf"
+    fg = "#6172b0"
   },
   NormalNC = {
     bg = "#e1e2e7",
@@ -933,6 +1155,76 @@ local highlights = {
     bg = "#e9e9ec",
     fg = "#6172b0"
   },
+  NotifyDEBUGBody = {
+    bg = "#e1e2e7",
+    fg = "#3760bf"
+  },
+  NotifyDEBUGBorder = {
+    bg = "#e1e2e7",
+    fg = "#c4c6d6"
+  },
+  NotifyDEBUGIcon = {
+    fg = "#848cb5"
+  },
+  NotifyDEBUGTitle = {
+    fg = "#848cb5"
+  },
+  NotifyERRORBody = {
+    bg = "#e1e2e7",
+    fg = "#3760bf"
+  },
+  NotifyERRORBorder = {
+    bg = "#e1e2e7",
+    fg = "#dbb6bb"
+  },
+  NotifyERRORIcon = {
+    fg = "#c64343"
+  },
+  NotifyERRORTitle = {
+    fg = "#c64343"
+  },
+  NotifyINFOBody = {
+    bg = "#e1e2e7",
+    fg = "#3760bf"
+  },
+  NotifyINFOBorder = {
+    bg = "#e1e2e7",
+    fg = "#44bbe2"
+  },
+  NotifyINFOIcon = {
+    fg = "#07879d"
+  },
+  NotifyINFOTitle = {
+    fg = "#07879d"
+  },
+  NotifyTRACEBody = {
+    bg = "#e1e2e7",
+    fg = "#3760bf"
+  },
+  NotifyTRACEBorder = {
+    bg = "#e1e2e7",
+    fg = "#b9b3cd"
+  },
+  NotifyTRACEIcon = {
+    fg = "#7847bd"
+  },
+  NotifyTRACETitle = {
+    fg = "#7847bd"
+  },
+  NotifyWARNBody = {
+    bg = "#e1e2e7",
+    fg = "#3760bf"
+  },
+  NotifyWARNBorder = {
+    bg = "#e1e2e7",
+    fg = "#c0a388"
+  },
+  NotifyWARNIcon = {
+    fg = "#8c6c3e"
+  },
+  NotifyWARNTitle = {
+    fg = "#8c6c3e"
+  },
   NvimTreeFolderIcon = {
     bg = "NONE",
     fg = "#8c6c3e"
@@ -1121,70 +1413,17 @@ local highlights = {
     bg = "#f52a65",
     fg = "#e9e9ed"
   },
-  TSConstructor = {
-    fg = "#9854f1"
+  TSNodeKey = {
+    bold = true,
+    fg = "#d20065"
   },
-  TSDanger = {
-    bg = "#c64343",
-    fg = "#e1e2e7"
-  },
-  TSField = {
-    fg = "#387068"
-  },
-  TSKeyword = {
-    fg = "#7847bd",
-    style = {
-      italic = true
-    }
-  },
-  TSKeywordFunction = {
-    fg = "#9854f1",
-    style = {}
-  },
-  TSLabel = {
-    fg = "#2e7de9"
+  TSNodeUnmatched = {
+    fg = "#8990b3"
   },
   TSNote = {
     bg = "#07879d",
     fg = "#e1e2e7"
   },
-  TSOperator = {
-    fg = "#006a83"
-  },
-  TSParameter = {
-    fg = "#8c6c3e"
-  },
-  TSProperty = {
-    fg = "#387068"
-  },
-  TSPunctBracket = {
-    fg = "#6172b0"
-  },
-  TSPunctDelimiter = {
-    fg = "#006a83"
-  },
-  TSPunctSpecial = {
-    fg = "#006a83"
-  },
-  TSStringEscape = {
-    fg = "#9854f1"
-  },
-  TSStringRegex = {
-    fg = "#2e5857"
-  },
-  TSTextReference = {
-    fg = "#118c74"
-  },
-  TSVariable = {
-    style = {}
-  },
-  TSVariableBuiltin = {
-    fg = "#f52a65"
-  },
-  TSWarning = {
-    bg = "#8c6c3e",
-    fg = "#e1e2e7"
-  },
   TabLine = {
     bg = "#e9e9ec",
     fg = "#a8aecb"
@@ -1201,7 +1440,7 @@ local highlights = {
   },
   TelescopeBorder = {
     bg = "#e9e9ec",
-    fg = "#7890dd"
+    fg = "#2496ac"
   },
   TelescopeNormal = {
     bg = "#e9e9ec",
@@ -1275,6 +1514,12 @@ local highlights = {
     bold = true,
     fg = "#e9e9ed"
   },
+  YankyPut = {
+    link = "IncSearch"
+  },
+  YankyYanked = {
+    link = "IncSearch"
+  },
   debugBreakpoint = {
     bg = "#b7d3ed",
     fg = "#07879d"
@@ -1374,24 +1619,24 @@ local highlights = {
     fg = "#68709a"
   },
   rainbowcol1 = {
-    fg = "#8990b3"
+    fg = "#f52a65"
   },
   rainbowcol2 = {
     fg = "#8c6c3e"
   },
   rainbowcol3 = {
-    fg = "#07879d"
+    fg = "#587539"
   },
   rainbowcol4 = {
-    fg = "#b15c00"
+    fg = "#118c74"
   },
   rainbowcol5 = {
-    fg = "#7847bd"
+    fg = "#2e7de9"
   },
   rainbowcol6 = {
-    fg = "#387068"
+    fg = "#9854f1"
   },
   rainbowcol7 = {
-    fg = "#f52a65"
+    fg = "#7847bd"
   }
 }
diff --git a/extras/lua/tokyonight_moon.lua b/extras/lua/tokyonight_moon.lua
index 7963f6b..ce1d25c 100644
--- a/extras/lua/tokyonight_moon.lua
+++ b/extras/lua/tokyonight_moon.lua
@@ -17,7 +17,7 @@ local colors = {
   blue6 = "#b4f9f8",
   blue7 = "#394b70",
   border = "#1b1d2b",
-  border_highlight = "#3e68d7",
+  border_highlight = "#589ed7",
   comment = "#7a88cf",
   cyan = "#86e1fc",
   dark3 = "#545c7e",
@@ -31,6 +31,7 @@ local colors = {
   error = "#c53b53",
   fg = "#c8d3f5",
   fg_dark = "#828bb8",
+  fg_float = "#828bb8",
   fg_gutter = "#3b4261",
   fg_sidebar = "#828bb8",
   git = {
@@ -63,20 +64,96 @@ local colors = {
 }
 
 local highlights = {
+  ["@constructor"] = {
+    fg = "#c099ff"
+  },
+  ["@field"] = {
+    fg = "#4fd6be"
+  },
+  ["@keyword"] = {
+    fg = "#fca7ea",
+    style = {
+      italic = true
+    }
+  },
+  ["@keyword.function"] = {
+    fg = "#c099ff",
+    style = {}
+  },
+  ["@label"] = {
+    fg = "#82aaff"
+  },
+  ["@operator"] = {
+    fg = "#89ddff"
+  },
+  ["@parameter"] = {
+    fg = "#ffc777"
+  },
+  ["@property"] = {
+    fg = "#4fd6be"
+  },
+  ["@punctuation.bracket"] = {
+    fg = "#828bb8"
+  },
+  ["@punctuation.delimiter"] = {
+    fg = "#89ddff"
+  },
+  ["@punctuation.special"] = {
+    fg = "#89ddff"
+  },
   ["@punctuation.special.markdown"] = {
     bold = true,
     fg = "#ff966c"
   },
+  ["@string.escape"] = {
+    fg = "#c099ff"
+  },
+  ["@string.regex"] = {
+    fg = "#b4f9f8"
+  },
+  ["@text.danger"] = {
+    bg = "#c53b53",
+    fg = "#222436"
+  },
   ["@text.literal.markdown_inline"] = {
     bg = "#444a73",
     fg = "#82aaff"
   },
+  ["@text.reference"] = {
+    fg = "#4fd6be"
+  },
+  ["@text.warning"] = {
+    bg = "#ffc777",
+    fg = "#222436"
+  },
+  ["@variable"] = {
+    style = {}
+  },
+  ["@variable.builtin"] = {
+    fg = "#ff757f"
+  },
   ALEErrorSign = {
     fg = "#c53b53"
   },
   ALEWarningSign = {
     fg = "#ffc777"
   },
+  AlphaButtons = {
+    fg = "#c099ff"
+  },
+  AlphaFooter = {
+    fg = "#ffc777",
+    italic = true
+  },
+  AlphaHeader = {
+    fg = "#82aaff"
+  },
+  AlphaHeaderLabel = {
+    fg = "#ff966c"
+  },
+  AlphaShortcut = {
+    fg = "#86e1fc"
+  },
   Bold = {
     bold = true
   },
@@ -114,7 +191,7 @@ local highlights = {
   },
   BufferInactiveSign = {
     bg = "#1e2030",
-    fg = "#3e68d7"
+    fg = "#589ed7"
   },
   BufferInactiveTarget = {
     bg = "#1e2030",
@@ -125,7 +202,7 @@ local highlights = {
   },
   BufferTabpage = {
     bg = "#1e2030",
-    fg = "#3e68d7"
+    fg = "#589ed7"
   },
   BufferTabpages = {
     bg = "#1e2030",
@@ -160,7 +237,7 @@ local highlights = {
   },
   CmpDocumentationBorder = {
     bg = "#1e2030",
-    fg = "#3e68d7"
+    fg = "#589ed7"
   },
   CmpItemAbbr = {
     bg = "NONE",
@@ -286,6 +363,9 @@ local highlights = {
   Constant = {
     fg = "#ff966c"
   },
+  CurSearch = {
+    link = "IncSearch"
+  },
   Cursor = {
     bg = "#c8d3f5",
     fg = "#222436"
@@ -401,7 +481,7 @@ local highlights = {
   },
   FloatBorder = {
     bg = "#1e2030",
-    fg = "#3e68d7"
+    fg = "#589ed7"
   },
   FoldColumn = {
     bg = "#222436",
@@ -467,7 +547,7 @@ local highlights = {
     fg = "#0db9d7"
   },
   HopNextKey2 = {
-    fg = "#1c5166"
+    fg = "#157d97"
   },
   HopUnmatched = {
     fg = "#545c7e"
@@ -572,11 +652,15 @@ local highlights = {
     fg = "#7a88cf"
   },
   LspFloatWinBorder = {
-    fg = "#3e68d7"
+    fg = "#589ed7"
   },
   LspFloatWinNormal = {
     bg = "#1e2030"
   },
+  LspInfoBorder = {
+    bg = "#1e2030",
+    fg = "#589ed7"
+  },
   LspReferenceRead = {
     bg = "#3b4261"
   },
@@ -614,7 +698,8 @@ local highlights = {
     fg = "#ff757f"
   },
   LspSignatureActiveParameter = {
-    fg = "#ff966c"
+    bg = "#2a3763",
+    bold = true
   },
   MatchParen = {
     bold = true,
@@ -636,8 +721,8 @@ local highlights = {
     fg = "#65bcff"
   },
   MiniJump = {
-    bg = "#c099ff",
-    fg = "#2f334d"
+    bg = "#ff007c",
+    fg = "#ffffff"
   },
   MiniJump2dSpot = {
     bold = true,
@@ -665,7 +750,7 @@ local highlights = {
     fg = "#c8d3f5"
   },
   MiniStarterItemBullet = {
-    fg = "#3e68d7"
+    fg = "#589ed7"
   },
   MiniStarterItemPrefix = {
     fg = "#ffc777"
@@ -931,6 +1016,143 @@ local highlights = {
   NeogitRemote = {
     fg = "#fca7ea"
   },
+  NeotestAdapterName = {
+    bold = true,
+    fg = "#fca7ea"
+  },
+  NeotestBorder = {
+    fg = "#82aaff"
+  },
+  NeotestDir = {
+    fg = "#82aaff"
+  },
+  NeotestExpandMarker = {
+    fg = "#828bb8"
+  },
+  NeotestFailed = {
+    fg = "#ff757f"
+  },
+  NeotestFile = {
+    fg = "#4fd6be"
+  },
+  NeotestFocused = {
+    fg = "#ffc777"
+  },
+  NeotestIndent = {
+    fg = "#828bb8"
+  },
+  NeotestMarked = {
+    fg = "#82aaff"
+  },
+  NeotestNamespace = {
+    fg = "#41a6b5"
+  },
+  NeotestPassed = {
+    fg = "#c3e88d"
+  },
+  NeotestRunning = {
+    fg = "#ffc777"
+  },
+  NeotestSkipped = {
+    fg = "#82aaff"
+  },
+  NeotestTarget = {
+    fg = "#82aaff"
+  },
+  NeotestTest = {
+    fg = "#828bb8"
+  },
+  NeotestWinSelect = {
+    fg = "#82aaff"
+  },
+  NoiceCompletionItemKindClass = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NoiceCompletionItemKindConstant = {
+    bg = "NONE",
+    fg = "#c099ff"
+  },
+  NoiceCompletionItemKindConstructor = {
+    bg = "NONE",
+    fg = "#82aaff"
+  },
+  NoiceCompletionItemKindDefault = {
+    bg = "NONE",
+    fg = "#828bb8"
+  },
+  NoiceCompletionItemKindEnum = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NoiceCompletionItemKindEnumMember = {
+    bg = "NONE",
+    fg = "#4fd6be"
+  },
+  NoiceCompletionItemKindEvent = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NoiceCompletionItemKindField = {
+    bg = "NONE",
+    fg = "#4fd6be"
+  },
+  NoiceCompletionItemKindFunction = {
+    bg = "NONE",
+    fg = "#82aaff"
+  },
+  NoiceCompletionItemKindInterface = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NoiceCompletionItemKindKeyword = {
+    bg = "NONE",
+    fg = "#86e1fc"
+  },
+  NoiceCompletionItemKindMethod = {
+    bg = "NONE",
+    fg = "#82aaff"
+  },
+  NoiceCompletionItemKindModule = {
+    bg = "NONE",
+    fg = "#ffc777"
+  },
+  NoiceCompletionItemKindOperator = {
+    bg = "NONE",
+    fg = "#4fd6be"
+  },
+  NoiceCompletionItemKindProperty = {
+    bg = "NONE",
+    fg = "#4fd6be"
+  },
+  NoiceCompletionItemKindReference = {
+    bg = "NONE",
+    fg = "#c099ff"
+  },
+  NoiceCompletionItemKindSnippet = {
+    bg = "NONE",
+    fg = "#737aa2"
+  },
+  NoiceCompletionItemKindStruct = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NoiceCompletionItemKindTypeParameter = {
+    bg = "NONE",
+    fg = "#4fd6be"
+  },
+  NoiceCompletionItemKindUnit = {
+    bg = "NONE",
+    fg = "#ff966c"
+  },
+  NoiceCompletionItemKindValue = {
+    bg = "NONE",
+    fg = "#c099ff"
+  },
+  NoiceCompletionItemKindVariable = {
+    bg = "NONE",
+    fg = "#c099ff"
+  },
   NonText = {
     fg = "#545c7e"
   },
@@ -940,7 +1162,7 @@ local highlights = {
   },
   NormalFloat = {
     bg = "#1e2030",
-    fg = "#c8d3f5"
+    fg = "#828bb8"
   },
   NormalNC = {
     bg = "#222436",
@@ -950,6 +1172,76 @@ local highlights = {
     bg = "#1e2030",
     fg = "#828bb8"
   },
+  NotifyDEBUGBody = {
+    bg = "#222436",
+    fg = "#c8d3f5"
+  },
+  NotifyDEBUGBorder = {
+    bg = "#222436",
+    fg = "#3c4264"
+  },
+  NotifyDEBUGIcon = {
+    fg = "#7a88cf"
+  },
+  NotifyDEBUGTitle = {
+    fg = "#7a88cf"
+  },
+  NotifyERRORBody = {
+    bg = "#222436",
+    fg = "#c8d3f5"
+  },
+  NotifyERRORBorder = {
+    bg = "#222436",
+    fg = "#532b3f"
+  },
+  NotifyERRORIcon = {
+    fg = "#c53b53"
+  },
+  NotifyERRORTitle = {
+    fg = "#c53b53"
+  },
+  NotifyINFOBody = {
+    bg = "#222436",
+    fg = "#c8d3f5"
+  },
+  NotifyINFOBorder = {
+    bg = "#222436",
+    fg = "#1c5166"
+  },
+  NotifyINFOIcon = {
+    fg = "#0db9d7"
+  },
+  NotifyINFOTitle = {
+    fg = "#0db9d7"
+  },
+  NotifyTRACEBody = {
+    bg = "#222436",
+    fg = "#c8d3f5"
+  },
+  NotifyTRACEBorder = {
+    bg = "#222436",
+    fg = "#634b6c"
+  },
+  NotifyTRACEIcon = {
+    fg = "#fca7ea"
+  },
+  NotifyTRACETitle = {
+    fg = "#fca7ea"
+  },
+  NotifyWARNBody = {
+    bg = "#222436",
+    fg = "#c8d3f5"
+  },
+  NotifyWARNBorder = {
+    bg = "#222436",
+    fg = "#64554a"
+  },
+  NotifyWARNIcon = {
+    fg = "#ffc777"
+  },
+  NotifyWARNTitle = {
+    fg = "#ffc777"
+  },
   NvimTreeFolderIcon = {
     bg = "NONE",
     fg = "#ffc777"
@@ -1138,70 +1430,17 @@ local highlights = {
     bg = "#ff757f",
     fg = "#1b1d2b"
   },
-  TSConstructor = {
-    fg = "#c099ff"
+  TSNodeKey = {
+    bold = true,
+    fg = "#ff007c"
   },
-  TSDanger = {
-    bg = "#c53b53",
-    fg = "#222436"
-  },
-  TSField = {
-    fg = "#4fd6be"
-  },
-  TSKeyword = {
-    fg = "#fca7ea",
-    style = {
-      italic = true
-    }
-  },
-  TSKeywordFunction = {
-    fg = "#c099ff",
-    style = {}
-  },
-  TSLabel = {
-    fg = "#82aaff"
+  TSNodeUnmatched = {
+    fg = "#545c7e"
   },
   TSNote = {
     bg = "#0db9d7",
     fg = "#222436"
   },
-  TSOperator = {
-    fg = "#89ddff"
-  },
-  TSParameter = {
-    fg = "#ffc777"
-  },
-  TSProperty = {
-    fg = "#4fd6be"
-  },
-  TSPunctBracket = {
-    fg = "#828bb8"
-  },
-  TSPunctDelimiter = {
-    fg = "#89ddff"
-  },
-  TSPunctSpecial = {
-    fg = "#89ddff"
-  },
-  TSStringEscape = {
-    fg = "#c099ff"
-  },
-  TSStringRegex = {
-    fg = "#b4f9f8"
-  },
-  TSTextReference = {
-    fg = "#4fd6be"
-  },
-  TSVariable = {
-    style = {}
-  },
-  TSVariableBuiltin = {
-    fg = "#ff757f"
-  },
-  TSWarning = {
-    bg = "#ffc777",
-    fg = "#222436"
-  },
   TabLine = {
     bg = "#1e2030",
     fg = "#3b4261"
@@ -1218,7 +1457,7 @@ local highlights = {
   },
   TelescopeBorder = {
     bg = "#1e2030",
-    fg = "#3e68d7"
+    fg = "#589ed7"
   },
   TelescopeNormal = {
     bg = "#1e2030",
@@ -1292,6 +1531,12 @@ local highlights = {
     bold = true,
     fg = "#1b1d2b"
   },
+  YankyPut = {
+    link = "IncSearch"
+  },
+  YankyYanked = {
+    link = "IncSearch"
+  },
   debugBreakpoint = {
     bg = "#203346",
     fg = "#0db9d7"
@@ -1391,24 +1636,24 @@ local highlights = {
     fg = "#737aa2"
   },
   rainbowcol1 = {
-    fg = "#545c7e"
+    fg = "#ff757f"
   },
   rainbowcol2 = {
     fg = "#ffc777"
   },
   rainbowcol3 = {
-    fg = "#0db9d7"
+    fg = "#c3e88d"
   },
   rainbowcol4 = {
-    fg = "#ff966c"
-  },
-  rainbowcol5 = {
-    fg = "#fca7ea"
-  },
-  rainbowcol6 = {
     fg = "#4fd6be"
   },
+  rainbowcol5 = {
+    fg = "#82aaff"
+  },
+  rainbowcol6 = {
+    fg = "#c099ff"
+  },
   rainbowcol7 = {
-    fg = "#ff757f"
+    fg = "#fca7ea"
   }
 }
diff --git a/extras/lua/tokyonight_night.lua b/extras/lua/tokyonight_night.lua
index 97a9d50..da4dfae 100644
--- a/extras/lua/tokyonight_night.lua
+++ b/extras/lua/tokyonight_night.lua
@@ -17,7 +17,7 @@ local colors = {
   blue6 = "#b4f9f8",
   blue7 = "#394b70",
   border = "#15161e",
-  border_highlight = "#3d59a1",
+  border_highlight = "#27a1b9",
   comment = "#565f89",
   cyan = "#7dcfff",
   dark3 = "#545c7e",
@@ -31,6 +31,7 @@ local colors = {
   error = "#db4b4b",
   fg = "#c0caf5",
   fg_dark = "#a9b1d6",
+  fg_float = "#a9b1d6",
   fg_gutter = "#3b4261",
   fg_sidebar = "#a9b1d6",
   git = {
@@ -63,20 +64,96 @@ local colors = {
 }
 
 local highlights = {
+  ["@constructor"] = {
+    fg = "#bb9af7"
+  },
+  ["@field"] = {
+    fg = "#73daca"
+  },
+  ["@keyword"] = {
+    fg = "#9d7cd8",
+    style = {
+      italic = true
+    }
+  },
+  ["@keyword.function"] = {
+    fg = "#bb9af7",
+    style = {}
+  },
+  ["@label"] = {
+    fg = "#7aa2f7"
+  },
+  ["@operator"] = {
+    fg = "#89ddff"
+  },
+  ["@parameter"] = {
+    fg = "#e0af68"
+  },
+  ["@property"] = {
+    fg = "#73daca"
+  },
+  ["@punctuation.bracket"] = {
+    fg = "#a9b1d6"
+  },
+  ["@punctuation.delimiter"] = {
+    fg = "#89ddff"
+  },
+  ["@punctuation.special"] = {
+    fg = "#89ddff"
+  },
   ["@punctuation.special.markdown"] = {
     bold = true,
     fg = "#ff9e64"
   },
+  ["@string.escape"] = {
+    fg = "#bb9af7"
+  },
+  ["@string.regex"] = {
+    fg = "#b4f9f8"
+  },
+  ["@text.danger"] = {
+    bg = "#db4b4b",
+    fg = "#1a1b26"
+  },
   ["@text.literal.markdown_inline"] = {
     bg = "#414868",
     fg = "#7aa2f7"
   },
+  ["@text.reference"] = {
+    fg = "#1abc9c"
+  },
+  ["@text.warning"] = {
+    bg = "#e0af68",
+    fg = "#1a1b26"
+  },
+  ["@variable"] = {
+    style = {}
+  },
+  ["@variable.builtin"] = {
+    fg = "#f7768e"
+  },
   ALEErrorSign = {
     fg = "#db4b4b"
   },
   ALEWarningSign = {
     fg = "#e0af68"
   },
+  AlphaButtons = {
+    fg = "#bb9af7"
+  },
+  AlphaFooter = {
+    fg = "#e0af68",
+    italic = true
+  },
+  AlphaHeader = {
+    fg = "#7aa2f7"
+  },
+  AlphaHeaderLabel = {
+    fg = "#ff9e64"
+  },
+  AlphaShortcut = {
+    fg = "#7dcfff"
+  },
   Bold = {
     bold = true
   },
@@ -114,7 +191,7 @@ local highlights = {
   },
   BufferInactiveSign = {
     bg = "#16161e",
-    fg = "#3d59a1"
+    fg = "#27a1b9"
   },
   BufferInactiveTarget = {
     bg = "#16161e",
@@ -125,7 +202,7 @@ local highlights = {
   },
   BufferTabpage = {
     bg = "#16161e",
-    fg = "#3d59a1"
+    fg = "#27a1b9"
   },
   BufferTabpages = {
     bg = "#16161e",
@@ -160,7 +237,7 @@ local highlights = {
   },
   CmpDocumentationBorder = {
     bg = "#16161e",
-    fg = "#3d59a1"
+    fg = "#27a1b9"
   },
   CmpItemAbbr = {
     bg = "NONE",
@@ -286,6 +363,9 @@ local highlights = {
   Constant = {
     fg = "#ff9e64"
   },
+  CurSearch = {
+    link = "IncSearch"
+  },
   Cursor = {
     bg = "#c0caf5",
     fg = "#1a1b26"
@@ -401,7 +481,7 @@ local highlights = {
   },
   FloatBorder = {
     bg = "#16161e",
-    fg = "#3d59a1"
+    fg = "#27a1b9"
   },
   FoldColumn = {
     bg = "#1a1b26",
@@ -467,7 +547,7 @@ local highlights = {
     fg = "#0db9d7"
   },
   HopNextKey2 = {
-    fg = "#164a5b"
+    fg = "#127a90"
   },
   HopUnmatched = {
     fg = "#545c7e"
@@ -572,11 +652,15 @@ local highlights = {
     fg = "#565f89"
   },
   LspFloatWinBorder = {
-    fg = "#3d59a1"
+    fg = "#27a1b9"
   },
   LspFloatWinNormal = {
     bg = "#16161e"
   },
+  LspInfoBorder = {
+    bg = "#16161e",
+    fg = "#27a1b9"
+  },
   LspReferenceRead = {
     bg = "#3b4261"
   },
@@ -614,7 +698,8 @@ local highlights = {
     fg = "#f7768e"
   },
   LspSignatureActiveParameter = {
-    fg = "#ff9e64"
+    bg = "#242c48",
+    bold = true
   },
   MatchParen = {
     bold = true,
@@ -636,8 +721,8 @@ local highlights = {
     fg = "#2ac3de"
   },
   MiniJump = {
-    bg = "#bb9af7",
-    fg = "#292e42"
+    bg = "#ff007c",
+    fg = "#ffffff"
   },
   MiniJump2dSpot = {
     bold = true,
@@ -665,7 +750,7 @@ local highlights = {
     fg = "#c0caf5"
   },
   MiniStarterItemBullet = {
-    fg = "#3d59a1"
+    fg = "#27a1b9"
   },
   MiniStarterItemPrefix = {
     fg = "#e0af68"
@@ -931,6 +1016,143 @@ local highlights = {
   NeogitRemote = {
     fg = "#9d7cd8"
   },
+  NeotestAdapterName = {
+    bold = true,
+    fg = "#9d7cd8"
+  },
+  NeotestBorder = {
+    fg = "#7aa2f7"
+  },
+  NeotestDir = {
+    fg = "#7aa2f7"
+  },
+  NeotestExpandMarker = {
+    fg = "#a9b1d6"
+  },
+  NeotestFailed = {
+    fg = "#f7768e"
+  },
+  NeotestFile = {
+    fg = "#1abc9c"
+  },
+  NeotestFocused = {
+    fg = "#e0af68"
+  },
+  NeotestIndent = {
+    fg = "#a9b1d6"
+  },
+  NeotestMarked = {
+    fg = "#7aa2f7"
+  },
+  NeotestNamespace = {
+    fg = "#41a6b5"
+  },
+  NeotestPassed = {
+    fg = "#9ece6a"
+  },
+  NeotestRunning = {
+    fg = "#e0af68"
+  },
+  NeotestSkipped = {
+    fg = "#7aa2f7"
+  },
+  NeotestTarget = {
+    fg = "#7aa2f7"
+  },
+  NeotestTest = {
+    fg = "#a9b1d6"
+  },
+  NeotestWinSelect = {
+    fg = "#7aa2f7"
+  },
+  NoiceCompletionItemKindClass = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NoiceCompletionItemKindConstant = {
+    bg = "NONE",
+    fg = "#bb9af7"
+  },
+  NoiceCompletionItemKindConstructor = {
+    bg = "NONE",
+    fg = "#7aa2f7"
+  },
+  NoiceCompletionItemKindDefault = {
+    bg = "NONE",
+    fg = "#a9b1d6"
+  },
+  NoiceCompletionItemKindEnum = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NoiceCompletionItemKindEnumMember = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NoiceCompletionItemKindEvent = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NoiceCompletionItemKindField = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NoiceCompletionItemKindFunction = {
+    bg = "NONE",
+    fg = "#7aa2f7"
+  },
+  NoiceCompletionItemKindInterface = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NoiceCompletionItemKindKeyword = {
+    bg = "NONE",
+    fg = "#7dcfff"
+  },
+  NoiceCompletionItemKindMethod = {
+    bg = "NONE",
+    fg = "#7aa2f7"
+  },
+  NoiceCompletionItemKindModule = {
+    bg = "NONE",
+    fg = "#e0af68"
+  },
+  NoiceCompletionItemKindOperator = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NoiceCompletionItemKindProperty = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NoiceCompletionItemKindReference = {
+    bg = "NONE",
+    fg = "#bb9af7"
+  },
+  NoiceCompletionItemKindSnippet = {
+    bg = "NONE",
+    fg = "#737aa2"
+  },
+  NoiceCompletionItemKindStruct = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NoiceCompletionItemKindTypeParameter = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NoiceCompletionItemKindUnit = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NoiceCompletionItemKindValue = {
+    bg = "NONE",
+    fg = "#bb9af7"
+  },
+  NoiceCompletionItemKindVariable = {
+    bg = "NONE",
+    fg = "#bb9af7"
+  },
   NonText = {
     fg = "#545c7e"
   },
@@ -940,7 +1162,7 @@ local highlights = {
   },
   NormalFloat = {
     bg = "#16161e",
-    fg = "#c0caf5"
+    fg = "#a9b1d6"
   },
   NormalNC = {
     bg = "#1a1b26",
@@ -950,6 +1172,76 @@ local highlights = {
     bg = "#16161e",
     fg = "#a9b1d6"
   },
+  NotifyDEBUGBody = {
+    bg = "#1a1b26",
+    fg = "#c0caf5"
+  },
+  NotifyDEBUGBorder = {
+    bg = "#1a1b26",
+    fg = "#2c2f44"
+  },
+  NotifyDEBUGIcon = {
+    fg = "#565f89"
+  },
+  NotifyDEBUGTitle = {
+    fg = "#565f89"
+  },
+  NotifyERRORBody = {
+    bg = "#1a1b26",
+    fg = "#c0caf5"
+  },
+  NotifyERRORBorder = {
+    bg = "#1a1b26",
+    fg = "#542931"
+  },
+  NotifyERRORIcon = {
+    fg = "#db4b4b"
+  },
+  NotifyERRORTitle = {
+    fg = "#db4b4b"
+  },
+  NotifyINFOBody = {
+    bg = "#1a1b26",
+    fg = "#c0caf5"
+  },
+  NotifyINFOBorder = {
+    bg = "#1a1b26",
+    fg = "#164a5b"
+  },
+  NotifyINFOIcon = {
+    fg = "#0db9d7"
+  },
+  NotifyINFOTitle = {
+    fg = "#0db9d7"
+  },
+  NotifyTRACEBody = {
+    bg = "#1a1b26",
+    fg = "#c0caf5"
+  },
+  NotifyTRACEBorder = {
+    bg = "#1a1b26",
+    fg = "#41385b"
+  },
+  NotifyTRACEIcon = {
+    fg = "#9d7cd8"
+  },
+  NotifyTRACETitle = {
+    fg = "#9d7cd8"
+  },
+  NotifyWARNBody = {
+    bg = "#1a1b26",
+    fg = "#c0caf5"
+  },
+  NotifyWARNBorder = {
+    bg = "#1a1b26",
+    fg = "#55473a"
+  },
+  NotifyWARNIcon = {
+    fg = "#e0af68"
+  },
+  NotifyWARNTitle = {
+    fg = "#e0af68"
+  },
   NvimTreeFolderIcon = {
     bg = "NONE",
     fg = "#e0af68"
@@ -1138,70 +1430,17 @@ local highlights = {
     bg = "#f7768e",
     fg = "#15161e"
   },
-  TSConstructor = {
-    fg = "#bb9af7"
+  TSNodeKey = {
+    bold = true,
+    fg = "#ff007c"
   },
-  TSDanger = {
-    bg = "#db4b4b",
-    fg = "#1a1b26"
-  },
-  TSField = {
-    fg = "#73daca"
-  },
-  TSKeyword = {
-    fg = "#9d7cd8",
-    style = {
-      italic = true
-    }
-  },
-  TSKeywordFunction = {
-    fg = "#bb9af7",
-    style = {}
-  },
-  TSLabel = {
-    fg = "#7aa2f7"
+  TSNodeUnmatched = {
+    fg = "#545c7e"
   },
   TSNote = {
     bg = "#0db9d7",
     fg = "#1a1b26"
   },
-  TSOperator = {
-    fg = "#89ddff"
-  },
-  TSParameter = {
-    fg = "#e0af68"
-  },
-  TSProperty = {
-    fg = "#73daca"
-  },
-  TSPunctBracket = {
-    fg = "#a9b1d6"
-  },
-  TSPunctDelimiter = {
-    fg = "#89ddff"
-  },
-  TSPunctSpecial = {
-    fg = "#89ddff"
-  },
-  TSStringEscape = {
-    fg = "#bb9af7"
-  },
-  TSStringRegex = {
-    fg = "#b4f9f8"
-  },
-  TSTextReference = {
-    fg = "#1abc9c"
-  },
-  TSVariable = {
-    style = {}
-  },
-  TSVariableBuiltin = {
-    fg = "#f7768e"
-  },
-  TSWarning = {
-    bg = "#e0af68",
-    fg = "#1a1b26"
-  },
   TabLine = {
     bg = "#16161e",
     fg = "#3b4261"
@@ -1218,7 +1457,7 @@ local highlights = {
   },
   TelescopeBorder = {
     bg = "#16161e",
-    fg = "#3d59a1"
+    fg = "#27a1b9"
   },
   TelescopeNormal = {
     bg = "#16161e",
@@ -1292,6 +1531,12 @@ local highlights = {
     bold = true,
     fg = "#15161e"
   },
+  YankyPut = {
+    link = "IncSearch"
+  },
+  YankyYanked = {
+    link = "IncSearch"
+  },
   debugBreakpoint = {
     bg = "#192b38",
     fg = "#0db9d7"
@@ -1391,24 +1636,24 @@ local highlights = {
     fg = "#737aa2"
   },
   rainbowcol1 = {
-    fg = "#545c7e"
+    fg = "#f7768e"
   },
   rainbowcol2 = {
     fg = "#e0af68"
   },
   rainbowcol3 = {
-    fg = "#0db9d7"
+    fg = "#9ece6a"
   },
   rainbowcol4 = {
-    fg = "#ff9e64"
+    fg = "#1abc9c"
   },
   rainbowcol5 = {
-    fg = "#9d7cd8"
+    fg = "#7aa2f7"
   },
   rainbowcol6 = {
-    fg = "#73daca"
+    fg = "#bb9af7"
   },
   rainbowcol7 = {
-    fg = "#f7768e"
+    fg = "#9d7cd8"
   }
 }
diff --git a/extras/lua/tokyonight_storm.lua b/extras/lua/tokyonight_storm.lua
index 4c886a4..2979cfc 100644
--- a/extras/lua/tokyonight_storm.lua
+++ b/extras/lua/tokyonight_storm.lua
@@ -17,7 +17,7 @@ local colors = {
   blue6 = "#b4f9f8",
   blue7 = "#394b70",
   border = "#1d202f",
-  border_highlight = "#3d59a1",
+  border_highlight = "#29a4bd",
   comment = "#565f89",
   cyan = "#7dcfff",
   dark3 = "#545c7e",
@@ -31,6 +31,7 @@ local colors = {
   error = "#db4b4b",
   fg = "#c0caf5",
   fg_dark = "#a9b1d6",
+  fg_float = "#a9b1d6",
   fg_gutter = "#3b4261",
   fg_sidebar = "#a9b1d6",
   git = {
@@ -63,20 +64,96 @@ local colors = {
 }
 
 local highlights = {
+  ["@constructor"] = {
+    fg = "#bb9af7"
+  },
+  ["@field"] = {
+    fg = "#73daca"
+  },
+  ["@keyword"] = {
+    fg = "#9d7cd8",
+    style = {
+      italic = true
+    }
+  },
+  ["@keyword.function"] = {
+    fg = "#bb9af7",
+    style = {}
+  },
+  ["@label"] = {
+    fg = "#7aa2f7"
+  },
+  ["@operator"] = {
+    fg = "#89ddff"
+  },
+  ["@parameter"] = {
+    fg = "#e0af68"
+  },
+  ["@property"] = {
+    fg = "#73daca"
+  },
+  ["@punctuation.bracket"] = {
+    fg = "#a9b1d6"
+  },
+  ["@punctuation.delimiter"] = {
+    fg = "#89ddff"
+  },
+  ["@punctuation.special"] = {
+    fg = "#89ddff"
+  },
   ["@punctuation.special.markdown"] = {
     bold = true,
     fg = "#ff9e64"
   },
+  ["@string.escape"] = {
+    fg = "#bb9af7"
+  },
+  ["@string.regex"] = {
+    fg = "#b4f9f8"
+  },
+  ["@text.danger"] = {
+    bg = "#db4b4b",
+    fg = "#24283b"
+  },
   ["@text.literal.markdown_inline"] = {
     bg = "#414868",
     fg = "#7aa2f7"
   },
+  ["@text.reference"] = {
+    fg = "#1abc9c"
+  },
+  ["@text.warning"] = {
+    bg = "#e0af68",
+    fg = "#24283b"
+  },
+  ["@variable"] = {
+    style = {}
+  },
+  ["@variable.builtin"] = {
+    fg = "#f7768e"
+  },
   ALEErrorSign = {
     fg = "#db4b4b"
   },
   ALEWarningSign = {
     fg = "#e0af68"
   },
+  AlphaButtons = {
+    fg = "#bb9af7"
+  },
+  AlphaFooter = {
+    fg = "#e0af68",
+    italic = true
+  },
+  AlphaHeader = {
+    fg = "#7aa2f7"
+  },
+  AlphaHeaderLabel = {
+    fg = "#ff9e64"
+  },
+  AlphaShortcut = {
+    fg = "#7dcfff"
+  },
   Bold = {
     bold = true
   },
@@ -114,7 +191,7 @@ local highlights = {
   },
   BufferInactiveSign = {
     bg = "#1f2335",
-    fg = "#3d59a1"
+    fg = "#29a4bd"
   },
   BufferInactiveTarget = {
     bg = "#1f2335",
@@ -125,7 +202,7 @@ local highlights = {
   },
   BufferTabpage = {
     bg = "#1f2335",
-    fg = "#3d59a1"
+    fg = "#29a4bd"
   },
   BufferTabpages = {
     bg = "#1f2335",
@@ -160,7 +237,7 @@ local highlights = {
   },
   CmpDocumentationBorder = {
     bg = "#1f2335",
-    fg = "#3d59a1"
+    fg = "#29a4bd"
   },
   CmpItemAbbr = {
     bg = "NONE",
@@ -286,6 +363,9 @@ local highlights = {
   Constant = {
     fg = "#ff9e64"
   },
+  CurSearch = {
+    link = "IncSearch"
+  },
   Cursor = {
     bg = "#c0caf5",
     fg = "#24283b"
@@ -401,7 +481,7 @@ local highlights = {
   },
   FloatBorder = {
     bg = "#1f2335",
-    fg = "#3d59a1"
+    fg = "#29a4bd"
   },
   FoldColumn = {
     bg = "#24283b",
@@ -467,7 +547,7 @@ local highlights = {
     fg = "#0db9d7"
   },
   HopNextKey2 = {
-    fg = "#1d546a"
+    fg = "#167f99"
   },
   HopUnmatched = {
     fg = "#545c7e"
@@ -572,11 +652,15 @@ local highlights = {
     fg = "#565f89"
   },
   LspFloatWinBorder = {
-    fg = "#3d59a1"
+    fg = "#29a4bd"
   },
   LspFloatWinNormal = {
     bg = "#1f2335"
   },
+  LspInfoBorder = {
+    bg = "#1f2335",
+    fg = "#29a4bd"
+  },
   LspReferenceRead = {
     bg = "#3b4261"
   },
@@ -614,7 +698,8 @@ local highlights = {
     fg = "#f7768e"
   },
   LspSignatureActiveParameter = {
-    fg = "#ff9e64"
+    bg = "#2b3657",
+    bold = true
   },
   MatchParen = {
     bold = true,
@@ -636,8 +721,8 @@ local highlights = {
     fg = "#2ac3de"
   },
   MiniJump = {
-    bg = "#bb9af7",
-    fg = "#292e42"
+    bg = "#ff007c",
+    fg = "#ffffff"
   },
   MiniJump2dSpot = {
     bold = true,
@@ -665,7 +750,7 @@ local highlights = {
     fg = "#c0caf5"
   },
   MiniStarterItemBullet = {
-    fg = "#3d59a1"
+    fg = "#29a4bd"
   },
   MiniStarterItemPrefix = {
     fg = "#e0af68"
@@ -931,6 +1016,143 @@ local highlights = {
   NeogitRemote = {
     fg = "#9d7cd8"
   },
+  NeotestAdapterName = {
+    bold = true,
+    fg = "#9d7cd8"
+  },
+  NeotestBorder = {
+    fg = "#7aa2f7"
+  },
+  NeotestDir = {
+    fg = "#7aa2f7"
+  },
+  NeotestExpandMarker = {
+    fg = "#a9b1d6"
+  },
+  NeotestFailed = {
+    fg = "#f7768e"
+  },
+  NeotestFile = {
+    fg = "#1abc9c"
+  },
+  NeotestFocused = {
+    fg = "#e0af68"
+  },
+  NeotestIndent = {
+    fg = "#a9b1d6"
+  },
+  NeotestMarked = {
+    fg = "#7aa2f7"
+  },
+  NeotestNamespace = {
+    fg = "#41a6b5"
+  },
+  NeotestPassed = {
+    fg = "#9ece6a"
+  },
+  NeotestRunning = {
+    fg = "#e0af68"
+  },
+  NeotestSkipped = {
+    fg = "#7aa2f7"
+  },
+  NeotestTarget = {
+    fg = "#7aa2f7"
+  },
+  NeotestTest = {
+    fg = "#a9b1d6"
+  },
+  NeotestWinSelect = {
+    fg = "#7aa2f7"
+  },
+  NoiceCompletionItemKindClass = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NoiceCompletionItemKindConstant = {
+    bg = "NONE",
+    fg = "#bb9af7"
+  },
+  NoiceCompletionItemKindConstructor = {
+    bg = "NONE",
+    fg = "#7aa2f7"
+  },
+  NoiceCompletionItemKindDefault = {
+    bg = "NONE",
+    fg = "#a9b1d6"
+  },
+  NoiceCompletionItemKindEnum = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NoiceCompletionItemKindEnumMember = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NoiceCompletionItemKindEvent = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NoiceCompletionItemKindField = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NoiceCompletionItemKindFunction = {
+    bg = "NONE",
+    fg = "#7aa2f7"
+  },
+  NoiceCompletionItemKindInterface = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NoiceCompletionItemKindKeyword = {
+    bg = "NONE",
+    fg = "#7dcfff"
+  },
+  NoiceCompletionItemKindMethod = {
+    bg = "NONE",
+    fg = "#7aa2f7"
+  },
+  NoiceCompletionItemKindModule = {
+    bg = "NONE",
+    fg = "#e0af68"
+  },
+  NoiceCompletionItemKindOperator = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NoiceCompletionItemKindProperty = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NoiceCompletionItemKindReference = {
+    bg = "NONE",
+    fg = "#bb9af7"
+  },
+  NoiceCompletionItemKindSnippet = {
+    bg = "NONE",
+    fg = "#737aa2"
+  },
+  NoiceCompletionItemKindStruct = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NoiceCompletionItemKindTypeParameter = {
+    bg = "NONE",
+    fg = "#73daca"
+  },
+  NoiceCompletionItemKindUnit = {
+    bg = "NONE",
+    fg = "#ff9e64"
+  },
+  NoiceCompletionItemKindValue = {
+    bg = "NONE",
+    fg = "#bb9af7"
+  },
+  NoiceCompletionItemKindVariable = {
+    bg = "NONE",
+    fg = "#bb9af7"
+  },
   NonText = {
     fg = "#545c7e"
   },
@@ -940,7 +1162,7 @@ local highlights = {
   },
   NormalFloat = {
     bg = "#1f2335",
-    fg = "#c0caf5"
+    fg = "#a9b1d6"
   },
   NormalNC = {
     bg = "#24283b",
@@ -950,6 +1172,76 @@ local highlights = {
     bg = "#1f2335",
     fg = "#a9b1d6"
   },
+  NotifyDEBUGBody = {
+    bg = "#24283b",
+    fg = "#c0caf5"
+  },
+  NotifyDEBUGBorder = {
+    bg = "#24283b",
+    fg = "#333952"
+  },
+  NotifyDEBUGIcon = {
+    fg = "#565f89"
+  },
+  NotifyDEBUGTitle = {
+    fg = "#565f89"
+  },
+  NotifyERRORBody = {
+    bg = "#24283b",
+    fg = "#c0caf5"
+  },
+  NotifyERRORBorder = {
+    bg = "#24283b",
+    fg = "#5b3340"
+  },
+  NotifyERRORIcon = {
+    fg = "#db4b4b"
+  },
+  NotifyERRORTitle = {
+    fg = "#db4b4b"
+  },
+  NotifyINFOBody = {
+    bg = "#24283b",
+    fg = "#c0caf5"
+  },
+  NotifyINFOBorder = {
+    bg = "#24283b",
+    fg = "#1d546a"
+  },
+  NotifyINFOIcon = {
+    fg = "#0db9d7"
+  },
+  NotifyINFOTitle = {
+    fg = "#0db9d7"
+  },
+  NotifyTRACEBody = {
+    bg = "#24283b",
+    fg = "#c0caf5"
+  },
+  NotifyTRACEBorder = {
+    bg = "#24283b",
+    fg = "#48416a"
+  },
+  NotifyTRACEIcon = {
+    fg = "#9d7cd8"
+  },
+  NotifyTRACETitle = {
+    fg = "#9d7cd8"
+  },
+  NotifyWARNBody = {
+    bg = "#24283b",
+    fg = "#c0caf5"
+  },
+  NotifyWARNBorder = {
+    bg = "#24283b",
+    fg = "#5c5149"
+  },
+  NotifyWARNIcon = {
+    fg = "#e0af68"
+  },
+  NotifyWARNTitle = {
+    fg = "#e0af68"
+  },
   NvimTreeFolderIcon = {
     bg = "NONE",
     fg = "#e0af68"
@@ -1138,70 +1430,17 @@ local highlights = {
     bg = "#f7768e",
     fg = "#1d202f"
   },
-  TSConstructor = {
-    fg = "#bb9af7"
+  TSNodeKey = {
+    bold = true,
+    fg = "#ff007c"
   },
-  TSDanger = {
-    bg = "#db4b4b",
-    fg = "#24283b"
-  },
-  TSField = {
-    fg = "#73daca"
-  },
-  TSKeyword = {
-    fg = "#9d7cd8",
-    style = {
-      italic = true
-    }
-  },
-  TSKeywordFunction = {
-    fg = "#bb9af7",
-    style = {}
-  },
-  TSLabel = {
-    fg = "#7aa2f7"
+  TSNodeUnmatched = {
+    fg = "#545c7e"
   },
   TSNote = {
     bg = "#0db9d7",
     fg = "#24283b"
   },
-  TSOperator = {
-    fg = "#89ddff"
-  },
-  TSParameter = {
-    fg = "#e0af68"
-  },
-  TSProperty = {
-    fg = "#73daca"
-  },
-  TSPunctBracket = {
-    fg = "#a9b1d6"
-  },
-  TSPunctDelimiter = {
-    fg = "#89ddff"
-  },
-  TSPunctSpecial = {
-    fg = "#89ddff"
-  },
-  TSStringEscape = {
-    fg = "#bb9af7"
-  },
-  TSStringRegex = {
-    fg = "#b4f9f8"
-  },
-  TSTextReference = {
-    fg = "#1abc9c"
-  },
-  TSVariable = {
-    style = {}
-  },
-  TSVariableBuiltin = {
-    fg = "#f7768e"
-  },
-  TSWarning = {
-    bg = "#e0af68",
-    fg = "#24283b"
-  },
   TabLine = {
     bg = "#1f2335",
     fg = "#3b4261"
@@ -1218,7 +1457,7 @@ local highlights = {
   },
   TelescopeBorder = {
     bg = "#1f2335",
-    fg = "#3d59a1"
+    fg = "#29a4bd"
   },
   TelescopeNormal = {
     bg = "#1f2335",
@@ -1292,6 +1531,12 @@ local highlights = {
     bold = true,
     fg = "#1d202f"
   },
+  YankyPut = {
+    link = "IncSearch"
+  },
+  YankyYanked = {
+    link = "IncSearch"
+  },
   debugBreakpoint = {
     bg = "#22374b",
     fg = "#0db9d7"
@@ -1391,24 +1636,24 @@ local highlights = {
     fg = "#737aa2"
   },
   rainbowcol1 = {
-    fg = "#545c7e"
+    fg = "#f7768e"
   },
   rainbowcol2 = {
     fg = "#e0af68"
   },
   rainbowcol3 = {
-    fg = "#0db9d7"
+    fg = "#9ece6a"
   },
   rainbowcol4 = {
-    fg = "#ff9e64"
+    fg = "#1abc9c"
   },
   rainbowcol5 = {
-    fg = "#9d7cd8"
+    fg = "#7aa2f7"
   },
   rainbowcol6 = {
-    fg = "#73daca"
+    fg = "#bb9af7"
   },
   rainbowcol7 = {
-    fg = "#f7768e"
+    fg = "#9d7cd8"
   }
 }
diff --git a/lua/tokyonight/extra/kitty.lua b/lua/tokyonight/extra/kitty.lua
index ab4d3db..5e71f92 100644
--- a/lua/tokyonight/extra/kitty.lua
+++ b/lua/tokyonight/extra/kitty.lua
@@ -56,7 +56,7 @@ color15 ${fg}
 # extended colors
 color16 ${orange}
 color17 ${red1}
-  ]],
+]],
     colors
   )
   return kitty
diff --git a/lua/tokyonight/extra/tmux.lua b/lua/tokyonight/extra/tmux.lua
index b8c8b21..2874827 100644
--- a/lua/tokyonight/extra/tmux.lua
+++ b/lua/tokyonight/extra/tmux.lua
@@ -41,7 +41,7 @@ setw -g window-status-current-format "#[fg=${bg_statusline},bg=${fg_gutter},nobo
 # tmux-plugins/tmux-prefix-highlight support
 set -g @prefix_highlight_output_prefix "#[fg=${yellow}]#[bg=${bg_statusline}]#[fg=${bg_statusline}]#[bg=${yellow}]"
 set -g @prefix_highlight_output_suffix ""
-  ]],
+]],
     colors
   )
   return tmux