Merge remote-tracking branch 'upstream/main'

2024-02-09 14:24:59 -05:00
parent a87191e8f0 610179f7f1
commit 27882d701e
35 changed files with 1395 additions and 546 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Changelog

+## [3.0.1](https://github.com/folke/tokyonight.nvim/compare/v3.0.0...v3.0.1) (2024-01-21)
+
+
+### Bug Fixes
+
+* **treesitter:** consolidate notes ([ba35fbe](https://github.com/folke/tokyonight.nvim/commit/ba35fbe16ceea7e5fbe8b9a0247c06804c385538))
+* **treesitter:** defaults for [@namespace](https://github.com/namespace).builtin ([65a88b1](https://github.com/folke/tokyonight.nvim/commit/65a88b14d9c132daa678d0c5f0aa70dccdc0d6a5))
+
+## [3.0.0](https://github.com/folke/tokyonight.nvim/compare/v2.9.0...v3.0.0) (2024-01-20)
+
+
+### ⚠ BREAKING CHANGES
+
+* added support for treesitter 0.9.2. Eearlier TS versions are no longer supported.
+* add treesitter default groups to theme
+* remove compat with old treesitter group names from over a year ago
+
+### Features
+
+* added support for treesitter 0.9.2. Eearlier TS versions are no longer supported. ([18d46ae](https://github.com/folke/tokyonight.nvim/commit/18d46aeca7fa62a1c2d816fd0df4bc553412bc30))
+* changed alacritty .yml to .toml ([#450](https://github.com/folke/tokyonight.nvim/issues/450)) ([ffc7505](https://github.com/folke/tokyonight.nvim/commit/ffc7505a1426ec2472c75d8e8712df611a5ef5a2))
+* **extras:** add fzf colors ([#464](https://github.com/folke/tokyonight.nvim/issues/464)) ([75c60d5](https://github.com/folke/tokyonight.nvim/commit/75c60d569481aa8ec36c857701b6c5c5aaef3340))
+* **wezterm:** add color for scrollbar ([#470](https://github.com/folke/tokyonight.nvim/issues/470)) ([5b2d7ab](https://github.com/folke/tokyonight.nvim/commit/5b2d7ab1bae530f662713820957665c87a774873))
+
+
+### Bug Fixes
+
+* add treesitter default groups to theme ([bddedb1](https://github.com/folke/tokyonight.nvim/commit/bddedb17bd5d8f47a8d8b1febea7c0b9a585e4ef))
+* **helix:** fixed helix theme with new TS groups ([2e00d06](https://github.com/folke/tokyonight.nvim/commit/2e00d06319072953b54b0316146151d31e71680c))
+* remove compat with old treesitter group names from over a year ago ([66cfdc1](https://github.com/folke/tokyonight.nvim/commit/66cfdc12b009b45c92d52d48bea30a105d7012d9))
+* **theme:** added support for WinBar and WinBarNC. Fixes [#466](https://github.com/folke/tokyonight.nvim/issues/466) ([29b7960](https://github.com/folke/tokyonight.nvim/commit/29b796021d82f1faf989a00ba8b86cfe83ace130))
+
 ## [2.9.0](https://github.com/folke/tokyonight.nvim/compare/v2.8.0...v2.9.0) (2023-10-16)


--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ FarOut colorscheme for NeoVim. Adapted from [tokyonight.nvim](https://github.com
 - [Fish](https://fishshell.com/docs/current/index.html) ([fish](extras/fish))
 - [Fish Themes](https://fishshell.com/docs/current/interactive.html#syntax-highlighting) ([fish_themes](extras/fish_themes))
 - [Foot](https://codeberg.org/dnkl/foot) ([foot](extras/foot))
+- [Fzf](https://github.com/junegunn/fzf) ([fzf](extras/fzf))
 - [GitUI](https://github.com/extrawurst/gitui) ([gitui](extras/gitui))
 - [Helix](https://helix-editor.com/) ([helix](extras/helix))
 - [iTerm](https://iterm2.com/) ([iterm](extras/iterm))
--- a/doc/farout.nvim.txt
+++ b/doc/farout.nvim.txt
@@ -1,4 +1,4 @@
-farout.nvim.txt*     For Neovim >= 0.8.0     Last change: 2023 October 25
+farout.nvim.txt*     For Neovim >= 0.8.0     Last change: 2024 January 31

 ==============================================================================
 Table of Contents                          *farout.nvim-table-of-contents*
@@ -44,6 +44,7 @@ EXTRAS ~
 - Fish <https://fishshell.com/docs/current/index.html> (fish <extras/fish>)
 - Fish Themes <https://fishshell.com/docs/current/interactive.html#syntax-highlighting> (fish_themes <extras/fish_themes>)
 - Foot <https://codeberg.org/dnkl/foot> (foot <extras/foot>)
+- Fzf <https://github.com/junegunn/fzf> (fzf <extras/fzf>)
 - GitUI <https://github.com/extrawurst/gitui> (gitui <extras/gitui>)
 - Helix <https://helix-editor.com/> (helix <extras/helix>)
 - iTerm <https://iterm2.com/> (iterm <extras/iterm>)
--- a/extras/alacritty/faroutday.toml
+++ b/extras/alacritty/faroutday.toml
@@ -0,0 +1,41 @@
+# FarOut Alacritty Colors
+# Default colors
+[colors.primary]
+background = '#f9f6f6'
+foreground = '#6c6252'
+
+#[colors.cursor]
+#cursor = '#6c6252'
+#text = '#f9f6f6'
+
+# Normal colors
+[colors.normal]
+black = '#faf8f8'
+red = '#db5234'
+green = '#715e4b'
+yellow = '#9b6635'
+blue = '#c77544'
+magenta = '#c37f87'
+cyan = '#91654c'
+white = '#9b6635'
+
+# Bright colors
+[colors.bright]
+black = '#d1c4c2'
+red = '#db5234'
+green = '#715e4b'
+yellow = '#9b6635'
+blue = '#c77544'
+magenta = '#c37f87'
+cyan = '#91654c'
+white = '#6c6252'
+
+# Indexed Colors
+[[colors.indexed_colors]]
+index = 16
+color = '#b15c00'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#a14834'
+
--- a/extras/alacritty/faroutday.yml
+++ b/extras/alacritty/faroutday.yml
@@ -1,34 +0,0 @@
-# FarOut Alacritty Colors
-colors:
-  # Default colors
-  primary:
-    background: '0xf9f6f6'
-    foreground: '0x6c6252'
-
-  # Normal colors
-  normal:
-    black:   '0xfaf8f8'
-    red:     '0xdb5234'
-    green:   '0x715e4b'
-    yellow:  '0x9b6635'
-    blue:    '0xc77544'
-    magenta: '0xc37f87'
-    cyan:    '0x91654c'
-    white:   '0x9b6635'
-
-  # Bright colors
-  bright:
-    black:   '0xd1c4c2'
-    red:     '0xdb5234'
-    green:   '0x715e4b'
-    yellow:  '0x9b6635'
-    blue:    '0xc77544'
-    magenta: '0xc37f87'
-    cyan:    '0x91654c'
-    white:   '0x6c6252'
-
-  indexed_colors:
-    - { index: 16, color: '0xb15c00' }
-    - { index: 17, color: '0xa14834' }
-    
-  
--- a/extras/alacritty/faroutmoon.toml
+++ b/extras/alacritty/faroutmoon.toml
@@ -0,0 +1,41 @@
+# FarOut Alacritty Colors
+# Default colors
+[colors.primary]
+background = '#222436'
+foreground = '#c8d3f5'
+
+#[colors.cursor]
+#cursor = '#c8d3f5'
+#text = '#222436'
+
+# Normal colors
+[colors.normal]
+black = '#1b1d2b'
+red = '#ff757f'
+green = '#c3e88d'
+yellow = '#ffc777'
+blue = '#82aaff'
+magenta = '#c099ff'
+cyan = '#86e1fc'
+white = '#828bb8'
+
+# Bright colors
+[colors.bright]
+black = '#444a73'
+red = '#ff757f'
+green = '#c3e88d'
+yellow = '#ffc777'
+blue = '#82aaff'
+magenta = '#c099ff'
+cyan = '#86e1fc'
+white = '#c8d3f5'
+
+# Indexed Colors
+[[colors.indexed_colors]]
+index = 16
+color = '#ff966c'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#c53b53'
+
--- a/extras/alacritty/faroutmoon.yml
+++ b/extras/alacritty/faroutmoon.yml
@@ -1,34 +0,0 @@
-# FarOut Alacritty Colors
-colors:
-  # Default colors
-  primary:
-    background: '0x222436'
-    foreground: '0xc8d3f5'
-
-  # Normal colors
-  normal:
-    black:   '0x1b1d2b'
-    red:     '0xff757f'
-    green:   '0xc3e88d'
-    yellow:  '0xffc777'
-    blue:    '0x82aaff'
-    magenta: '0xc099ff'
-    cyan:    '0x86e1fc'
-    white:   '0x828bb8'
-
-  # Bright colors
-  bright:
-    black:   '0x444a73'
-    red:     '0xff757f'
-    green:   '0xc3e88d'
-    yellow:  '0xffc777'
-    blue:    '0x82aaff'
-    magenta: '0xc099ff'
-    cyan:    '0x86e1fc'
-    white:   '0xc8d3f5'
-
-  indexed_colors:
-    - { index: 16, color: '0xff966c' }
-    - { index: 17, color: '0xc53b53' }
-    
-  
--- a/extras/alacritty/faroutnight.toml
+++ b/extras/alacritty/faroutnight.toml
@@ -0,0 +1,41 @@
+# FarOut Alacritty Colors
+# Default colors
+[colors.primary]
+background = '#0f0908'
+foreground = '#E0CCAE'
+
+#[colors.cursor]
+#cursor = '#E0CCAE'
+#text = '#0f0908'
+
+# Normal colors
+[colors.normal]
+black = '#0c0706'
+red = '#bf472c'
+green = '#a4896f'
+yellow = '#f2a766'
+blue = '#d47d49'
+magenta = '#8a4b53'
+cyan = '#a67458'
+white = '#F2A766'
+
+# Bright colors
+[colors.bright]
+black = '#392D2B'
+red = '#bf472c'
+green = '#a4896f'
+yellow = '#f2a766'
+blue = '#d47d49'
+magenta = '#8a4b53'
+cyan = '#a67458'
+white = '#E0CCAE'
+
+# Indexed Colors
+[[colors.indexed_colors]]
+index = 16
+color = '#ff9e64'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#df674c'
+
--- a/extras/alacritty/faroutnight.yml
+++ b/extras/alacritty/faroutnight.yml
@@ -1,34 +0,0 @@
-# FarOut Alacritty Colors
-colors:
-  # Default colors
-  primary:
-    background: '0x0f0908'
-    foreground: '0xE0CCAE'
-
-  # Normal colors
-  normal:
-    black:   '0x0c0706'
-    red:     '0xbf472c'
-    green:   '0xa4896f'
-    yellow:  '0xf2a766'
-    blue:    '0xd47d49'
-    magenta: '0x8a4b53'
-    cyan:    '0xa67458'
-    white:   '0xF2A766'
-
-  # Bright colors
-  bright:
-    black:   '0x392D2B'
-    red:     '0xbf472c'
-    green:   '0xa4896f'
-    yellow:  '0xf2a766'
-    blue:    '0xd47d49'
-    magenta: '0x8a4b53'
-    cyan:    '0xa67458'
-    white:   '0xE0CCAE'
-
-  indexed_colors:
-    - { index: 16, color: '0xff9e64' }
-    - { index: 17, color: '0xdf674c' }
-    
-  
--- a/extras/alacritty/faroutstorm.toml
+++ b/extras/alacritty/faroutstorm.toml
@@ -0,0 +1,41 @@
+# FarOut Alacritty Colors
+# Default colors
+[colors.primary]
+background = '#0f0908'
+foreground = '#E0CCAE'
+
+#[colors.cursor]
+#cursor = '#E0CCAE'
+#text = '#0f0908'
+
+# Normal colors
+[colors.normal]
+black = '#0c0706'
+red = '#bf472c'
+green = '#a4896f'
+yellow = '#f2a766'
+blue = '#d47d49'
+magenta = '#8a4b53'
+cyan = '#a67458'
+white = '#F2A766'
+
+# Bright colors
+[colors.bright]
+black = '#392D2B'
+red = '#bf472c'
+green = '#a4896f'
+yellow = '#f2a766'
+blue = '#d47d49'
+magenta = '#8a4b53'
+cyan = '#a67458'
+white = '#E0CCAE'
+
+# Indexed Colors
+[[colors.indexed_colors]]
+index = 16
+color = '#ff9e64'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#df674c'
+
--- a/extras/alacritty/faroutstorm.yml
+++ b/extras/alacritty/faroutstorm.yml
@@ -1,34 +0,0 @@
-# FarOut Alacritty Colors
-colors:
-  # Default colors
-  primary:
-    background: '0x0f0908'
-    foreground: '0xE0CCAE'
-
-  # Normal colors
-  normal:
-    black:   '0x0c0706'
-    red:     '0xbf472c'
-    green:   '0xa4896f'
-    yellow:  '0xf2a766'
-    blue:    '0xd47d49'
-    magenta: '0x8a4b53'
-    cyan:    '0xa67458'
-    white:   '0xF2A766'
-
-  # Bright colors
-  bright:
-    black:   '0x392D2B'
-    red:     '0xbf472c'
-    green:   '0xa4896f'
-    yellow:  '0xf2a766'
-    blue:    '0xd47d49'
-    magenta: '0x8a4b53'
-    cyan:    '0xa67458'
-    white:   '0xE0CCAE'
-
-  indexed_colors:
-    - { index: 16, color: '0xff9e64' }
-    - { index: 17, color: '0xdf674c' }
-    
-  
--- a/extras/fzf/faroutday.zsh
+++ b/extras/fzf/faroutday.zsh
@@ -0,0 +1,5 @@
+export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
+--color=fg:#6c6252,bg:#f9f6f6,hl:#b15c00 \
+--color=fg+:#6c6252,bg+:#eae1e0,hl+:#b15c00 \
+--color=info:#c77544,prompt:#91654c,pointer:#91654c \
+--color=marker:#715e4b,spinner:#715e4b,header:#715e4b"
--- a/extras/fzf/faroutmoon.zsh
+++ b/extras/fzf/faroutmoon.zsh
@@ -0,0 +1,5 @@
+export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
+--color=fg:#c8d3f5,bg:#222436,hl:#ff966c \
+--color=fg+:#c8d3f5,bg+:#2f334d,hl+:#ff966c \
+--color=info:#82aaff,prompt:#86e1fc,pointer:#86e1fc \
+--color=marker:#c3e88d,spinner:#c3e88d,header:#c3e88d"
--- a/extras/fzf/faroutnight.zsh
+++ b/extras/fzf/faroutnight.zsh
@@ -0,0 +1,5 @@
+export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
+--color=fg:#E0CCAE,bg:#0f0908,hl:#ff9e64 \
+--color=fg+:#E0CCAE,bg+:#241816,hl+:#ff9e64 \
+--color=info:#d47d49,prompt:#a67458,pointer:#a67458 \
+--color=marker:#a4896f,spinner:#a4896f,header:#a4896f"
--- a/extras/fzf/faroutstorm.zsh
+++ b/extras/fzf/faroutstorm.zsh
@@ -0,0 +1,5 @@
+export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
+--color=fg:#E0CCAE,bg:#0f0908,hl:#ff9e64 \
+--color=fg+:#E0CCAE,bg+:#241816,hl+:#ff9e64 \
+--color=info:#d47d49,prompt:#a67458,pointer:#a67458 \
+--color=marker:#a4896f,spinner:#a4896f,header:#a4896f"
--- a/extras/helix/faroutday.toml
+++ b/extras/helix/faroutday.toml
@@ -52,7 +52,7 @@ label = { fg = "#c77544" }
 "markup.raw.block" = { fg = "#a27961" }
 "markup.raw.inline" = { bg = "#d1c4c2", fg = "#c77544" }
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
-namespace = { fg = "#91654c" }
+namespace = { fg = "#c37f87" }
 operator = { fg = "#91654c" }
 special = { fg = "#db5234" }
 string = { fg = "#715e4b" }
@@ -144,5 +144,6 @@ red = "#db5234"
 red1 = "#a14834"
 teal = "#a27961"
 terminal_black = "#d1c4c2"
+todo = "#c77544"
 warning = "#9b6635"
 yellow = "#9b6635"
--- a/extras/helix/faroutmoon.toml
+++ b/extras/helix/faroutmoon.toml
@@ -52,7 +52,7 @@ label = { fg = "#82aaff" }
 "markup.raw.block" = { fg = "#4fd6be" }
 "markup.raw.inline" = { bg = "#444a73", fg = "#82aaff" }
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
-namespace = { fg = "#86e1fc" }
+namespace = { fg = "#c099ff" }
 operator = { fg = "#89ddff" }
 special = { fg = "#65bcff" }
 string = { fg = "#c3e88d" }
@@ -144,5 +144,6 @@ red = "#ff757f"
 red1 = "#c53b53"
 teal = "#4fd6be"
 terminal_black = "#444a73"
+todo = "#82aaff"
 warning = "#ffc777"
 yellow = "#ffc777"
--- a/extras/helix/faroutnight.toml
+++ b/extras/helix/faroutnight.toml
@@ -52,7 +52,7 @@ label = { fg = "#d47d49" }
 "markup.raw.block" = { fg = "#c69478" }
 "markup.raw.inline" = { bg = "#392d2b", fg = "#d47d49" }
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
-namespace = { fg = "#a67458" }
+namespace = { fg = "#8a4b53" }
 operator = { fg = "#a67458" }
 special = { fg = "#bf472c" }
 string = { fg = "#a4896f" }
@@ -144,5 +144,6 @@ red = "#bf472c"
 red1 = "#df674c"
 teal = "#c69478"
 terminal_black = "#392D2B"
+todo = "#d47d49"
 warning = "#f2a766"
 yellow = "#f2a766"
--- a/extras/helix/faroutstorm.toml
+++ b/extras/helix/faroutstorm.toml
@@ -52,7 +52,7 @@ label = { fg = "#d47d49" }
 "markup.raw.block" = { fg = "#c69478" }
 "markup.raw.inline" = { bg = "#392d2b", fg = "#d47d49" }
 "markup.strikethrough" = { modifiers = ["crossed_out"] }
-namespace = { fg = "#a67458" }
+namespace = { fg = "#8a4b53" }
 operator = { fg = "#a67458" }
 special = { fg = "#bf472c" }
 string = { fg = "#a4896f" }
@@ -144,5 +144,6 @@ red = "#bf472c"
 red1 = "#df674c"
 teal = "#c69478"
 terminal_black = "#392D2B"
+todo = "#d47d49"
 warning = "#f2a766"
 yellow = "#f2a766"
--- a/extras/lua/faroutday.lua
+++ b/extras/lua/faroutday.lua
@@ -64,19 +64,89 @@ local colors = {
  red1 = "#a14834",
  teal = "#a27961",
  terminal_black = "#d1c4c2",
+  todo = "#c77544",
  warning = "#9b6635",
  yellow = "#9b6635"
 }

 local highlights = {
+  ["@annotation"] = {
+    link = "PreProc"
+  },
+  ["@attribute"] = {
+    link = "PreProc"
+  },
+  ["@boolean"] = {
+    link = "Boolean"
+  },
+  ["@character"] = {
+    link = "Character"
+  },
+  ["@character.special"] = {
+    link = "SpecialChar"
+  },
+  ["@comment"] = {
+    link = "Comment"
+  },
+  ["@comment.error"] = {
+    fg = "#a14834"
+  },
+  ["@comment.hint"] = {
+    fg = "#a27961"
+  },
+  ["@comment.info"] = {
+    fg = "#725f3e"
+  },
+  ["@comment.note"] = {
+    fg = "#a27961"
+  },
+  ["@comment.todo"] = {
+    fg = "#c77544"
+  },
+  ["@comment.warning"] = {
+    fg = "#9b6635"
+  },
+  ["@constant"] = {
+    link = "Constant"
+  },
+  ["@constant.builtin"] = {
+    link = "Special"
+  },
+  ["@constant.macro"] = {
+    link = "Define"
+  },
  ["@constructor"] = {
    fg = "#c37f87"
  },
  ["@constructor.tsx"] = {
    fg = "#db5234"
  },
-  ["@field"] = {
-    fg = "#887562"
+  ["@diff.delta"] = {
+    link = "DiffChange"
+  },
+  ["@diff.minus"] = {
+    link = "DiffDelete"
+  },
+  ["@diff.plus"] = {
+    link = "DiffAdd"
+  },
+  ["@function"] = {
+    link = "Function"
+  },
+  ["@function.builtin"] = {
+    link = "Special"
+  },
+  ["@function.call"] = {
+    link = "@function"
+  },
+  ["@function.macro"] = {
+    link = "Macro"
+  },
+  ["@function.method"] = {
+    link = "Function"
+  },
+  ["@function.method.call"] = {
+    link = "@function.method"
  },
  ["@keyword"] = {
    fg = "#876060",
@@ -84,10 +154,43 @@ local highlights = {
      italic = true
    }
  },
+  ["@keyword.conditional"] = {
+    link = "Conditional"
+  },
+  ["@keyword.coroutine"] = {
+    link = "@keyword"
+  },
+  ["@keyword.debug"] = {
+    link = "Debug"
+  },
+  ["@keyword.directive"] = {
+    link = "PreProc"
+  },
+  ["@keyword.directive.define"] = {
+    link = "Define"
+  },
+  ["@keyword.exception"] = {
+    link = "Exception"
+  },
  ["@keyword.function"] = {
    fg = "#c37f87",
    style = {}
  },
+  ["@keyword.import"] = {
+    link = "Include"
+  },
+  ["@keyword.operator"] = {
+    link = "@operator"
+  },
+  ["@keyword.repeat"] = {
+    link = "Repeat"
+  },
+  ["@keyword.return"] = {
+    link = "@keyword"
+  },
+  ["@keyword.storage"] = {
+    link = "StorageClass"
+  },
  ["@label"] = {
    fg = "#c77544"
  },
@@ -116,7 +219,7 @@ local highlights = {
    link = "@string.escape"
  },
  ["@lsp.type.formatSpecifier"] = {
-    link = "@punctuation.special"
+    link = "@markup.list"
  },
  ["@lsp.type.generic"] = {
    link = "@variable"
@@ -128,10 +231,10 @@ local highlights = {
    link = "@keyword"
  },
  ["@lsp.type.lifetime"] = {
-    link = "@storageclass"
+    link = "@keyword.storage"
  },
  ["@lsp.type.namespace"] = {
-    link = "@namespace"
+    link = "@module"
  },
  ["@lsp.type.number"] = {
    link = "@number"
@@ -140,7 +243,7 @@ local highlights = {
    link = "@operator"
  },
  ["@lsp.type.parameter"] = {
-    link = "@parameter"
+    link = "@variable.parameter"
  },
  ["@lsp.type.property"] = {
    link = "@property"
@@ -213,21 +316,108 @@ local highlights = {
  ["@lsp.typemod.variable.static"] = {
    link = "@constant"
  },
-  ["@namespace"] = {
+  ["@markup"] = {
+    link = "@none"
+  },
+  ["@markup.emphasis"] = {
+    italic = true
+  },
+  ["@markup.environment"] = {
+    link = "Macro"
+  },
+  ["@markup.environment.name"] = {
+    link = "Type"
+  },
+  ["@markup.heading"] = {
+    link = "Title"
+  },
+  ["@markup.heading.1.markdown"] = {
+    bold = true,
+    fg = "#c77544"
+  },
+  ["@markup.heading.2.markdown"] = {
+    bold = true,
+    fg = "#9b6635"
+  },
+  ["@markup.heading.3.markdown"] = {
+    bold = true,
+    fg = "#715e4b"
+  },
+  ["@markup.heading.4.markdown"] = {
+    bold = true,
+    fg = "#a27961"
+  },
+  ["@markup.heading.5.markdown"] = {
+    bold = true,
+    fg = "#c37f87"
+  },
+  ["@markup.heading.6.markdown"] = {
+    bold = true,
+    fg = "#876060"
+  },
+  ["@markup.link"] = {
+    fg = "#a27961"
+  },
+  ["@markup.link.label"] = {
+    link = "SpecialChar"
+  },
+  ["@markup.link.label.symbol"] = {
+    link = "Identifier"
+  },
+  ["@markup.link.url"] = {
+    link = "Underlined"
+  },
+  ["@markup.list"] = {
+    fg = "#91654c"
+  },
+  ["@markup.list.checked"] = {
+    fg = "#887562"
+  },
+  ["@markup.list.markdown"] = {
+    bold = true,
+    fg = "#b15c00"
+  },
+  ["@markup.list.unchecked"] = {
+    fg = "#c77544"
+  },
+  ["@markup.math"] = {
+    link = "Special"
+  },
+  ["@markup.raw"] = {
+    link = "String"
+  },
+  ["@markup.raw.markdown_inline"] = {
+    bg = "#d1c4c2",
+    fg = "#c77544"
+  },
+  ["@markup.strikethrough"] = {
+    strikethrough = true
+  },
+  ["@markup.strong"] = {
+    bold = true
+  },
+  ["@markup.underline"] = {
+    underline = true
+  },
+  ["@module"] = {
    link = "Include"
  },
-  ["@namespace.builtin"] = {
+  ["@module.builtin"] = {
    fg = "#db5234"
  },
+  ["@namespace.builtin"] = {
+    link = "@variable.builtin"
+  },
+  ["@none"] = {},
+  ["@number"] = {
+    link = "Number"
+  },
+  ["@number.float"] = {
+    link = "Float"
+  },
  ["@operator"] = {
    fg = "#91654c"
  },
-  ["@parameter"] = {
-    fg = "#9b6635"
-  },
-  ["@parameter.builtin"] = {
-    fg = "#8d5f2d"
-  },
  ["@property"] = {
    fg = "#887562"
  },
@@ -240,9 +430,8 @@ local highlights = {
  ["@punctuation.special"] = {
    fg = "#91654c"
  },
-  ["@punctuation.special.markdown"] = {
-    bold = true,
-    fg = "#b15c00"
+  ["@string"] = {
+    link = "String"
  },
  ["@string.documentation"] = {
    fg = "#9b6635"
@@ -250,69 +439,36 @@ local highlights = {
  ["@string.escape"] = {
    fg = "#c37f87"
  },
-  ["@string.regex"] = {
+  ["@string.regexp"] = {
    fg = "#a47d6a"
  },
+  ["@tag"] = {
+    link = "Label"
+  },
+  ["@tag.attribute"] = {
+    link = "@property"
+  },
+  ["@tag.delimiter"] = {
+    link = "Delimiter"
+  },
  ["@tag.delimiter.tsx"] = {
    fg = "#be7144"
  },
  ["@tag.tsx"] = {
    fg = "#db5234"
  },
-  ["@text.danger"] = {
-    bg = "#a14834",
-    fg = "#f9f6f6"
-  },
-  ["@text.diff.add"] = {
-    link = "DiffAdd"
-  },
-  ["@text.diff.delete"] = {
-    link = "DiffDelete"
-  },
-  ["@text.literal.markdown_inline"] = {
-    bg = "#d1c4c2",
-    fg = "#c77544"
-  },
-  ["@text.reference"] = {
-    fg = "#a27961"
-  },
-  ["@text.title.1.markdown"] = {
-    bold = true,
-    fg = "#c77544"
-  },
-  ["@text.title.2.markdown"] = {
-    bold = true,
-    fg = "#9b6635"
-  },
-  ["@text.title.3.markdown"] = {
-    bold = true,
-    fg = "#715e4b"
-  },
-  ["@text.title.4.markdown"] = {
-    bold = true,
-    fg = "#a27961"
-  },
-  ["@text.title.5.markdown"] = {
-    bold = true,
-    fg = "#c37f87"
-  },
-  ["@text.title.6.markdown"] = {
-    bold = true,
-    fg = "#876060"
-  },
-  ["@text.todo.checked"] = {
-    fg = "#887562"
-  },
-  ["@text.todo.unchecked"] = {
-    fg = "#c77544"
-  },
-  ["@text.warning"] = {
-    bg = "#9b6635",
-    fg = "#f9f6f6"
+  ["@type"] = {
+    link = "Type"
  },
  ["@type.builtin"] = {
    fg = "#f06c53"
  },
+  ["@type.definition"] = {
+    link = "Typedef"
+  },
+  ["@type.qualifier"] = {
+    link = "@keyword"
+  },
  ["@variable"] = {
    fg = "#6c6252",
    style = {}
@@ -320,6 +476,15 @@ local highlights = {
  ["@variable.builtin"] = {
    fg = "#db5234"
  },
+  ["@variable.member"] = {
+    fg = "#887562"
+  },
+  ["@variable.parameter"] = {
+    fg = "#9b6635"
+  },
+  ["@variable.parameter.builtin"] = {
+    fg = "#8d5f2d"
+  },
  ALEErrorSign = {
    fg = "#a14834"
  },
@@ -840,6 +1005,9 @@ local highlights = {
  DefinitionIcon = {
    fg = "#c77544"
  },
+  Delimiter = {
+    link = "Special"
+  },
  DiagnosticError = {
    fg = "#a14834"
  },
@@ -1195,7 +1363,7 @@ local highlights = {
    link = "Special"
  },
  LspKindField = {
-    link = "@field"
+    link = "@variable.member"
  },
  LspKindFile = {
    link = "Normal"
@@ -1210,19 +1378,19 @@ local highlights = {
    link = "@lsp.type.interface"
  },
  LspKindKey = {
-    link = "@field"
+    link = "@variable.member"
  },
  LspKindKeyword = {
    link = "@lsp.type.keyword"
  },
  LspKindMethod = {
-    link = "@method"
+    link = "@function.method"
  },
  LspKindModule = {
-    link = "@namespace"
+    link = "@module"
  },
  LspKindNamespace = {
-    link = "@namespace"
+    link = "@module"
  },
  LspKindNull = {
    link = "@constant.builtin"
@@ -1237,13 +1405,13 @@ local highlights = {
    link = "@operator"
  },
  LspKindPackage = {
-    link = "@namespace"
+    link = "@module"
  },
  LspKindProperty = {
    link = "@property"
  },
  LspKindReference = {
-    link = "@text.reference"
+    link = "@markup.link"
  },
  LspKindSnippet = {
    link = "Conceal"
@@ -1255,7 +1423,7 @@ local highlights = {
    link = "@lsp.type.struct"
  },
  LspKindText = {
-    link = "@text"
+    link = "@markup"
  },
  LspKindTypeParameter = {
    link = "@lsp.type.typeParameter"
@@ -2138,7 +2306,7 @@ local highlights = {
    fg = "#f9f6f6"
  },
  TreesitterContext = {
-    bg = "#dcaa9f"
+    bg = "#f0e7e5"
  },
  TroubleCount = {
    bg = "#d79687",
@@ -2146,7 +2314,7 @@ local highlights = {
  },
  TroubleNormal = {
    bg = "#f0e9e8",
-    fg = "#9b6635"
+    fg = "#6c6252"
  },
  TroubleText = {
    fg = "#9b6635"
@@ -2196,6 +2364,12 @@ local highlights = {
  WildMenu = {
    bg = "#dd9169"
  },
+  WinBar = {
+    link = "StatusLine"
+  },
+  WinBarNC = {
+    link = "StatusLineNC"
+  },
  WinSeparator = {
    bold = true,
    fg = "#faf8f8"
--- a/extras/lua/faroutmoon.lua
+++ b/extras/lua/faroutmoon.lua
@@ -64,19 +64,89 @@ local colors = {
  red1 = "#c53b53",
  teal = "#4fd6be",
  terminal_black = "#444a73",
+  todo = "#82aaff",
  warning = "#ffc777",
  yellow = "#ffc777"
 }

 local highlights = {
+  ["@annotation"] = {
+    link = "PreProc"
+  },
+  ["@attribute"] = {
+    link = "PreProc"
+  },
+  ["@boolean"] = {
+    link = "Boolean"
+  },
+  ["@character"] = {
+    link = "Character"
+  },
+  ["@character.special"] = {
+    link = "SpecialChar"
+  },
+  ["@comment"] = {
+    link = "Comment"
+  },
+  ["@comment.error"] = {
+    fg = "#c53b53"
+  },
+  ["@comment.hint"] = {
+    fg = "#4fd6be"
+  },
+  ["@comment.info"] = {
+    fg = "#0db9d7"
+  },
+  ["@comment.note"] = {
+    fg = "#4fd6be"
+  },
+  ["@comment.todo"] = {
+    fg = "#82aaff"
+  },
+  ["@comment.warning"] = {
+    fg = "#ffc777"
+  },
+  ["@constant"] = {
+    link = "Constant"
+  },
+  ["@constant.builtin"] = {
+    link = "Special"
+  },
+  ["@constant.macro"] = {
+    link = "Define"
+  },
  ["@constructor"] = {
    fg = "#c099ff"
  },
  ["@constructor.tsx"] = {
    fg = "#65bcff"
  },
-  ["@field"] = {
-    fg = "#4fd6be"
+  ["@diff.delta"] = {
+    link = "DiffChange"
+  },
+  ["@diff.minus"] = {
+    link = "DiffDelete"
+  },
+  ["@diff.plus"] = {
+    link = "DiffAdd"
+  },
+  ["@function"] = {
+    link = "Function"
+  },
+  ["@function.builtin"] = {
+    link = "Special"
+  },
+  ["@function.call"] = {
+    link = "@function"
+  },
+  ["@function.macro"] = {
+    link = "Macro"
+  },
+  ["@function.method"] = {
+    link = "Function"
+  },
+  ["@function.method.call"] = {
+    link = "@function.method"
  },
  ["@keyword"] = {
    fg = "#fca7ea",
@@ -84,10 +154,43 @@ local highlights = {
      italic = true
    }
  },
+  ["@keyword.conditional"] = {
+    link = "Conditional"
+  },
+  ["@keyword.coroutine"] = {
+    link = "@keyword"
+  },
+  ["@keyword.debug"] = {
+    link = "Debug"
+  },
+  ["@keyword.directive"] = {
+    link = "PreProc"
+  },
+  ["@keyword.directive.define"] = {
+    link = "Define"
+  },
+  ["@keyword.exception"] = {
+    link = "Exception"
+  },
  ["@keyword.function"] = {
    fg = "#c099ff",
    style = {}
  },
+  ["@keyword.import"] = {
+    link = "Include"
+  },
+  ["@keyword.operator"] = {
+    link = "@operator"
+  },
+  ["@keyword.repeat"] = {
+    link = "Repeat"
+  },
+  ["@keyword.return"] = {
+    link = "@keyword"
+  },
+  ["@keyword.storage"] = {
+    link = "StorageClass"
+  },
  ["@label"] = {
    fg = "#82aaff"
  },
@@ -116,7 +219,7 @@ local highlights = {
    link = "@string.escape"
  },
  ["@lsp.type.formatSpecifier"] = {
-    link = "@punctuation.special"
+    link = "@markup.list"
  },
  ["@lsp.type.generic"] = {
    link = "@variable"
@@ -128,10 +231,10 @@ local highlights = {
    link = "@keyword"
  },
  ["@lsp.type.lifetime"] = {
-    link = "@storageclass"
+    link = "@keyword.storage"
  },
  ["@lsp.type.namespace"] = {
-    link = "@namespace"
+    link = "@module"
  },
  ["@lsp.type.number"] = {
    link = "@number"
@@ -140,7 +243,7 @@ local highlights = {
    link = "@operator"
  },
  ["@lsp.type.parameter"] = {
-    link = "@parameter"
+    link = "@variable.parameter"
  },
  ["@lsp.type.property"] = {
    link = "@property"
@@ -213,21 +316,108 @@ local highlights = {
  ["@lsp.typemod.variable.static"] = {
    link = "@constant"
  },
-  ["@namespace"] = {
+  ["@markup"] = {
+    link = "@none"
+  },
+  ["@markup.emphasis"] = {
+    italic = true
+  },
+  ["@markup.environment"] = {
+    link = "Macro"
+  },
+  ["@markup.environment.name"] = {
+    link = "Type"
+  },
+  ["@markup.heading"] = {
+    link = "Title"
+  },
+  ["@markup.heading.1.markdown"] = {
+    bold = true,
+    fg = "#82aaff"
+  },
+  ["@markup.heading.2.markdown"] = {
+    bold = true,
+    fg = "#ffc777"
+  },
+  ["@markup.heading.3.markdown"] = {
+    bold = true,
+    fg = "#c3e88d"
+  },
+  ["@markup.heading.4.markdown"] = {
+    bold = true,
+    fg = "#4fd6be"
+  },
+  ["@markup.heading.5.markdown"] = {
+    bold = true,
+    fg = "#c099ff"
+  },
+  ["@markup.heading.6.markdown"] = {
+    bold = true,
+    fg = "#fca7ea"
+  },
+  ["@markup.link"] = {
+    fg = "#4fd6be"
+  },
+  ["@markup.link.label"] = {
+    link = "SpecialChar"
+  },
+  ["@markup.link.label.symbol"] = {
+    link = "Identifier"
+  },
+  ["@markup.link.url"] = {
+    link = "Underlined"
+  },
+  ["@markup.list"] = {
+    fg = "#89ddff"
+  },
+  ["@markup.list.checked"] = {
+    fg = "#4fd6be"
+  },
+  ["@markup.list.markdown"] = {
+    bold = true,
+    fg = "#ff966c"
+  },
+  ["@markup.list.unchecked"] = {
+    fg = "#82aaff"
+  },
+  ["@markup.math"] = {
+    link = "Special"
+  },
+  ["@markup.raw"] = {
+    link = "String"
+  },
+  ["@markup.raw.markdown_inline"] = {
+    bg = "#444a73",
+    fg = "#82aaff"
+  },
+  ["@markup.strikethrough"] = {
+    strikethrough = true
+  },
+  ["@markup.strong"] = {
+    bold = true
+  },
+  ["@markup.underline"] = {
+    underline = true
+  },
+  ["@module"] = {
    link = "Include"
  },
-  ["@namespace.builtin"] = {
+  ["@module.builtin"] = {
    fg = "#ff757f"
  },
+  ["@namespace.builtin"] = {
+    link = "@variable.builtin"
+  },
+  ["@none"] = {},
+  ["@number"] = {
+    link = "Number"
+  },
+  ["@number.float"] = {
+    link = "Float"
+  },
  ["@operator"] = {
    fg = "#89ddff"
  },
-  ["@parameter"] = {
-    fg = "#ffc777"
-  },
-  ["@parameter.builtin"] = {
-    fg = "#ffd292"
-  },
  ["@property"] = {
    fg = "#4fd6be"
  },
@@ -240,9 +430,8 @@ local highlights = {
  ["@punctuation.special"] = {
    fg = "#89ddff"
  },
-  ["@punctuation.special.markdown"] = {
-    bold = true,
-    fg = "#ff966c"
+  ["@string"] = {
+    link = "String"
  },
  ["@string.documentation"] = {
    fg = "#ffc777"
@@ -250,69 +439,36 @@ local highlights = {
  ["@string.escape"] = {
    fg = "#c099ff"
  },
-  ["@string.regex"] = {
+  ["@string.regexp"] = {
    fg = "#b4f9f8"
  },
+  ["@tag"] = {
+    link = "Label"
+  },
+  ["@tag.attribute"] = {
+    link = "@property"
+  },
+  ["@tag.delimiter"] = {
+    link = "Delimiter"
+  },
  ["@tag.delimiter.tsx"] = {
    fg = "#6582c3"
  },
  ["@tag.tsx"] = {
    fg = "#ff757f"
  },
-  ["@text.danger"] = {
-    bg = "#c53b53",
-    fg = "#222436"
-  },
-  ["@text.diff.add"] = {
-    link = "DiffAdd"
-  },
-  ["@text.diff.delete"] = {
-    link = "DiffDelete"
-  },
-  ["@text.literal.markdown_inline"] = {
-    bg = "#444a73",
-    fg = "#82aaff"
-  },
-  ["@text.reference"] = {
-    fg = "#4fd6be"
-  },
-  ["@text.title.1.markdown"] = {
-    bold = true,
-    fg = "#82aaff"
-  },
-  ["@text.title.2.markdown"] = {
-    bold = true,
-    fg = "#ffc777"
-  },
-  ["@text.title.3.markdown"] = {
-    bold = true,
-    fg = "#c3e88d"
-  },
-  ["@text.title.4.markdown"] = {
-    bold = true,
-    fg = "#4fd6be"
-  },
-  ["@text.title.5.markdown"] = {
-    bold = true,
-    fg = "#c099ff"
-  },
-  ["@text.title.6.markdown"] = {
-    bold = true,
-    fg = "#fca7ea"
-  },
-  ["@text.todo.checked"] = {
-    fg = "#4fd6be"
-  },
-  ["@text.todo.unchecked"] = {
-    fg = "#82aaff"
-  },
-  ["@text.warning"] = {
-    bg = "#ffc777",
-    fg = "#222436"
+  ["@type"] = {
+    link = "Type"
  },
  ["@type.builtin"] = {
    fg = "#589ed7"
  },
+  ["@type.definition"] = {
+    link = "Typedef"
+  },
+  ["@type.qualifier"] = {
+    link = "@keyword"
+  },
  ["@variable"] = {
    fg = "#c8d3f5",
    style = {}
@@ -320,6 +476,15 @@ local highlights = {
  ["@variable.builtin"] = {
    fg = "#ff757f"
  },
+  ["@variable.member"] = {
+    fg = "#4fd6be"
+  },
+  ["@variable.parameter"] = {
+    fg = "#ffc777"
+  },
+  ["@variable.parameter.builtin"] = {
+    fg = "#ffd292"
+  },
  ALEErrorSign = {
    fg = "#c53b53"
  },
@@ -840,6 +1005,9 @@ local highlights = {
  DefinitionIcon = {
    fg = "#82aaff"
  },
+  Delimiter = {
+    link = "Special"
+  },
  DiagnosticError = {
    fg = "#c53b53"
  },
@@ -1195,7 +1363,7 @@ local highlights = {
    link = "Special"
  },
  LspKindField = {
-    link = "@field"
+    link = "@variable.member"
  },
  LspKindFile = {
    link = "Normal"
@@ -1210,19 +1378,19 @@ local highlights = {
    link = "@lsp.type.interface"
  },
  LspKindKey = {
-    link = "@field"
+    link = "@variable.member"
  },
  LspKindKeyword = {
    link = "@lsp.type.keyword"
  },
  LspKindMethod = {
-    link = "@method"
+    link = "@function.method"
  },
  LspKindModule = {
-    link = "@namespace"
+    link = "@module"
  },
  LspKindNamespace = {
-    link = "@namespace"
+    link = "@module"
  },
  LspKindNull = {
    link = "@constant.builtin"
@@ -1237,13 +1405,13 @@ local highlights = {
    link = "@operator"
  },
  LspKindPackage = {
-    link = "@namespace"
+    link = "@module"
  },
  LspKindProperty = {
    link = "@property"
  },
  LspKindReference = {
-    link = "@text.reference"
+    link = "@markup.link"
  },
  LspKindSnippet = {
    link = "Conceal"
@@ -1255,7 +1423,7 @@ local highlights = {
    link = "@lsp.type.struct"
  },
  LspKindText = {
-    link = "@text"
+    link = "@markup"
  },
  LspKindTypeParameter = {
    link = "@lsp.type.typeParameter"
@@ -2138,7 +2306,7 @@ local highlights = {
    fg = "#222436"
  },
  TreesitterContext = {
-    bg = "#363c58"
+    bg = "#272a3f"
  },
  TroubleCount = {
    bg = "#3b4261",
@@ -2146,7 +2314,7 @@ local highlights = {
  },
  TroubleNormal = {
    bg = "#1e2030",
-    fg = "#828bb8"
+    fg = "#c8d3f5"
  },
  TroubleText = {
    fg = "#828bb8"
@@ -2196,6 +2364,12 @@ local highlights = {
  WildMenu = {
    bg = "#2d3f76"
  },
+  WinBar = {
+    link = "StatusLine"
+  },
+  WinBarNC = {
+    link = "StatusLineNC"
+  },
  WinSeparator = {
    bold = true,
    fg = "#1b1d2b"
--- a/extras/lua/faroutnight.lua
+++ b/extras/lua/faroutnight.lua
@@ -64,19 +64,89 @@ local colors = {
  red1 = "#df674c",
  teal = "#c69478",
  terminal_black = "#392D2B",
+  todo = "#d47d49",
  warning = "#f2a766",
  yellow = "#f2a766"
 }

 local highlights = {
+  ["@annotation"] = {
+    link = "PreProc"
+  },
+  ["@attribute"] = {
+    link = "PreProc"
+  },
+  ["@boolean"] = {
+    link = "Boolean"
+  },
+  ["@character"] = {
+    link = "Character"
+  },
+  ["@character.special"] = {
+    link = "SpecialChar"
+  },
+  ["@comment"] = {
+    link = "Comment"
+  },
+  ["@comment.error"] = {
+    fg = "#df674c"
+  },
+  ["@comment.hint"] = {
+    fg = "#c69478"
+  },
+  ["@comment.info"] = {
+    fg = "#A4895C"
+  },
+  ["@comment.note"] = {
+    fg = "#c69478"
+  },
+  ["@comment.todo"] = {
+    fg = "#d47d49"
+  },
+  ["@comment.warning"] = {
+    fg = "#f2a766"
+  },
+  ["@constant"] = {
+    link = "Constant"
+  },
+  ["@constant.builtin"] = {
+    link = "Special"
+  },
+  ["@constant.macro"] = {
+    link = "Define"
+  },
  ["@constructor"] = {
    fg = "#8a4b53"
  },
  ["@constructor.tsx"] = {
    fg = "#BF472C"
  },
-  ["@field"] = {
-    fg = "#c4a98f"
+  ["@diff.delta"] = {
+    link = "DiffChange"
+  },
+  ["@diff.minus"] = {
+    link = "DiffDelete"
+  },
+  ["@diff.plus"] = {
+    link = "DiffAdd"
+  },
+  ["@function"] = {
+    link = "Function"
+  },
+  ["@function.builtin"] = {
+    link = "Special"
+  },
+  ["@function.call"] = {
+    link = "@function"
+  },
+  ["@function.macro"] = {
+    link = "Macro"
+  },
+  ["@function.method"] = {
+    link = "Function"
+  },
+  ["@function.method.call"] = {
+    link = "@function.method"
  },
  ["@keyword"] = {
    fg = "#a47a7a",
@@ -84,10 +154,43 @@ local highlights = {
      italic = true
    }
  },
+  ["@keyword.conditional"] = {
+    link = "Conditional"
+  },
+  ["@keyword.coroutine"] = {
+    link = "@keyword"
+  },
+  ["@keyword.debug"] = {
+    link = "Debug"
+  },
+  ["@keyword.directive"] = {
+    link = "PreProc"
+  },
+  ["@keyword.directive.define"] = {
+    link = "Define"
+  },
+  ["@keyword.exception"] = {
+    link = "Exception"
+  },
  ["@keyword.function"] = {
    fg = "#8a4b53",
    style = {}
  },
+  ["@keyword.import"] = {
+    link = "Include"
+  },
+  ["@keyword.operator"] = {
+    link = "@operator"
+  },
+  ["@keyword.repeat"] = {
+    link = "Repeat"
+  },
+  ["@keyword.return"] = {
+    link = "@keyword"
+  },
+  ["@keyword.storage"] = {
+    link = "StorageClass"
+  },
  ["@label"] = {
    fg = "#d47d49"
  },
@@ -116,7 +219,7 @@ local highlights = {
    link = "@string.escape"
  },
  ["@lsp.type.formatSpecifier"] = {
-    link = "@punctuation.special"
+    link = "@markup.list"
  },
  ["@lsp.type.generic"] = {
    link = "@variable"
@@ -128,10 +231,10 @@ local highlights = {
    link = "@keyword"
  },
  ["@lsp.type.lifetime"] = {
-    link = "@storageclass"
+    link = "@keyword.storage"
  },
  ["@lsp.type.namespace"] = {
-    link = "@namespace"
+    link = "@module"
  },
  ["@lsp.type.number"] = {
    link = "@number"
@@ -140,7 +243,7 @@ local highlights = {
    link = "@operator"
  },
  ["@lsp.type.parameter"] = {
-    link = "@parameter"
+    link = "@variable.parameter"
  },
  ["@lsp.type.property"] = {
    link = "@property"
@@ -213,21 +316,108 @@ local highlights = {
  ["@lsp.typemod.variable.static"] = {
    link = "@constant"
  },
-  ["@namespace"] = {
+  ["@markup"] = {
+    link = "@none"
+  },
+  ["@markup.emphasis"] = {
+    italic = true
+  },
+  ["@markup.environment"] = {
+    link = "Macro"
+  },
+  ["@markup.environment.name"] = {
+    link = "Type"
+  },
+  ["@markup.heading"] = {
+    link = "Title"
+  },
+  ["@markup.heading.1.markdown"] = {
+    bold = true,
+    fg = "#d47d49"
+  },
+  ["@markup.heading.2.markdown"] = {
+    bold = true,
+    fg = "#f2a766"
+  },
+  ["@markup.heading.3.markdown"] = {
+    bold = true,
+    fg = "#a4896f"
+  },
+  ["@markup.heading.4.markdown"] = {
+    bold = true,
+    fg = "#c69478"
+  },
+  ["@markup.heading.5.markdown"] = {
+    bold = true,
+    fg = "#8a4b53"
+  },
+  ["@markup.heading.6.markdown"] = {
+    bold = true,
+    fg = "#a47a7a"
+  },
+  ["@markup.link"] = {
+    fg = "#c69478"
+  },
+  ["@markup.link.label"] = {
+    link = "SpecialChar"
+  },
+  ["@markup.link.label.symbol"] = {
+    link = "Identifier"
+  },
+  ["@markup.link.url"] = {
+    link = "Underlined"
+  },
+  ["@markup.list"] = {
+    fg = "#a67458"
+  },
+  ["@markup.list.checked"] = {
+    fg = "#c4a98f"
+  },
+  ["@markup.list.markdown"] = {
+    bold = true,
+    fg = "#ff9e64"
+  },
+  ["@markup.list.unchecked"] = {
+    fg = "#d47d49"
+  },
+  ["@markup.math"] = {
+    link = "Special"
+  },
+  ["@markup.raw"] = {
+    link = "String"
+  },
+  ["@markup.raw.markdown_inline"] = {
+    bg = "#392D2B",
+    fg = "#d47d49"
+  },
+  ["@markup.strikethrough"] = {
+    strikethrough = true
+  },
+  ["@markup.strong"] = {
+    bold = true
+  },
+  ["@markup.underline"] = {
+    underline = true
+  },
+  ["@module"] = {
    link = "Include"
  },
-  ["@namespace.builtin"] = {
+  ["@module.builtin"] = {
    fg = "#bf472c"
  },
+  ["@namespace.builtin"] = {
+    link = "@variable.builtin"
+  },
+  ["@none"] = {},
+  ["@number"] = {
+    link = "Number"
+  },
+  ["@number.float"] = {
+    link = "Float"
+  },
  ["@operator"] = {
    fg = "#a67458"
  },
-  ["@parameter"] = {
-    fg = "#f2a766"
-  },
-  ["@parameter.builtin"] = {
-    fg = "#f5b985"
-  },
  ["@property"] = {
    fg = "#c4a98f"
  },
@@ -240,9 +430,8 @@ local highlights = {
  ["@punctuation.special"] = {
    fg = "#a67458"
  },
-  ["@punctuation.special.markdown"] = {
-    bold = true,
-    fg = "#ff9e64"
+  ["@string"] = {
+    link = "String"
  },
  ["@string.documentation"] = {
    fg = "#f2a766"
@@ -250,69 +439,36 @@ local highlights = {
  ["@string.escape"] = {
    fg = "#8a4b53"
  },
-  ["@string.regex"] = {
+  ["@string.regexp"] = {
    fg = "#BC907B"
  },
+  ["@tag"] = {
+    link = "Label"
+  },
+  ["@tag.attribute"] = {
+    link = "@property"
+  },
+  ["@tag.delimiter"] = {
+    link = "Delimiter"
+  },
  ["@tag.delimiter.tsx"] = {
    fg = "#995a35"
  },
  ["@tag.tsx"] = {
    fg = "#bf472c"
  },
-  ["@text.danger"] = {
-    bg = "#df674c",
-    fg = "#0f0908"
-  },
-  ["@text.diff.add"] = {
-    link = "DiffAdd"
-  },
-  ["@text.diff.delete"] = {
-    link = "DiffDelete"
-  },
-  ["@text.literal.markdown_inline"] = {
-    bg = "#392D2B",
-    fg = "#d47d49"
-  },
-  ["@text.reference"] = {
-    fg = "#c69478"
-  },
-  ["@text.title.1.markdown"] = {
-    bold = true,
-    fg = "#d47d49"
-  },
-  ["@text.title.2.markdown"] = {
-    bold = true,
-    fg = "#f2a766"
-  },
-  ["@text.title.3.markdown"] = {
-    bold = true,
-    fg = "#a4896f"
-  },
-  ["@text.title.4.markdown"] = {
-    bold = true,
-    fg = "#c69478"
-  },
-  ["@text.title.5.markdown"] = {
-    bold = true,
-    fg = "#8a4b53"
-  },
-  ["@text.title.6.markdown"] = {
-    bold = true,
-    fg = "#a47a7a"
-  },
-  ["@text.todo.checked"] = {
-    fg = "#c4a98f"
-  },
-  ["@text.todo.unchecked"] = {
-    fg = "#d47d49"
-  },
-  ["@text.warning"] = {
-    bg = "#f2a766",
-    fg = "#0f0908"
+  ["@type"] = {
+    link = "Type"
  },
  ["@type.builtin"] = {
    fg = "#9c3b25"
  },
+  ["@type.definition"] = {
+    link = "Typedef"
+  },
+  ["@type.qualifier"] = {
+    link = "@keyword"
+  },
  ["@variable"] = {
    fg = "#E0CCAE",
    style = {}
@@ -320,6 +476,15 @@ local highlights = {
  ["@variable.builtin"] = {
    fg = "#bf472c"
  },
+  ["@variable.member"] = {
+    fg = "#c4a98f"
+  },
+  ["@variable.parameter"] = {
+    fg = "#f2a766"
+  },
+  ["@variable.parameter.builtin"] = {
+    fg = "#f5b985"
+  },
  ALEErrorSign = {
    fg = "#df674c"
  },
@@ -840,6 +1005,9 @@ local highlights = {
  DefinitionIcon = {
    fg = "#d47d49"
  },
+  Delimiter = {
+    link = "Special"
+  },
  DiagnosticError = {
    fg = "#df674c"
  },
@@ -1195,7 +1363,7 @@ local highlights = {
    link = "Special"
  },
  LspKindField = {
-    link = "@field"
+    link = "@variable.member"
  },
  LspKindFile = {
    link = "Normal"
@@ -1210,19 +1378,19 @@ local highlights = {
    link = "@lsp.type.interface"
  },
  LspKindKey = {
-    link = "@field"
+    link = "@variable.member"
  },
  LspKindKeyword = {
    link = "@lsp.type.keyword"
  },
  LspKindMethod = {
-    link = "@method"
+    link = "@function.method"
  },
  LspKindModule = {
-    link = "@namespace"
+    link = "@module"
  },
  LspKindNamespace = {
-    link = "@namespace"
+    link = "@module"
  },
  LspKindNull = {
    link = "@constant.builtin"
@@ -1237,13 +1405,13 @@ local highlights = {
    link = "@operator"
  },
  LspKindPackage = {
-    link = "@namespace"
+    link = "@module"
  },
  LspKindProperty = {
    link = "@property"
  },
  LspKindReference = {
-    link = "@text.reference"
+    link = "@markup.link"
  },
  LspKindSnippet = {
    link = "Conceal"
@@ -1255,7 +1423,7 @@ local highlights = {
    link = "@lsp.type.struct"
  },
  LspKindText = {
-    link = "@text"
+    link = "@markup"
  },
  LspKindTypeParameter = {
    link = "@lsp.type.typeParameter"
@@ -2138,7 +2306,7 @@ local highlights = {
    fg = "#0f0908"
  },
  TreesitterContext = {
-    bg = "#59352c"
+    bg = "#211411"
  },
  TroubleCount = {
    bg = "#6B4035",
@@ -2146,7 +2314,7 @@ local highlights = {
  },
  TroubleNormal = {
    bg = "#1f1311",
-    fg = "#F2A766"
+    fg = "#E0CCAE"
  },
  TroubleText = {
    fg = "#F2A766"
@@ -2196,6 +2364,12 @@ local highlights = {
  WildMenu = {
    bg = "#6b442f"
  },
+  WinBar = {
+    link = "StatusLine"
+  },
+  WinBarNC = {
+    link = "StatusLineNC"
+  },
  WinSeparator = {
    bold = true,
    fg = "#0c0706"
--- a/extras/lua/faroutstorm.lua
+++ b/extras/lua/faroutstorm.lua
@@ -64,19 +64,89 @@ local colors = {
  red1 = "#df674c",
  teal = "#c69478",
  terminal_black = "#392D2B",
+  todo = "#d47d49",
  warning = "#f2a766",
  yellow = "#f2a766"
 }

 local highlights = {
+  ["@annotation"] = {
+    link = "PreProc"
+  },
+  ["@attribute"] = {
+    link = "PreProc"
+  },
+  ["@boolean"] = {
+    link = "Boolean"
+  },
+  ["@character"] = {
+    link = "Character"
+  },
+  ["@character.special"] = {
+    link = "SpecialChar"
+  },
+  ["@comment"] = {
+    link = "Comment"
+  },
+  ["@comment.error"] = {
+    fg = "#df674c"
+  },
+  ["@comment.hint"] = {
+    fg = "#c69478"
+  },
+  ["@comment.info"] = {
+    fg = "#A4895C"
+  },
+  ["@comment.note"] = {
+    fg = "#c69478"
+  },
+  ["@comment.todo"] = {
+    fg = "#d47d49"
+  },
+  ["@comment.warning"] = {
+    fg = "#f2a766"
+  },
+  ["@constant"] = {
+    link = "Constant"
+  },
+  ["@constant.builtin"] = {
+    link = "Special"
+  },
+  ["@constant.macro"] = {
+    link = "Define"
+  },
  ["@constructor"] = {
    fg = "#8a4b53"
  },
  ["@constructor.tsx"] = {
    fg = "#BF472C"
  },
-  ["@field"] = {
-    fg = "#c4a98f"
+  ["@diff.delta"] = {
+    link = "DiffChange"
+  },
+  ["@diff.minus"] = {
+    link = "DiffDelete"
+  },
+  ["@diff.plus"] = {
+    link = "DiffAdd"
+  },
+  ["@function"] = {
+    link = "Function"
+  },
+  ["@function.builtin"] = {
+    link = "Special"
+  },
+  ["@function.call"] = {
+    link = "@function"
+  },
+  ["@function.macro"] = {
+    link = "Macro"
+  },
+  ["@function.method"] = {
+    link = "Function"
+  },
+  ["@function.method.call"] = {
+    link = "@function.method"
  },
  ["@keyword"] = {
    fg = "#a47a7a",
@@ -84,10 +154,43 @@ local highlights = {
      italic = true
    }
  },
+  ["@keyword.conditional"] = {
+    link = "Conditional"
+  },
+  ["@keyword.coroutine"] = {
+    link = "@keyword"
+  },
+  ["@keyword.debug"] = {
+    link = "Debug"
+  },
+  ["@keyword.directive"] = {
+    link = "PreProc"
+  },
+  ["@keyword.directive.define"] = {
+    link = "Define"
+  },
+  ["@keyword.exception"] = {
+    link = "Exception"
+  },
  ["@keyword.function"] = {
    fg = "#8a4b53",
    style = {}
  },
+  ["@keyword.import"] = {
+    link = "Include"
+  },
+  ["@keyword.operator"] = {
+    link = "@operator"
+  },
+  ["@keyword.repeat"] = {
+    link = "Repeat"
+  },
+  ["@keyword.return"] = {
+    link = "@keyword"
+  },
+  ["@keyword.storage"] = {
+    link = "StorageClass"
+  },
  ["@label"] = {
    fg = "#d47d49"
  },
@@ -116,7 +219,7 @@ local highlights = {
    link = "@string.escape"
  },
  ["@lsp.type.formatSpecifier"] = {
-    link = "@punctuation.special"
+    link = "@markup.list"
  },
  ["@lsp.type.generic"] = {
    link = "@variable"
@@ -128,10 +231,10 @@ local highlights = {
    link = "@keyword"
  },
  ["@lsp.type.lifetime"] = {
-    link = "@storageclass"
+    link = "@keyword.storage"
  },
  ["@lsp.type.namespace"] = {
-    link = "@namespace"
+    link = "@module"
  },
  ["@lsp.type.number"] = {
    link = "@number"
@@ -140,7 +243,7 @@ local highlights = {
    link = "@operator"
  },
  ["@lsp.type.parameter"] = {
-    link = "@parameter"
+    link = "@variable.parameter"
  },
  ["@lsp.type.property"] = {
    link = "@property"
@@ -213,21 +316,108 @@ local highlights = {
  ["@lsp.typemod.variable.static"] = {
    link = "@constant"
  },
-  ["@namespace"] = {
+  ["@markup"] = {
+    link = "@none"
+  },
+  ["@markup.emphasis"] = {
+    italic = true
+  },
+  ["@markup.environment"] = {
+    link = "Macro"
+  },
+  ["@markup.environment.name"] = {
+    link = "Type"
+  },
+  ["@markup.heading"] = {
+    link = "Title"
+  },
+  ["@markup.heading.1.markdown"] = {
+    bold = true,
+    fg = "#d47d49"
+  },
+  ["@markup.heading.2.markdown"] = {
+    bold = true,
+    fg = "#f2a766"
+  },
+  ["@markup.heading.3.markdown"] = {
+    bold = true,
+    fg = "#a4896f"
+  },
+  ["@markup.heading.4.markdown"] = {
+    bold = true,
+    fg = "#c69478"
+  },
+  ["@markup.heading.5.markdown"] = {
+    bold = true,
+    fg = "#8a4b53"
+  },
+  ["@markup.heading.6.markdown"] = {
+    bold = true,
+    fg = "#a47a7a"
+  },
+  ["@markup.link"] = {
+    fg = "#c69478"
+  },
+  ["@markup.link.label"] = {
+    link = "SpecialChar"
+  },
+  ["@markup.link.label.symbol"] = {
+    link = "Identifier"
+  },
+  ["@markup.link.url"] = {
+    link = "Underlined"
+  },
+  ["@markup.list"] = {
+    fg = "#a67458"
+  },
+  ["@markup.list.checked"] = {
+    fg = "#c4a98f"
+  },
+  ["@markup.list.markdown"] = {
+    bold = true,
+    fg = "#ff9e64"
+  },
+  ["@markup.list.unchecked"] = {
+    fg = "#d47d49"
+  },
+  ["@markup.math"] = {
+    link = "Special"
+  },
+  ["@markup.raw"] = {
+    link = "String"
+  },
+  ["@markup.raw.markdown_inline"] = {
+    bg = "#392D2B",
+    fg = "#d47d49"
+  },
+  ["@markup.strikethrough"] = {
+    strikethrough = true
+  },
+  ["@markup.strong"] = {
+    bold = true
+  },
+  ["@markup.underline"] = {
+    underline = true
+  },
+  ["@module"] = {
    link = "Include"
  },
-  ["@namespace.builtin"] = {
+  ["@module.builtin"] = {
    fg = "#bf472c"
  },
+  ["@namespace.builtin"] = {
+    link = "@variable.builtin"
+  },
+  ["@none"] = {},
+  ["@number"] = {
+    link = "Number"
+  },
+  ["@number.float"] = {
+    link = "Float"
+  },
  ["@operator"] = {
    fg = "#a67458"
  },
-  ["@parameter"] = {
-    fg = "#f2a766"
-  },
-  ["@parameter.builtin"] = {
-    fg = "#f5b985"
-  },
  ["@property"] = {
    fg = "#c4a98f"
  },
@@ -240,9 +430,8 @@ local highlights = {
  ["@punctuation.special"] = {
    fg = "#a67458"
  },
-  ["@punctuation.special.markdown"] = {
-    bold = true,
-    fg = "#ff9e64"
+  ["@string"] = {
+    link = "String"
  },
  ["@string.documentation"] = {
    fg = "#f2a766"
@@ -250,69 +439,36 @@ local highlights = {
  ["@string.escape"] = {
    fg = "#8a4b53"
  },
-  ["@string.regex"] = {
+  ["@string.regexp"] = {
    fg = "#BC907B"
  },
+  ["@tag"] = {
+    link = "Label"
+  },
+  ["@tag.attribute"] = {
+    link = "@property"
+  },
+  ["@tag.delimiter"] = {
+    link = "Delimiter"
+  },
  ["@tag.delimiter.tsx"] = {
    fg = "#995a35"
  },
  ["@tag.tsx"] = {
    fg = "#bf472c"
  },
-  ["@text.danger"] = {
-    bg = "#df674c",
-    fg = "#0f0908"
-  },
-  ["@text.diff.add"] = {
-    link = "DiffAdd"
-  },
-  ["@text.diff.delete"] = {
-    link = "DiffDelete"
-  },
-  ["@text.literal.markdown_inline"] = {
-    bg = "#392D2B",
-    fg = "#d47d49"
-  },
-  ["@text.reference"] = {
-    fg = "#c69478"
-  },
-  ["@text.title.1.markdown"] = {
-    bold = true,
-    fg = "#d47d49"
-  },
-  ["@text.title.2.markdown"] = {
-    bold = true,
-    fg = "#f2a766"
-  },
-  ["@text.title.3.markdown"] = {
-    bold = true,
-    fg = "#a4896f"
-  },
-  ["@text.title.4.markdown"] = {
-    bold = true,
-    fg = "#c69478"
-  },
-  ["@text.title.5.markdown"] = {
-    bold = true,
-    fg = "#8a4b53"
-  },
-  ["@text.title.6.markdown"] = {
-    bold = true,
-    fg = "#a47a7a"
-  },
-  ["@text.todo.checked"] = {
-    fg = "#c4a98f"
-  },
-  ["@text.todo.unchecked"] = {
-    fg = "#d47d49"
-  },
-  ["@text.warning"] = {
-    bg = "#f2a766",
-    fg = "#0f0908"
+  ["@type"] = {
+    link = "Type"
  },
  ["@type.builtin"] = {
    fg = "#9c3b25"
  },
+  ["@type.definition"] = {
+    link = "Typedef"
+  },
+  ["@type.qualifier"] = {
+    link = "@keyword"
+  },
  ["@variable"] = {
    fg = "#E0CCAE",
    style = {}
@@ -320,6 +476,15 @@ local highlights = {
  ["@variable.builtin"] = {
    fg = "#bf472c"
  },
+  ["@variable.member"] = {
+    fg = "#c4a98f"
+  },
+  ["@variable.parameter"] = {
+    fg = "#f2a766"
+  },
+  ["@variable.parameter.builtin"] = {
+    fg = "#f5b985"
+  },
  ALEErrorSign = {
    fg = "#df674c"
  },
@@ -840,6 +1005,9 @@ local highlights = {
  DefinitionIcon = {
    fg = "#d47d49"
  },
+  Delimiter = {
+    link = "Special"
+  },
  DiagnosticError = {
    fg = "#df674c"
  },
@@ -1195,7 +1363,7 @@ local highlights = {
    link = "Special"
  },
  LspKindField = {
-    link = "@field"
+    link = "@variable.member"
  },
  LspKindFile = {
    link = "Normal"
@@ -1210,19 +1378,19 @@ local highlights = {
    link = "@lsp.type.interface"
  },
  LspKindKey = {
-    link = "@field"
+    link = "@variable.member"
  },
  LspKindKeyword = {
    link = "@lsp.type.keyword"
  },
  LspKindMethod = {
-    link = "@method"
+    link = "@function.method"
  },
  LspKindModule = {
-    link = "@namespace"
+    link = "@module"
  },
  LspKindNamespace = {
-    link = "@namespace"
+    link = "@module"
  },
  LspKindNull = {
    link = "@constant.builtin"
@@ -1237,13 +1405,13 @@ local highlights = {
    link = "@operator"
  },
  LspKindPackage = {
-    link = "@namespace"
+    link = "@module"
  },
  LspKindProperty = {
    link = "@property"
  },
  LspKindReference = {
-    link = "@text.reference"
+    link = "@markup.link"
  },
  LspKindSnippet = {
    link = "Conceal"
@@ -1255,7 +1423,7 @@ local highlights = {
    link = "@lsp.type.struct"
  },
  LspKindText = {
-    link = "@text"
+    link = "@markup"
  },
  LspKindTypeParameter = {
    link = "@lsp.type.typeParameter"
@@ -2138,7 +2306,7 @@ local highlights = {
    fg = "#0f0908"
  },
  TreesitterContext = {
-    bg = "#59352c"
+    bg = "#211411"
  },
  TroubleCount = {
    bg = "#6B4035",
@@ -2146,7 +2314,7 @@ local highlights = {
  },
  TroubleNormal = {
    bg = "#1f1311",
-    fg = "#F2A766"
+    fg = "#E0CCAE"
  },
  TroubleText = {
    fg = "#F2A766"
@@ -2196,6 +2364,12 @@ local highlights = {
  WildMenu = {
    bg = "#6b442f"
  },
+  WinBar = {
+    link = "StatusLine"
+  },
+  WinBarNC = {
+    link = "StatusLineNC"
+  },
  WinSeparator = {
    bold = true,
    fg = "#0c0706"
--- a/extras/wezterm/faroutday.toml
+++ b/extras/wezterm/faroutday.toml
@@ -8,6 +8,7 @@ selection_bg = "#dd9169"
 selection_fg = "#6c6252"
 split = "#c77544"
 compose_cursor = "#b15c00"
+scrollbar_thumb = "#eae1e0"

 ansi = ["#faf8f8", "#db5234", "#715e4b", "#9b6635", "#c77544", "#c37f87", "#91654c", "#9b6635"]
 brights = ["#d1c4c2", "#db5234", "#715e4b", "#9b6635", "#c77544", "#c37f87", "#91654c", "#6c6252"]
--- a/extras/wezterm/faroutmoon.toml
+++ b/extras/wezterm/faroutmoon.toml
@@ -8,6 +8,7 @@ selection_bg = "#2d3f76"
 selection_fg = "#c8d3f5"
 split = "#82aaff"
 compose_cursor = "#ff966c"
+scrollbar_thumb = "#2f334d"

 ansi = ["#1b1d2b", "#ff757f", "#c3e88d", "#ffc777", "#82aaff", "#c099ff", "#86e1fc", "#828bb8"]
 brights = ["#444a73", "#ff757f", "#c3e88d", "#ffc777", "#82aaff", "#c099ff", "#86e1fc", "#c8d3f5"]
--- a/extras/wezterm/faroutnight.toml
+++ b/extras/wezterm/faroutnight.toml
@@ -8,6 +8,7 @@ selection_bg = "#6b442f"
 selection_fg = "#E0CCAE"
 split = "#d47d49"
 compose_cursor = "#ff9e64"
+scrollbar_thumb = "#241816"

 ansi = ["#0c0706", "#bf472c", "#a4896f", "#f2a766", "#d47d49", "#8a4b53", "#a67458", "#F2A766"]
 brights = ["#392D2B", "#bf472c", "#a4896f", "#f2a766", "#d47d49", "#8a4b53", "#a67458", "#E0CCAE"]
--- a/extras/wezterm/faroutstorm.toml
+++ b/extras/wezterm/faroutstorm.toml
@@ -8,6 +8,7 @@ selection_bg = "#6b442f"
 selection_fg = "#E0CCAE"
 split = "#d47d49"
 compose_cursor = "#ff9e64"
+scrollbar_thumb = "#241816"

 ansi = ["#0c0706", "#bf472c", "#a4896f", "#f2a766", "#d47d49", "#8a4b53", "#a67458", "#F2A766"]
 brights = ["#392D2B", "#bf472c", "#a4896f", "#f2a766", "#d47d49", "#8a4b53", "#a67458", "#E0CCAE"]
--- a/lua/farout/colors.lua
+++ b/lua/farout/colors.lua
@@ -143,6 +143,7 @@ function M.setup(opts)
  colors.fg_float = colors.fg

  colors.error = colors.red1
+  colors.todo = colors.blue
  colors.warning = colors.yellow
  colors.info = colors.blue2
  colors.hint = colors.teal
--- a/lua/farout/extra/alacritty.lua
+++ b/lua/farout/extra/alacritty.lua
@@ -4,50 +4,51 @@ local M = {}

 --- @param colors ColorScheme
 function M.generate(colors)
-  local alacrittyColors = {}
-  for k, v in pairs(colors) do
-    if type(v) == "string" then
-      alacrittyColors[k] = v:gsub("^#", "0x")
-    end
-  end
-
  local alacritty = util.template(
-    [[
+    [=[
 # FarOut Alacritty Colors
-colors:
-  # Default colors
-  primary:
-    background: '${bg}'
-    foreground: '${fg}'
+# Default colors
+[colors.primary]
+background = '${bg}'
+foreground = '${fg}'

-  # Normal colors
-  normal:
-    black:   '${black}'
-    red:     '${red}'
-    green:   '${green}'
-    yellow:  '${yellow}'
-    blue:    '${blue}'
-    magenta: '${magenta}'
-    cyan:    '${cyan}'
-    white:   '${fg_dark}'
+#[colors.cursor]
+#cursor = '${fg}'
+#text = '${bg}'

-  # Bright colors
-  bright:
-    black:   '${terminal_black}'
-    red:     '${red}'
-    green:   '${green}'
-    yellow:  '${yellow}'
-    blue:    '${blue}'
-    magenta: '${magenta}'
-    cyan:    '${cyan}'
-    white:   '${fg}'
+# Normal colors
+[colors.normal]
+black = '${black}'
+red = '${red}'
+green = '${green}'
+yellow = '${yellow}'
+blue = '${blue}'
+magenta = '${magenta}'
+cyan = '${cyan}'
+white = '${fg_dark}'

-  indexed_colors:
-    - { index: 16, color: '${orange}' }
-    - { index: 17, color: '${red1}' }
-    
-  ]],
-    alacrittyColors
+# Bright colors
+[colors.bright]
+black = '${terminal_black}'
+red = '${red}'
+green = '${green}'
+yellow = '${yellow}'
+blue = '${blue}'
+magenta = '${magenta}'
+cyan = '${cyan}'
+white = '${fg}'
+
+# Indexed Colors
+[[colors.indexed_colors]]
+index = 16
+color = '${orange}'
+
+[[colors.indexed_colors]]
+index = 17
+color = '${red1}'
+
+]=],
+    colors
  )

  return alacritty
--- a/lua/farout/extra/fzf.lua
+++ b/lua/farout/extra/fzf.lua
@@ -0,0 +1,18 @@
+local util = require("farout.util")
+
+local M = {}
+
+--- @param colors ColorScheme
+function M.generate(colors)
+  return util.template(M.template, colors)
+end
+
+M.template = [[
+export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
+--color=fg:${fg},bg:${bg},hl:${orange} \
+--color=fg+:${fg},bg+:${bg_highlight},hl+:${orange} \
+--color=info:${blue},prompt:${cyan},pointer:${cyan} \
+--color=marker:${green},spinner:${green},header:${green}"
+]]
+
+return M
--- a/lua/farout/extra/helix.lua
+++ b/lua/farout/extra/helix.lua
@@ -37,7 +37,7 @@ function M.generate(colors)
    },
    string = {
      "String",
-      regexp = "@string.regex",
+      regexp = "@string.regexp",
      special = {
        "@string.special",
        path = nil,
@@ -57,10 +57,10 @@ function M.generate(colors)
    variable = {
      "@variable",
      builtin = "@variable.builtin",
-      parameter = "@parameter",
+      parameter = "@variable.parameter",
      other = {
        nil,
-        member = "@field",
+        member = "@variable.member",
      },
    },
    label = "@label",
@@ -137,7 +137,7 @@ function M.generate(colors)
      quote = nil,
      raw = {
        "markdownCode",
-        inline = "@text.literal.markdown_inline",
+        inline = "@markup.raw.markdown_inline",
        block = "markdownCodeBlock",
        -- UI --
        completion = nil,
--- a/lua/farout/extra/init.lua
+++ b/lua/farout/extra/init.lua
@@ -7,7 +7,7 @@ M.extras = {
  kitty = {ext = "conf", url = "https://sw.kovidgoyal.net/kitty/conf.html", label = "Kitty"},
  fish = {ext = "fish", url = "https://fishshell.com/docs/current/index.html", label = "Fish"},
  fish_themes = {ext = "theme", url = "https://fishshell.com/docs/current/interactive.html#syntax-highlighting", label = "Fish Themes"},
-  alacritty = {ext = "yml", url = "https://github.com/alacritty/alacritty", label = "Alacritty"},
+  alacritty = {ext = "toml", url = "https://github.com/alacritty/alacritty", label = "Alacritty"},
  wezterm = {ext = "toml", url = "https://wezfurlong.org/wezterm/config/files.html", label = "WezTerm"},
  tmux = {ext = "tmux", url = "https://github.com/tmux/tmux/wiki", label = "Tmux"},
  xresources = {ext = "Xresources", url = "https://wiki.archlinux.org/title/X_resources", label = "Xresources"},
@@ -25,6 +25,7 @@ M.extras = {
  dunst = {ext = "dunstrc", url = "https://dunst-project.org/", label = "Dunst"},
  gitui = {ext = "ron", url = "https://github.com/extrawurst/gitui", label = "GitUI"},
  helix = { ext = "toml", url = "https://helix-editor.com/", label = "Helix"},
+  fzf = { ext = "zsh", url = "https://github.com/junegunn/fzf", label = "Fzf"},
 }

 local function write(str, fileName)
--- a/lua/farout/extra/wezterm.lua
+++ b/lua/farout/extra/wezterm.lua
@@ -16,6 +16,7 @@ selection_bg = "${bg_visual}"
 selection_fg = "${fg}"
 split = "${blue}"
 compose_cursor = "${orange}"
+scrollbar_thumb = "${bg_highlight}"

 ansi = ["${black}", "${red}", "${green}", "${yellow}", "${blue}", "${magenta}", "${cyan}", "${fg_dark}"]
 brights = ["${terminal_black}", "${red}", "${green}", "${yellow}", "${blue}", "${magenta}", "${cyan}", "${fg}"]
--- a/lua/farout/theme.lua
+++ b/lua/farout/theme.lua
@@ -91,6 +91,8 @@ function M.setup()
    WarningMsg = { fg = c.warning }, -- warning messages
    Whitespace = { fg = c.fg_gutter }, -- "nbsp", "space", "tab" and "trail" in 'listchars'
    WildMenu = { bg = c.bg_visual }, -- current match in 'wildmenu' completion
+    WinBar = { link = "StatusLine" }, -- window bar
+    WinBarNC = { link = "StatusLineNC" }, -- window bar in inactive windows

    -- These groups are not listed as default vim groups,
    -- but they are defacto standard group names for syntax highlighting.
@@ -130,7 +132,7 @@ function M.setup()
    Special = { fg = c.blue1 }, -- (preferred) any special symbol
    -- SpecialChar   = { }, --  special character in a constant
    -- Tag           = { }, --    you can use CTRL-] on this
-    -- Delimiter     = { }, --  character that needs attention
+    Delimiter = { link = "Special" }, --  character that needs attention
    -- SpecialComment= { }, -- special things inside a comment
    Debug = { fg = c.orange }, --    debugging statements

@@ -206,7 +208,62 @@ function M.setup()
    DapStoppedLine = { bg = util.darken(c.warning, 0.1) }, -- Used for "Warning" diagnostic virtual text

    -- These groups are for the Neovim tree-sitter highlights.
-    -- As of writing, tree-sitter support is a WIP, group names may change.
+    ["@annotation"] = { link = "PreProc" },
+    ["@attribute"] = { link = "PreProc" },
+    ["@boolean"] = { link = "Boolean" },
+    ["@character"] = { link = "Character" },
+    ["@character.special"] = { link = "SpecialChar" },
+    ["@comment"] = { link = "Comment" },
+    ["@keyword.conditional"] = { link = "Conditional" },
+    ["@constant"] = { link = "Constant" },
+    ["@constant.builtin"] = { link = "Special" },
+    ["@constant.macro"] = { link = "Define" },
+    ["@keyword.debug"] = { link = "Debug" },
+    ["@keyword.directive.define"] = { link = "Define" },
+    ["@keyword.exception"] = { link = "Exception" },
+    ["@number.float"] = { link = "Float" },
+    ["@function"] = { link = "Function" },
+    ["@function.builtin"] = { link = "Special" },
+    ["@function.call"] = { link = "@function" },
+    ["@function.macro"] = { link = "Macro" },
+    ["@keyword.import"] = { link = "Include" },
+    ["@keyword.coroutine"] = { link = "@keyword" },
+    ["@keyword.operator"] = { link = "@operator" },
+    ["@keyword.return"] = { link = "@keyword" },
+    ["@function.method"] = { link = "Function" },
+    ["@function.method.call"] = { link = "@function.method" },
+    ["@namespace.builtin"] = { link = "@variable.builtin" },
+    ["@none"] = {},
+    ["@number"] = { link = "Number" },
+    ["@keyword.directive"] = { link = "PreProc" },
+    ["@keyword.repeat"] = { link = "Repeat" },
+    ["@keyword.storage"] = { link = "StorageClass" },
+    ["@string"] = { link = "String" },
+    ["@markup.link.label"] = { link = "SpecialChar" },
+    ["@markup.link.label.symbol"] = { link = "Identifier" },
+    ["@tag"] = { link = "Label" },
+    ["@tag.attribute"] = { link = "@property" },
+    ["@tag.delimiter"] = { link = "Delimiter" },
+    ["@markup"] = { link = "@none" },
+    ["@markup.environment"] = { link = "Macro" },
+    ["@markup.environment.name"] = { link = "Type" },
+    ["@markup.raw"] = { link = "String" },
+    ["@markup.math"] = { link = "Special" },
+    ["@markup.strong"] = { bold = true },
+    ["@markup.emphasis"] = { italic = true },
+    ["@markup.strikethrough"] = { strikethrough = true },
+    ["@markup.underline"] = { underline = true },
+    ["@markup.heading"] = { link = "Title" },
+    ["@comment.note"] = { fg = c.hint },
+    ["@comment.error"] = { fg = c.error },
+    ["@comment.hint"] = { fg = c.hint },
+    ["@comment.info"] = { fg = c.info },
+    ["@comment.warning"] = { fg = c.warning },
+    ["@comment.todo"] = { fg = c.todo },
+    ["@markup.link.url"] = { link = "Underlined" },
+    ["@type"] = { link = "Type" },
+    ["@type.definition"] = { link = "Typedef" },
+    ["@type.qualifier"] = { link = "@keyword" },

    --- Misc
    -- TODO:
@@ -216,51 +273,49 @@ function M.setup()
    --- Punctuation
    ["@punctuation.delimiter"] = { fg = c.blue5 }, -- For delimiters ie: `.`
    ["@punctuation.bracket"] = { fg = c.fg_dark }, -- For brackets and parens.
-    ["@punctuation.special"] = { fg = c.blue5 }, -- For special punctutation that does not fall in the catagories before.
-    ["@punctuation.special.markdown"] = { fg = c.orange, bold = true },
+    ["@punctuation.special"] = { fg = c.blue5 }, -- For special symbols (e.g. `{}` in string interpolation)
+    ["@markup.list"] = { fg = c.blue5 }, -- For special punctutation that does not fall in the catagories before.
+    ["@markup.list.markdown"] = { fg = c.orange, bold = true },

    --- Literals
    ["@string.documentation"] = { fg = c.yellow },
-    ["@string.regex"] = { fg = c.blue6 }, -- For regexes.
+    ["@string.regexp"] = { fg = c.blue6 }, -- For regexes.
    ["@string.escape"] = { fg = c.magenta }, -- For escape characters within a string.

    --- Functions
    ["@constructor"] = { fg = c.magenta }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
-    ["@parameter"] = { fg = c.yellow }, -- For parameters of a function.
-    ["@parameter.builtin"] = { fg = util.lighten(c.yellow, 0.8) }, -- For builtin parameters of a function, e.g. "..." or Smali's p[1-99]
+    ["@variable.parameter"] = { fg = c.yellow }, -- For parameters of a function.
+    ["@variable.parameter.builtin"] = { fg = util.lighten(c.yellow, 0.8) }, -- For builtin parameters of a function, e.g. "..." or Smali's p[1-99]

    --- Keywords
    ["@keyword"] = { fg = c.purple, style = options.styles.keywords }, -- For keywords that don't fall in previous categories.
-    -- TODO:
-    -- ["@keyword.coroutine"] = { }, -- For keywords related to coroutines.
    ["@keyword.function"] = { fg = c.magenta, style = options.styles.functions }, -- For keywords used to define a fuction.

    ["@label"] = { fg = c.blue }, -- For labels: `label:` in C and `:label:` in Lua.

    --- Types
    ["@type.builtin"] = { fg = util.darken(c.blue1, 0.8) },
-    ["@field"] = { fg = c.green1 }, -- For fields.
+    ["@variable.member"] = { fg = c.green1 }, -- For fields.
    ["@property"] = { fg = c.green1 },

    --- Identifiers
    ["@variable"] = { fg = c.fg, style = options.styles.variables }, -- Any variable name that does not have another highlight.
    ["@variable.builtin"] = { fg = c.red }, -- Variable names that are defined by the languages, like `this` or `self`.
-    ["@namespace.builtin"] = { fg = c.red }, -- Variable names that are defined by the languages, like `this` or `self`.
+    ["@module.builtin"] = { fg = c.red }, -- Variable names that are defined by the languages, like `this` or `self`.

    --- Text
-    -- ["@text.literal.markdown"] = { fg = c.blue },
-    ["@text.literal.markdown_inline"] = { bg = c.terminal_black, fg = c.blue },
-    ["@text.reference"] = { fg = c.teal },
+    -- ["@markup.raw.markdown"] = { fg = c.blue },
+    ["@markup.raw.markdown_inline"] = { bg = c.terminal_black, fg = c.blue },
+    ["@markup.link"] = { fg = c.teal },

-    ["@text.todo.unchecked"] = { fg = c.blue }, -- For brackets and parens.
-    ["@text.todo.checked"] = { fg = c.green1 }, -- For brackets and parens.
-    ["@text.warning"] = { fg = c.bg, bg = c.warning },
-    ["@text.danger"] = { fg = c.bg, bg = c.error },
+    ["@markup.list.unchecked"] = { fg = c.blue }, -- For brackets and parens.
+    ["@markup.list.checked"] = { fg = c.green1 }, -- For brackets and parens.

-    ["@text.diff.add"] = { link = "DiffAdd" },
-    ["@text.diff.delete"] = { link = "DiffDelete" },
+    ["@diff.plus"] = { link = "DiffAdd" },
+    ["@diff.minus"] = { link = "DiffDelete" },
+    ["@diff.delta"] = { link = "DiffChange" },

-    ["@namespace"] = { link = "Include" },
+    ["@module"] = { link = "Include" },

    -- tsx
    ["@tag.tsx"] = { fg = c.red },
@@ -276,15 +331,15 @@ function M.setup()
    ["@lsp.type.enum"] = { link = "@type" },
    ["@lsp.type.enumMember"] = { link = "@constant" },
    ["@lsp.type.escapeSequence"] = { link = "@string.escape" },
-    ["@lsp.type.formatSpecifier"] = { link = "@punctuation.special" },
+    ["@lsp.type.formatSpecifier"] = { link = "@markup.list" },
    ["@lsp.type.generic"] = { link = "@variable" },
    ["@lsp.type.interface"] = { fg = util.lighten(c.blue1, 0.7) },
    ["@lsp.type.keyword"] = { link = "@keyword" },
-    ["@lsp.type.lifetime"] = { link = "@storageclass" },
-    ["@lsp.type.namespace"] = { link = "@namespace" },
+    ["@lsp.type.lifetime"] = { link = "@keyword.storage" },
+    ["@lsp.type.namespace"] = { link = "@module" },
    ["@lsp.type.number"] = { link = "@number" },
    ["@lsp.type.operator"] = { link = "@operator" },
-    ["@lsp.type.parameter"] = { link = "@parameter" },
+    ["@lsp.type.parameter"] = { link = "@variable.parameter" },
    ["@lsp.type.property"] = { link = "@property" },
    ["@lsp.type.selfKeyword"] = { link = "@variable.builtin" },
    ["@lsp.type.selfTypeKeyword"] = { link = "@variable.builtin" },
@@ -342,7 +397,7 @@ function M.setup()
    -- LspTrouble
    TroubleText = { fg = c.fg_dark },
    TroubleCount = { fg = c.magenta, bg = c.fg_gutter },
-    TroubleNormal = { fg = c.fg_sidebar, bg = c.bg_sidebar },
+    TroubleNormal = { fg = c.fg, bg = c.bg_sidebar },

    -- Illuminate
    illuminatedWord = { bg = c.fg_gutter },
@@ -736,28 +791,28 @@ function M.setup()
    Enum = "@lsp.type.enum",
    EnumMember = "@lsp.type.enumMember",
    Event = "Special",
-    Field = "@field",
+    Field = "@variable.member",
    File = "Normal",
    Folder = "Directory",
    Function = "@function",
    Interface = "@lsp.type.interface",
-    Key = "@field",
+    Key = "@variable.member",
    Keyword = "@lsp.type.keyword",
-    Method = "@method",
-    Module = "@namespace",
-    Namespace = "@namespace",
+    Method = "@function.method",
+    Module = "@module",
+    Namespace = "@module",
    Null = "@constant.builtin",
    Number = "@number",
    Object = "@constant",
    Operator = "@operator",
-    Package = "@namespace",
+    Package = "@module",
    Property = "@property",
-    Reference = "@text.reference",
+    Reference = "@markup.link",
    Snippet = "Conceal",
    String = "@string",
    Struct = "@lsp.type.struct",
    Unit = "@lsp.type.struct",
-    Text = "@text",
+    Text = "@markup",
    TypeParameter = "@lsp.type.typeParameter",
    Variable = "@variable",
    Value = "@string",
@@ -775,7 +830,7 @@ function M.setup()
  local markdown_rainbow = { c.blue, c.yellow, c.green, c.teal, c.magenta, c.purple }

  for i, color in ipairs(markdown_rainbow) do
-    theme.highlights["@text.title." .. i .. ".markdown"] = { fg = color, bold = true }
+    theme.highlights["@markup.heading." .. i .. ".markdown"] = { fg = color, bold = true }
    theme.highlights["Headline" .. i] = { bg = util.darken(color, 0.05) }
  end
  theme.highlights["Headline"] = { link = "Headline1" }
--- a/lua/farout/util.lua
+++ b/lua/farout/util.lua
@@ -1,5 +1,3 @@
-local ts = require("farout.treesitter")
-
 local M = {}

 M.bg = "#000000"
@@ -51,10 +49,6 @@ end

 ---@param group string
 function M.highlight(group, hl)
-  group = ts.get(group)
-  if not group then
-    return
-  end
  if hl.style then
    if type(hl.style) == "table" then
      hl = vim.tbl_extend("force", hl, hl.style)
@@ -189,14 +183,6 @@ function M.load(theme)
  vim.o.termguicolors = true
  vim.g.colors_name = "farout"

-  if ts.new_style() then
-    for group, colors in pairs(ts.defaults) do
-      if not theme.highlights[group] then
-        M.highlight(group, colors)
-      end
-    end
-  end
-
  M.syntax(theme.highlights)

  -- vim.api.nvim_set_hl_ns(M.ns)