diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..2c259ca
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,159 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Overview
+
+Flow is a Neovim colorscheme plugin written in Lua. It features an HSL-based color palette with nine primary colors (light blue, blue, cyan, purple, green, yellow, orange, red, sky blue) plus fluorescent accent colors. The plugin supports both dark and light themes with customizable contrast levels and transparency.
+
+## Build Commands
+
+**Format code:**
+```bash
+make fmt
+```
+Uses stylua with `.stylua.toml` config to format all Lua files in `lua/`.
+
+**Generate extra themes:**
+```bash
+make extras
+```
+Generates theme files for external tools (Alacritty, Kitty, Tmux, fzf, Ghostty) based on the Nvim colorscheme. Uses `scripts/generate-extras.lua`. Generated files are output to `./extra/` directory.
+
+**Run all tasks:**
+```bash
+make all
+```
+Runs both `fmt` and `extras`.
+
+## Architecture
+
+### Color System (HSL-Based)
+
+The colorscheme uses a three-layer color system:
+
+1. **Palette Layer** (`lua/flow/palette.lua`):
+   - Generates base HSL colors with configurable shades (very_dark, dark, default, light, very_light)
+   - Each of 9 colors defined by hue value (e.g., blue=230°, cyan=165°, green=115°)
+   - Supports custom saturation and lightness overrides via config
+   - Fluorescent colors with 100% saturation for accents
+
+2. **Colors Layer** (`lua/flow/colors.lua`):
+   - Transforms palette into semantic colors (fg, bg, error, warning, etc.)
+   - Handles theme inversion for light/dark modes
+   - Applies contrast adjustments by swapping grey shades
+   - Manages UI-specific colors (gutter, float, popup, statusline, borders)
+   - Provides full color variations (e.g., `colors.blue` and `colors.Blue` with all shades)
+
+3. **Highlights Layer** (`lua/flow/highlights/*.lua`):
+   - Maps semantic colors to Neovim highlight groups
+   - Each file handles a specific category (base, syntax, git, lsp, etc.)
+   - All highlight modules export a `get(colors, options)` function returning highlight definitions
+
+### Plugin Flow
+
+1. User calls `require("flow").setup(opts)` → validates and stores config in `lua/flow/config.lua`
+2. User calls `vim.cmd("colorscheme flow")` → triggers `lua/flow/init.lua:load()`
+3. `load()` calls `lua/flow/theme.lua:configure()` which:
+   - Sets up colors via `colors.setup(options)`
+   - Iterates through `theme.active_highlights` list
+   - Requires each highlight module and calls its `get()` function
+   - Merges all highlight tables
+4. Final highlights applied via `vim.api.nvim_set_hl()`
+
+### Configuration System
+
+- Defaults in `lua/flow/config.lua` with full type annotations (`@class`, `@alias`)
+- Options validated before merge to catch invalid values early
+- Three main config sections:
+  - `theme`: style (dark/light), contrast (default/high), transparent
+  - `colors`: mode (default/dark/light), fluo accent color, custom saturation/lightness
+  - `ui`: borders style, aggressive_spell, aggressive_special_comment
+
+### Extra Themes Generator
+
+Located in `lua/flow/extra/`:
+- `init.lua` - Public API
+- `main.lua` - Generation logic
+- `config.lua` - Theme variant definitions
+- `template/*.lua` - Template files with `${variable}` placeholders
+- Uses `util.interpolate()` to replace placeholders with color values
+
+## Code Organization
+
+**Core modules:**
+- `lua/flow/init.lua` - Entry point with `setup()` and `load()` functions
+- `lua/flow/config.lua` - Configuration defaults and validation
+- `lua/flow/theme.lua` - Orchestrates highlight generation
+- `lua/flow/palette.lua` - HSL color generation
+- `lua/flow/colors.lua` - Semantic color mapping
+- `lua/flow/util.lua` - HSL/RGB conversion and interpolation utilities
+
+**Highlight modules:** (`lua/flow/highlights/*.lua`)
+Each module exports `M.get(colors, options)` returning a table of `{ [group] = {...} }` definitions.
+
+**Entry point for colorscheme:**
+`colors/flow.lua` - Loads the plugin when `:colorscheme flow` is executed
+
+**Integrations:**
+- `lua/lualine/themes/flow.lua` - Lualine statusline theme
+- `lua/barbecue/theme/flow.lua` - Barbecue winbar theme
+
+## Key Implementation Patterns
+
+### Highlight Group Hierarchy
+
+Flow uses a **three-tier highlight system** for maintainability and consistency:
+
+1. **Base Groups** (defined in `base.lua` and `syntax.lua`):
+   - **Git operations**: `Added`, `Removed`, `Changed` - Git add/delete/modify states
+   - **Special comments**: `Todo`, `Fixme`, `Note`, `Hack`, `Warn` - Comment annotations
+   - **Headers**: `FlowHeader` - Main headers for plugin UIs (Lazy, Mason)
+   - **Titles**: `FloatTitle` - Titles for floating windows, `FlowPluginTitle` - Titles for plugin UIs (Telescope, Avante)
+   - **Buttons**: `FlowButton`, `FlowButtonActive` - Interactive button elements
+   - **Blocks**: `FlowHighlightBlock` - Highlighted/selected blocks
+   - **States**: `FlowSuccess`, `FlowError`, `FlowWarning`, `FlowInfo` - Semantic state indicators
+   - **Borders**: `Border` - Transparent borders for plugin UIs, `FloatBorder` - Borders for floating windows with background
+   - **LSP Kinds** (code elements): 26 `FlowKind*` groups with distinct, vibrant colors for maximum visual distinction in completion menus. Each kind (Function, Method, Variable, Property, Field, Constant, Class, Interface, Module, Operator, etc.) has a carefully chosen color from Flow's palette. See `LSP_KIND_COLORS.md` for complete mapping. Used by completion plugins (nvim-cmp, blink) and DAP UI.
+
+2. **Plugin Groups** (defined in `highlights/*.lua`):
+   - Link to base groups whenever semantically appropriate
+   - Use direct colors only for plugin-specific styling
+
+3. **Treesitter/LSP Groups** (defined in `treesitter.lua`, `lsp.lua`):
+   - Link to syntax base groups for consistency
+
+### Adding Support for a New Plugin
+
+1. Create `lua/flow/highlights/plugin-name.lua`
+2. Implement `M.get(colors, options)` function
+3. **First, check if base groups can be reused:**
+   - Headers → link to `FlowHeader`
+   - Titles → link to `FlowPluginTitle` (transparent) or `FloatTitle` (floating)
+   - Buttons → link to `FlowButton`/`FlowButtonActive`
+   - Success states → link to `FlowSuccess`
+   - Error states → link to `FlowError`
+   - Warning/Info states → link to `FlowWarning`/`FlowInfo`
+   - Git operations → link to `Added`/`Removed`/`Changed`
+   - Borders → link to `Border` (transparent) or `FloatBorder` (with background)
+   - Code elements (functions, variables, types, etc.) → link to `FlowKind*` groups
+4. Only define custom colors for truly plugin-specific elements
+5. Add "plugin-name" to `theme.active_highlights` in `lua/flow/theme.lua`
+
+**When to create new base groups:**
+- When 3+ plugins would benefit from the same semantic meaning
+- When the concept is universally applicable (not plugin-specific)
+- Add them to `base.lua` with clear comments about their purpose
+
+**Color naming convention:**
+- Lowercase (e.g., `colors.blue`) = single shade based on mode setting
+- Capitalized (e.g., `colors.Blue`) = table with all shades (very_dark, dark, default, light, very_light)
+- Special semantic colors: `fg`, `bg`, `error`, `warning`, `info`, `hint`, `fluo`
+
+**Theme/Contrast adjustments:**
+- Light theme: inverts black/white and reverses grey scale order
+- High contrast: swaps darkest/lightest grey shades for more pronounced separations
+
+## Diagnostic Warnings
+
+The "Undefined global `vim`" warnings are expected in a Neovim plugin context. The `vim` global is provided by Neovim's Lua runtime and these can be ignored or suppressed with a `.luarc.json` configuration.
diff --git a/doc/flow.nvim.txt b/doc/flow.nvim.txt
index 53ad3ad..f7fc288 100644
--- a/doc/flow.nvim.txt
+++ b/doc/flow.nvim.txt
@@ -114,7 +114,7 @@ DEFAULT ~
             },
           },
           ui = {
-            borders = "inverse", -- "theme" | "inverse" | "fluo" | "none"
+            borders = "dark", -- "light" | "dark" | "none"
             aggressive_spell = false, -- true | false
           },
         },
diff --git a/extra/moon-eclipse/alacritty-flow-cyan.toml b/extra/moon-eclipse/alacritty-flow-cyan.toml
index 124b8cb..31ce360 100644
--- a/extra/moon-eclipse/alacritty-flow-cyan.toml
+++ b/extra/moon-eclipse/alacritty-flow-cyan.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-eclipse/alacritty-flow-green.toml b/extra/moon-eclipse/alacritty-flow-green.toml
index 6dfc50b..fad853d 100644
--- a/extra/moon-eclipse/alacritty-flow-green.toml
+++ b/extra/moon-eclipse/alacritty-flow-green.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-eclipse/alacritty-flow-orange.toml b/extra/moon-eclipse/alacritty-flow-orange.toml
index 5e2905b..76ba0f9 100644
--- a/extra/moon-eclipse/alacritty-flow-orange.toml
+++ b/extra/moon-eclipse/alacritty-flow-orange.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-eclipse/alacritty-flow-pink.toml b/extra/moon-eclipse/alacritty-flow-pink.toml
index 8867caa..00894a4 100644
--- a/extra/moon-eclipse/alacritty-flow-pink.toml
+++ b/extra/moon-eclipse/alacritty-flow-pink.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-eclipse/alacritty-flow-yellow.toml b/extra/moon-eclipse/alacritty-flow-yellow.toml
index 0560811..3560912 100644
--- a/extra/moon-eclipse/alacritty-flow-yellow.toml
+++ b/extra/moon-eclipse/alacritty-flow-yellow.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-eclipse/fzf-flow-cyan.sh b/extra/moon-eclipse/fzf-flow-cyan.sh
index 763542a..faf681d 100644
--- a/extra/moon-eclipse/fzf-flow-cyan.sh
+++ b/extra/moon-eclipse/fzf-flow-cyan.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#70afdb \
 --color=marker:#a670db \
diff --git a/extra/moon-eclipse/fzf-flow-green.sh b/extra/moon-eclipse/fzf-flow-green.sh
index 6ab3839..8fc1f2f 100644
--- a/extra/moon-eclipse/fzf-flow-green.sh
+++ b/extra/moon-eclipse/fzf-flow-green.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#70afdb \
 --color=marker:#a670db \
diff --git a/extra/moon-eclipse/fzf-flow-orange.sh b/extra/moon-eclipse/fzf-flow-orange.sh
index a0dce61..df15f79 100644
--- a/extra/moon-eclipse/fzf-flow-orange.sh
+++ b/extra/moon-eclipse/fzf-flow-orange.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#70afdb \
 --color=marker:#a670db \
diff --git a/extra/moon-eclipse/fzf-flow-pink.sh b/extra/moon-eclipse/fzf-flow-pink.sh
index b04e52d..a3cf931 100644
--- a/extra/moon-eclipse/fzf-flow-pink.sh
+++ b/extra/moon-eclipse/fzf-flow-pink.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#70afdb \
 --color=marker:#a670db \
diff --git a/extra/moon-eclipse/fzf-flow-yellow.sh b/extra/moon-eclipse/fzf-flow-yellow.sh
index b646fb5..967b908 100644
--- a/extra/moon-eclipse/fzf-flow-yellow.sh
+++ b/extra/moon-eclipse/fzf-flow-yellow.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#70afdb \
 --color=marker:#a670db \
diff --git a/extra/moon-eclipse/ghostty-flow-cyan.config b/extra/moon-eclipse/ghostty-flow-cyan.config
index ebe69f9..a5f8246 100644
--- a/extra/moon-eclipse/ghostty-flow-cyan.config
+++ b/extra/moon-eclipse/ghostty-flow-cyan.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-eclipse/ghostty-flow-green.config b/extra/moon-eclipse/ghostty-flow-green.config
index 95ac9f4..14a36ad 100644
--- a/extra/moon-eclipse/ghostty-flow-green.config
+++ b/extra/moon-eclipse/ghostty-flow-green.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-eclipse/ghostty-flow-orange.config b/extra/moon-eclipse/ghostty-flow-orange.config
index 38794d9..65ba0d1 100644
--- a/extra/moon-eclipse/ghostty-flow-orange.config
+++ b/extra/moon-eclipse/ghostty-flow-orange.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-eclipse/ghostty-flow-pink.config b/extra/moon-eclipse/ghostty-flow-pink.config
index e213e58..c379f44 100644
--- a/extra/moon-eclipse/ghostty-flow-pink.config
+++ b/extra/moon-eclipse/ghostty-flow-pink.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-eclipse/ghostty-flow-yellow.config b/extra/moon-eclipse/ghostty-flow-yellow.config
index 7cd12a9..96e96d8 100644
--- a/extra/moon-eclipse/ghostty-flow-yellow.config
+++ b/extra/moon-eclipse/ghostty-flow-yellow.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-eclipse/kitty-flow-cyan.conf b/extra/moon-eclipse/kitty-flow-cyan.conf
index 2d7b5ec..b9fa985 100644
--- a/extra/moon-eclipse/kitty-flow-cyan.conf
+++ b/extra/moon-eclipse/kitty-flow-cyan.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #00e1ff 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #70dbc1
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #db7079
 color10 #79db70
 color11 #dbdb70
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #70afdb 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #70afdb
 
 # Borders
 active_border_color #7082db 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-eclipse/kitty-flow-green.conf b/extra/moon-eclipse/kitty-flow-green.conf
index e50a755..f366ffd 100644
--- a/extra/moon-eclipse/kitty-flow-green.conf
+++ b/extra/moon-eclipse/kitty-flow-green.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #15ff00 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #70dbc1
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #db7079
 color10 #79db70
 color11 #dbdb70
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #70afdb 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #70afdb
 
 # Borders
 active_border_color #7082db 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-eclipse/kitty-flow-orange.conf b/extra/moon-eclipse/kitty-flow-orange.conf
index 3f94cf5..69d69fd 100644
--- a/extra/moon-eclipse/kitty-flow-orange.conf
+++ b/extra/moon-eclipse/kitty-flow-orange.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #ff6a00 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #70dbc1
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #db7079
 color10 #79db70
 color11 #dbdb70
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #70afdb 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #70afdb
 
 # Borders
 active_border_color #7082db 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-eclipse/kitty-flow-pink.conf b/extra/moon-eclipse/kitty-flow-pink.conf
index 2b9b725..5b607b2 100644
--- a/extra/moon-eclipse/kitty-flow-pink.conf
+++ b/extra/moon-eclipse/kitty-flow-pink.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #ff007b 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #70dbc1
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #db7079
 color10 #79db70
 color11 #dbdb70
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #70afdb 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #70afdb
 
 # Borders
 active_border_color #7082db 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-eclipse/kitty-flow-yellow.conf b/extra/moon-eclipse/kitty-flow-yellow.conf
index 53fc970..1c8f3e8 100644
--- a/extra/moon-eclipse/kitty-flow-yellow.conf
+++ b/extra/moon-eclipse/kitty-flow-yellow.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #fbff00 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #70dbc1
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #db7079
 color10 #79db70
 color11 #dbdb70
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #70afdb 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #70afdb
 
 # Borders
 active_border_color #7082db 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-eclipse/tmux-flow-cyan.conf b/extra/moon-eclipse/tmux-flow-cyan.conf
index e47fb90..6e8d585 100644
--- a/extra/moon-eclipse/tmux-flow-cyan.conf
+++ b/extra/moon-eclipse/tmux-flow-cyan.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#70afdb] #S #[bg=#475d6b,fg=#70afdb] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#70afdb] %H:%M #[fg=#0d0d0d,bg=#70afdb] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#70afdb] #S #[bg=#1b2328,fg=#70afdb] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#70afdb] %H:%M #[fg=#1b2328,bg=#70afdb] %A %d. %b %Y "
 
 set -g message-command-style fg=#00e1ff
 set -g message-style "fg=#00e1ff, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-eclipse/tmux-flow-green.conf b/extra/moon-eclipse/tmux-flow-green.conf
index 45d55b1..94a2ad3 100644
--- a/extra/moon-eclipse/tmux-flow-green.conf
+++ b/extra/moon-eclipse/tmux-flow-green.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#70afdb] #S #[bg=#475d6b,fg=#70afdb] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#70afdb] %H:%M #[fg=#0d0d0d,bg=#70afdb] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#70afdb] #S #[bg=#1b2328,fg=#70afdb] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#70afdb] %H:%M #[fg=#1b2328,bg=#70afdb] %A %d. %b %Y "
 
 set -g message-command-style fg=#15ff00
 set -g message-style "fg=#15ff00, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-eclipse/tmux-flow-orange.conf b/extra/moon-eclipse/tmux-flow-orange.conf
index 4ab5f57..1a09681 100644
--- a/extra/moon-eclipse/tmux-flow-orange.conf
+++ b/extra/moon-eclipse/tmux-flow-orange.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#70afdb] #S #[bg=#475d6b,fg=#70afdb] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#70afdb] %H:%M #[fg=#0d0d0d,bg=#70afdb] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#70afdb] #S #[bg=#1b2328,fg=#70afdb] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#70afdb] %H:%M #[fg=#1b2328,bg=#70afdb] %A %d. %b %Y "
 
 set -g message-command-style fg=#ff6a00
 set -g message-style "fg=#ff6a00, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-eclipse/tmux-flow-pink.conf b/extra/moon-eclipse/tmux-flow-pink.conf
index 5158597..d885ff5 100644
--- a/extra/moon-eclipse/tmux-flow-pink.conf
+++ b/extra/moon-eclipse/tmux-flow-pink.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#70afdb] #S #[bg=#475d6b,fg=#70afdb] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#70afdb] %H:%M #[fg=#0d0d0d,bg=#70afdb] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#70afdb] #S #[bg=#1b2328,fg=#70afdb] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#70afdb] %H:%M #[fg=#1b2328,bg=#70afdb] %A %d. %b %Y "
 
 set -g message-command-style fg=#ff007b
 set -g message-style "fg=#ff007b, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-eclipse/tmux-flow-yellow.conf b/extra/moon-eclipse/tmux-flow-yellow.conf
index 4905805..aad1f3a 100644
--- a/extra/moon-eclipse/tmux-flow-yellow.conf
+++ b/extra/moon-eclipse/tmux-flow-yellow.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#70afdb] #S #[bg=#475d6b,fg=#70afdb] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#70afdb] %H:%M #[fg=#0d0d0d,bg=#70afdb] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#70afdb] #S #[bg=#1b2328,fg=#70afdb] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#70afdb] %H:%M #[fg=#1b2328,bg=#70afdb] %A %d. %b %Y "
 
 set -g message-command-style fg=#fbff00
 set -g message-style "fg=#fbff00, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-penumbra/alacritty-flow-cyan.toml b/extra/moon-penumbra/alacritty-flow-cyan.toml
index 1ede99e..89fa692 100644
--- a/extra/moon-penumbra/alacritty-flow-cyan.toml
+++ b/extra/moon-penumbra/alacritty-flow-cyan.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-penumbra/alacritty-flow-green.toml b/extra/moon-penumbra/alacritty-flow-green.toml
index b413c20..5e6877e 100644
--- a/extra/moon-penumbra/alacritty-flow-green.toml
+++ b/extra/moon-penumbra/alacritty-flow-green.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-penumbra/alacritty-flow-orange.toml b/extra/moon-penumbra/alacritty-flow-orange.toml
index 200cffa..e5b6225 100644
--- a/extra/moon-penumbra/alacritty-flow-orange.toml
+++ b/extra/moon-penumbra/alacritty-flow-orange.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-penumbra/alacritty-flow-pink.toml b/extra/moon-penumbra/alacritty-flow-pink.toml
index 6a4ab8d..1862dff 100644
--- a/extra/moon-penumbra/alacritty-flow-pink.toml
+++ b/extra/moon-penumbra/alacritty-flow-pink.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-penumbra/alacritty-flow-yellow.toml b/extra/moon-penumbra/alacritty-flow-yellow.toml
index 374d184..b8c0de9 100644
--- a/extra/moon-penumbra/alacritty-flow-yellow.toml
+++ b/extra/moon-penumbra/alacritty-flow-yellow.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-penumbra/fzf-flow-cyan.sh b/extra/moon-penumbra/fzf-flow-cyan.sh
index d5a3081..ce5fb9e 100644
--- a/extra/moon-penumbra/fzf-flow-cyan.sh
+++ b/extra/moon-penumbra/fzf-flow-cyan.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#82acc9 \
 --color=marker:#a682c9 \
diff --git a/extra/moon-penumbra/fzf-flow-green.sh b/extra/moon-penumbra/fzf-flow-green.sh
index 8805cab..52fa1bc 100644
--- a/extra/moon-penumbra/fzf-flow-green.sh
+++ b/extra/moon-penumbra/fzf-flow-green.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#82acc9 \
 --color=marker:#a682c9 \
diff --git a/extra/moon-penumbra/fzf-flow-orange.sh b/extra/moon-penumbra/fzf-flow-orange.sh
index 2e23334..259cfbb 100644
--- a/extra/moon-penumbra/fzf-flow-orange.sh
+++ b/extra/moon-penumbra/fzf-flow-orange.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#82acc9 \
 --color=marker:#a682c9 \
diff --git a/extra/moon-penumbra/fzf-flow-pink.sh b/extra/moon-penumbra/fzf-flow-pink.sh
index 1a447b4..06cf689 100644
--- a/extra/moon-penumbra/fzf-flow-pink.sh
+++ b/extra/moon-penumbra/fzf-flow-pink.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#82acc9 \
 --color=marker:#a682c9 \
diff --git a/extra/moon-penumbra/fzf-flow-yellow.sh b/extra/moon-penumbra/fzf-flow-yellow.sh
index c155c59..017a911 100644
--- a/extra/moon-penumbra/fzf-flow-yellow.sh
+++ b/extra/moon-penumbra/fzf-flow-yellow.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#82acc9 \
 --color=marker:#a682c9 \
diff --git a/extra/moon-penumbra/ghostty-flow-cyan.config b/extra/moon-penumbra/ghostty-flow-cyan.config
index 47d1295..6b3d87d 100644
--- a/extra/moon-penumbra/ghostty-flow-cyan.config
+++ b/extra/moon-penumbra/ghostty-flow-cyan.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-penumbra/ghostty-flow-green.config b/extra/moon-penumbra/ghostty-flow-green.config
index 91234aa..66aabe7 100644
--- a/extra/moon-penumbra/ghostty-flow-green.config
+++ b/extra/moon-penumbra/ghostty-flow-green.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-penumbra/ghostty-flow-orange.config b/extra/moon-penumbra/ghostty-flow-orange.config
index 144de66..c0ec28a 100644
--- a/extra/moon-penumbra/ghostty-flow-orange.config
+++ b/extra/moon-penumbra/ghostty-flow-orange.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-penumbra/ghostty-flow-pink.config b/extra/moon-penumbra/ghostty-flow-pink.config
index e1376f5..66aabca 100644
--- a/extra/moon-penumbra/ghostty-flow-pink.config
+++ b/extra/moon-penumbra/ghostty-flow-pink.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-penumbra/ghostty-flow-yellow.config b/extra/moon-penumbra/ghostty-flow-yellow.config
index f2b6adf..bff19e1 100644
--- a/extra/moon-penumbra/ghostty-flow-yellow.config
+++ b/extra/moon-penumbra/ghostty-flow-yellow.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-penumbra/kitty-flow-cyan.conf b/extra/moon-penumbra/kitty-flow-cyan.conf
index 2967837..8c0c843 100644
--- a/extra/moon-penumbra/kitty-flow-cyan.conf
+++ b/extra/moon-penumbra/kitty-flow-cyan.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #00e1ff 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #82c9b8
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #c98288
 color10 #88c982
 color11 #c9c982
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #82acc9 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #82acc9
 
 # Borders
 active_border_color #828ec9 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-penumbra/kitty-flow-green.conf b/extra/moon-penumbra/kitty-flow-green.conf
index e80b601..5732dfd 100644
--- a/extra/moon-penumbra/kitty-flow-green.conf
+++ b/extra/moon-penumbra/kitty-flow-green.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #15ff00 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #82c9b8
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #c98288
 color10 #88c982
 color11 #c9c982
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #82acc9 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #82acc9
 
 # Borders
 active_border_color #828ec9 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-penumbra/kitty-flow-orange.conf b/extra/moon-penumbra/kitty-flow-orange.conf
index 317f783..2ca88e3 100644
--- a/extra/moon-penumbra/kitty-flow-orange.conf
+++ b/extra/moon-penumbra/kitty-flow-orange.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #ff6a00 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #82c9b8
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #c98288
 color10 #88c982
 color11 #c9c982
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #82acc9 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #82acc9
 
 # Borders
 active_border_color #828ec9 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-penumbra/kitty-flow-pink.conf b/extra/moon-penumbra/kitty-flow-pink.conf
index 9fc7f73..1aa98fa 100644
--- a/extra/moon-penumbra/kitty-flow-pink.conf
+++ b/extra/moon-penumbra/kitty-flow-pink.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #ff007b 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #82c9b8
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #c98288
 color10 #88c982
 color11 #c9c982
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #82acc9 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #82acc9
 
 # Borders
 active_border_color #828ec9 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-penumbra/kitty-flow-yellow.conf b/extra/moon-penumbra/kitty-flow-yellow.conf
index 4ab3f2d..2a9e0c8 100644
--- a/extra/moon-penumbra/kitty-flow-yellow.conf
+++ b/extra/moon-penumbra/kitty-flow-yellow.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #fbff00 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #82c9b8
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #c98288
 color10 #88c982
 color11 #c9c982
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #82acc9 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #82acc9
 
 # Borders
 active_border_color #828ec9 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-penumbra/tmux-flow-cyan.conf b/extra/moon-penumbra/tmux-flow-cyan.conf
index a642f6c..25c5cff 100644
--- a/extra/moon-penumbra/tmux-flow-cyan.conf
+++ b/extra/moon-penumbra/tmux-flow-cyan.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#82acc9] #S #[bg=#475d6b,fg=#82acc9] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#82acc9] %H:%M #[fg=#0d0d0d,bg=#82acc9] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#82acc9] #S #[bg=#1b2328,fg=#82acc9] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#82acc9] %H:%M #[fg=#1b2328,bg=#82acc9] %A %d. %b %Y "
 
 set -g message-command-style fg=#00e1ff
 set -g message-style "fg=#00e1ff, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-penumbra/tmux-flow-green.conf b/extra/moon-penumbra/tmux-flow-green.conf
index 32675bc..c2e603e 100644
--- a/extra/moon-penumbra/tmux-flow-green.conf
+++ b/extra/moon-penumbra/tmux-flow-green.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#82acc9] #S #[bg=#475d6b,fg=#82acc9] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#82acc9] %H:%M #[fg=#0d0d0d,bg=#82acc9] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#82acc9] #S #[bg=#1b2328,fg=#82acc9] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#82acc9] %H:%M #[fg=#1b2328,bg=#82acc9] %A %d. %b %Y "
 
 set -g message-command-style fg=#15ff00
 set -g message-style "fg=#15ff00, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-penumbra/tmux-flow-orange.conf b/extra/moon-penumbra/tmux-flow-orange.conf
index f2757f3..fc743a0 100644
--- a/extra/moon-penumbra/tmux-flow-orange.conf
+++ b/extra/moon-penumbra/tmux-flow-orange.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#82acc9] #S #[bg=#475d6b,fg=#82acc9] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#82acc9] %H:%M #[fg=#0d0d0d,bg=#82acc9] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#82acc9] #S #[bg=#1b2328,fg=#82acc9] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#82acc9] %H:%M #[fg=#1b2328,bg=#82acc9] %A %d. %b %Y "
 
 set -g message-command-style fg=#ff6a00
 set -g message-style "fg=#ff6a00, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-penumbra/tmux-flow-pink.conf b/extra/moon-penumbra/tmux-flow-pink.conf
index 77322b0..af98dc7 100644
--- a/extra/moon-penumbra/tmux-flow-pink.conf
+++ b/extra/moon-penumbra/tmux-flow-pink.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#82acc9] #S #[bg=#475d6b,fg=#82acc9] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#82acc9] %H:%M #[fg=#0d0d0d,bg=#82acc9] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#82acc9] #S #[bg=#1b2328,fg=#82acc9] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#82acc9] %H:%M #[fg=#1b2328,bg=#82acc9] %A %d. %b %Y "
 
 set -g message-command-style fg=#ff007b
 set -g message-style "fg=#ff007b, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-penumbra/tmux-flow-yellow.conf b/extra/moon-penumbra/tmux-flow-yellow.conf
index f31d7ee..6080d81 100644
--- a/extra/moon-penumbra/tmux-flow-yellow.conf
+++ b/extra/moon-penumbra/tmux-flow-yellow.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#82acc9] #S #[bg=#475d6b,fg=#82acc9] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#82acc9] %H:%M #[fg=#0d0d0d,bg=#82acc9] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#82acc9] #S #[bg=#1b2328,fg=#82acc9] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#82acc9] %H:%M #[fg=#1b2328,bg=#82acc9] %A %d. %b %Y "
 
 set -g message-command-style fg=#fbff00
 set -g message-style "fg=#fbff00, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-umbra/alacritty-flow-cyan.toml b/extra/moon-umbra/alacritty-flow-cyan.toml
index 7fcda73..0c80ad3 100644
--- a/extra/moon-umbra/alacritty-flow-cyan.toml
+++ b/extra/moon-umbra/alacritty-flow-cyan.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-umbra/alacritty-flow-green.toml b/extra/moon-umbra/alacritty-flow-green.toml
index 3dca632..3ad9053 100644
--- a/extra/moon-umbra/alacritty-flow-green.toml
+++ b/extra/moon-umbra/alacritty-flow-green.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-umbra/alacritty-flow-orange.toml b/extra/moon-umbra/alacritty-flow-orange.toml
index fc7dc52..5c1d161 100644
--- a/extra/moon-umbra/alacritty-flow-orange.toml
+++ b/extra/moon-umbra/alacritty-flow-orange.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-umbra/alacritty-flow-pink.toml b/extra/moon-umbra/alacritty-flow-pink.toml
index 04489a9..ee8755f 100644
--- a/extra/moon-umbra/alacritty-flow-pink.toml
+++ b/extra/moon-umbra/alacritty-flow-pink.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-umbra/alacritty-flow-yellow.toml b/extra/moon-umbra/alacritty-flow-yellow.toml
index 6fc717f..b6358bd 100644
--- a/extra/moon-umbra/alacritty-flow-yellow.toml
+++ b/extra/moon-umbra/alacritty-flow-yellow.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#1f282e'
-foreground = '#d1dbe0'
+foreground = '#94aab8'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/moon-umbra/fzf-flow-cyan.sh b/extra/moon-umbra/fzf-flow-cyan.sh
index 55d0443..0a390b2 100644
--- a/extra/moon-umbra/fzf-flow-cyan.sh
+++ b/extra/moon-umbra/fzf-flow-cyan.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#2d6186 \
 --color=marker:#592d86 \
diff --git a/extra/moon-umbra/fzf-flow-green.sh b/extra/moon-umbra/fzf-flow-green.sh
index 1b49a29..975c0e2 100644
--- a/extra/moon-umbra/fzf-flow-green.sh
+++ b/extra/moon-umbra/fzf-flow-green.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#2d6186 \
 --color=marker:#592d86 \
diff --git a/extra/moon-umbra/fzf-flow-orange.sh b/extra/moon-umbra/fzf-flow-orange.sh
index 3f73d85..134d7e5 100644
--- a/extra/moon-umbra/fzf-flow-orange.sh
+++ b/extra/moon-umbra/fzf-flow-orange.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#2d6186 \
 --color=marker:#592d86 \
diff --git a/extra/moon-umbra/fzf-flow-pink.sh b/extra/moon-umbra/fzf-flow-pink.sh
index 0614112..dc27f15 100644
--- a/extra/moon-umbra/fzf-flow-pink.sh
+++ b/extra/moon-umbra/fzf-flow-pink.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#2d6186 \
 --color=marker:#592d86 \
diff --git a/extra/moon-umbra/fzf-flow-yellow.sh b/extra/moon-umbra/fzf-flow-yellow.sh
index 2e3b37b..a038bd1 100644
--- a/extra/moon-umbra/fzf-flow-yellow.sh
+++ b/extra/moon-umbra/fzf-flow-yellow.sh
@@ -6,10 +6,10 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#1b2328 \
---color=fg:#d1dbe0 \
---color=fg+:#d1dbe0 \
---color=hl:#3d505c \
---color=hl+:#3d505c \
+--color=fg:#94aab8 \
+--color=fg+:#94aab8 \
+--color=hl:#668599 \
+--color=hl+:#668599 \
 --color=border:#1f282e \
 --color=info:#2d6186 \
 --color=marker:#592d86 \
diff --git a/extra/moon-umbra/ghostty-flow-cyan.config b/extra/moon-umbra/ghostty-flow-cyan.config
index 806a764..432da71 100644
--- a/extra/moon-umbra/ghostty-flow-cyan.config
+++ b/extra/moon-umbra/ghostty-flow-cyan.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-umbra/ghostty-flow-green.config b/extra/moon-umbra/ghostty-flow-green.config
index 003a072..4f607b8 100644
--- a/extra/moon-umbra/ghostty-flow-green.config
+++ b/extra/moon-umbra/ghostty-flow-green.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-umbra/ghostty-flow-orange.config b/extra/moon-umbra/ghostty-flow-orange.config
index 93ef585..1f26044 100644
--- a/extra/moon-umbra/ghostty-flow-orange.config
+++ b/extra/moon-umbra/ghostty-flow-orange.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-umbra/ghostty-flow-pink.config b/extra/moon-umbra/ghostty-flow-pink.config
index 8946f49..e9eb697 100644
--- a/extra/moon-umbra/ghostty-flow-pink.config
+++ b/extra/moon-umbra/ghostty-flow-pink.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-umbra/ghostty-flow-yellow.config b/extra/moon-umbra/ghostty-flow-yellow.config
index 5a36f45..86fe049 100644
--- a/extra/moon-umbra/ghostty-flow-yellow.config
+++ b/extra/moon-umbra/ghostty-flow-yellow.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #1f282e
-foreground = #d1dbe0
+foreground = #94aab8
 # black
 palette = 0=#0d0d0d
 palette = 8=#0d0d0d
diff --git a/extra/moon-umbra/kitty-flow-cyan.conf b/extra/moon-umbra/kitty-flow-cyan.conf
index 877966f..ffc402e 100644
--- a/extra/moon-umbra/kitty-flow-cyan.conf
+++ b/extra/moon-umbra/kitty-flow-cyan.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #00e1ff 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #2d8670
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #862d34
 color10 #34862d
 color11 #86862d
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #2d6186 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #2d6186
 
 # Borders
 active_border_color #2d3c86 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-umbra/kitty-flow-green.conf b/extra/moon-umbra/kitty-flow-green.conf
index 0d4989c..956665a 100644
--- a/extra/moon-umbra/kitty-flow-green.conf
+++ b/extra/moon-umbra/kitty-flow-green.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #15ff00 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #2d8670
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #862d34
 color10 #34862d
 color11 #86862d
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #2d6186 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #2d6186
 
 # Borders
 active_border_color #2d3c86 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-umbra/kitty-flow-orange.conf b/extra/moon-umbra/kitty-flow-orange.conf
index c78ac05..46a0a94 100644
--- a/extra/moon-umbra/kitty-flow-orange.conf
+++ b/extra/moon-umbra/kitty-flow-orange.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #ff6a00 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #2d8670
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #862d34
 color10 #34862d
 color11 #86862d
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #2d6186 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #2d6186
 
 # Borders
 active_border_color #2d3c86 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-umbra/kitty-flow-pink.conf b/extra/moon-umbra/kitty-flow-pink.conf
index 0d544b4..d91dccb 100644
--- a/extra/moon-umbra/kitty-flow-pink.conf
+++ b/extra/moon-umbra/kitty-flow-pink.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #ff007b 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #2d8670
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #862d34
 color10 #34862d
 color11 #86862d
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #2d6186 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #2d6186
 
 # Borders
 active_border_color #2d3c86 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-umbra/kitty-flow-yellow.conf b/extra/moon-umbra/kitty-flow-yellow.conf
index 0157ea9..37b2ab7 100644
--- a/extra/moon-umbra/kitty-flow-yellow.conf
+++ b/extra/moon-umbra/kitty-flow-yellow.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #1f282e
-foreground #d1dbe0
+foreground #94aab8
 selection_foreground #fbff00 
 selection_background #0d0d0d 
 
@@ -18,7 +18,7 @@ color6 #2d8670
 color7 #f2f2f2
 
 # Bright colors
-color8 #3d505c
+color8 #3b4d59
 color9 #862d34
 color10 #34862d
 color11 #86862d
@@ -37,9 +37,9 @@ cursor_text_color #0d0d0d
 # Tabs
 active_tab_background #2d6186 
 active_tab_foreground #0d0d0d
-inactive_tab_background #3d505c
+inactive_tab_background #3b4d59
 inactive_tab_foreground #2d6186
 
 # Borders
 active_border_color #2d3c86 
-inactive_border_color #3d505c
+inactive_border_color #3b4d59
diff --git a/extra/moon-umbra/tmux-flow-cyan.conf b/extra/moon-umbra/tmux-flow-cyan.conf
index bd09fd7..5346659 100644
--- a/extra/moon-umbra/tmux-flow-cyan.conf
+++ b/extra/moon-umbra/tmux-flow-cyan.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#2d6186] #S #[bg=#475d6b,fg=#2d6186] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#2d6186] %H:%M #[fg=#0d0d0d,bg=#2d6186] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#2d6186] #S #[bg=#1b2328,fg=#2d6186] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#2d6186] %H:%M #[fg=#1b2328,bg=#2d6186] %A %d. %b %Y "
 
 set -g message-command-style fg=#00e1ff
 set -g message-style "fg=#00e1ff, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-umbra/tmux-flow-green.conf b/extra/moon-umbra/tmux-flow-green.conf
index 248fa4b..60ee146 100644
--- a/extra/moon-umbra/tmux-flow-green.conf
+++ b/extra/moon-umbra/tmux-flow-green.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#2d6186] #S #[bg=#475d6b,fg=#2d6186] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#2d6186] %H:%M #[fg=#0d0d0d,bg=#2d6186] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#2d6186] #S #[bg=#1b2328,fg=#2d6186] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#2d6186] %H:%M #[fg=#1b2328,bg=#2d6186] %A %d. %b %Y "
 
 set -g message-command-style fg=#15ff00
 set -g message-style "fg=#15ff00, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-umbra/tmux-flow-orange.conf b/extra/moon-umbra/tmux-flow-orange.conf
index d7cd400..be8fa19 100644
--- a/extra/moon-umbra/tmux-flow-orange.conf
+++ b/extra/moon-umbra/tmux-flow-orange.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#2d6186] #S #[bg=#475d6b,fg=#2d6186] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#2d6186] %H:%M #[fg=#0d0d0d,bg=#2d6186] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#2d6186] #S #[bg=#1b2328,fg=#2d6186] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#2d6186] %H:%M #[fg=#1b2328,bg=#2d6186] %A %d. %b %Y "
 
 set -g message-command-style fg=#ff6a00
 set -g message-style "fg=#ff6a00, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-umbra/tmux-flow-pink.conf b/extra/moon-umbra/tmux-flow-pink.conf
index 373fa66..f4bf62c 100644
--- a/extra/moon-umbra/tmux-flow-pink.conf
+++ b/extra/moon-umbra/tmux-flow-pink.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#2d6186] #S #[bg=#475d6b,fg=#2d6186] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#2d6186] %H:%M #[fg=#0d0d0d,bg=#2d6186] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#2d6186] #S #[bg=#1b2328,fg=#2d6186] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#2d6186] %H:%M #[fg=#1b2328,bg=#2d6186] %A %d. %b %Y "
 
 set -g message-command-style fg=#ff007b
 set -g message-style "fg=#ff007b, bg=#141b1f" # color used in the message popup.
diff --git a/extra/moon-umbra/tmux-flow-yellow.conf b/extra/moon-umbra/tmux-flow-yellow.conf
index 2129f60..68e4f21 100644
--- a/extra/moon-umbra/tmux-flow-yellow.conf
+++ b/extra/moon-umbra/tmux-flow-yellow.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#141b1f,fg=#3d505c
-set -g window-status-style fg=#3d505c,bg=#141b1f
+set -g status-style bg=#141b1f,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#141b1f
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#0d0d0d,bg=#2d6186] #S #[bg=#475d6b,fg=#2d6186] #h #[bg=#141b1f] "
-set -g status-right "#[bg=#475d6b,fg=#2d6186] %H:%M #[fg=#0d0d0d,bg=#2d6186] %A %d. %b %Y "
+set -g status-left "#[fg=#1b2328,bg=#2d6186] #S #[bg=#1b2328,fg=#2d6186] #h #[bg=#141b1f] "
+set -g status-right "#[bg=#1b2328,fg=#2d6186] %H:%M #[fg=#1b2328,bg=#2d6186] %A %d. %b %Y "
 
 set -g message-command-style fg=#fbff00
 set -g message-style "fg=#fbff00, bg=#141b1f" # color used in the message popup.
diff --git a/extra/sun-eclipse/alacritty-flow-cyan.toml b/extra/sun-eclipse/alacritty-flow-cyan.toml
index 6f1145a..af5c902 100644
--- a/extra/sun-eclipse/alacritty-flow-cyan.toml
+++ b/extra/sun-eclipse/alacritty-flow-cyan.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-eclipse/alacritty-flow-green.toml b/extra/sun-eclipse/alacritty-flow-green.toml
index baba348..13b4b04 100644
--- a/extra/sun-eclipse/alacritty-flow-green.toml
+++ b/extra/sun-eclipse/alacritty-flow-green.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-eclipse/alacritty-flow-orange.toml b/extra/sun-eclipse/alacritty-flow-orange.toml
index 30bb010..ebb80d5 100644
--- a/extra/sun-eclipse/alacritty-flow-orange.toml
+++ b/extra/sun-eclipse/alacritty-flow-orange.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-eclipse/alacritty-flow-pink.toml b/extra/sun-eclipse/alacritty-flow-pink.toml
index ddd707d..a066782 100644
--- a/extra/sun-eclipse/alacritty-flow-pink.toml
+++ b/extra/sun-eclipse/alacritty-flow-pink.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-eclipse/alacritty-flow-yellow.toml b/extra/sun-eclipse/alacritty-flow-yellow.toml
index 14dbb82..190ff36 100644
--- a/extra/sun-eclipse/alacritty-flow-yellow.toml
+++ b/extra/sun-eclipse/alacritty-flow-yellow.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-eclipse/fzf-flow-cyan.sh b/extra/sun-eclipse/fzf-flow-cyan.sh
index b300713..d869cd6 100644
--- a/extra/sun-eclipse/fzf-flow-cyan.sh
+++ b/extra/sun-eclipse/fzf-flow-cyan.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-eclipse/fzf-flow-green.sh b/extra/sun-eclipse/fzf-flow-green.sh
index 2f158fa..ed289d7 100644
--- a/extra/sun-eclipse/fzf-flow-green.sh
+++ b/extra/sun-eclipse/fzf-flow-green.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-eclipse/fzf-flow-orange.sh b/extra/sun-eclipse/fzf-flow-orange.sh
index 768fc54..16259e9 100644
--- a/extra/sun-eclipse/fzf-flow-orange.sh
+++ b/extra/sun-eclipse/fzf-flow-orange.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-eclipse/fzf-flow-pink.sh b/extra/sun-eclipse/fzf-flow-pink.sh
index 6a573d0..b4ec0c9 100644
--- a/extra/sun-eclipse/fzf-flow-pink.sh
+++ b/extra/sun-eclipse/fzf-flow-pink.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-eclipse/fzf-flow-yellow.sh b/extra/sun-eclipse/fzf-flow-yellow.sh
index 4453638..bea78fd 100644
--- a/extra/sun-eclipse/fzf-flow-yellow.sh
+++ b/extra/sun-eclipse/fzf-flow-yellow.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-eclipse/ghostty-flow-cyan.config b/extra/sun-eclipse/ghostty-flow-cyan.config
index 02cb9f9..c8d5818 100644
--- a/extra/sun-eclipse/ghostty-flow-cyan.config
+++ b/extra/sun-eclipse/ghostty-flow-cyan.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-eclipse/ghostty-flow-green.config b/extra/sun-eclipse/ghostty-flow-green.config
index 5d64f8d..d911936 100644
--- a/extra/sun-eclipse/ghostty-flow-green.config
+++ b/extra/sun-eclipse/ghostty-flow-green.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-eclipse/ghostty-flow-orange.config b/extra/sun-eclipse/ghostty-flow-orange.config
index be5983a..b491bae 100644
--- a/extra/sun-eclipse/ghostty-flow-orange.config
+++ b/extra/sun-eclipse/ghostty-flow-orange.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-eclipse/ghostty-flow-pink.config b/extra/sun-eclipse/ghostty-flow-pink.config
index f5bf9de..171d599 100644
--- a/extra/sun-eclipse/ghostty-flow-pink.config
+++ b/extra/sun-eclipse/ghostty-flow-pink.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-eclipse/ghostty-flow-yellow.config b/extra/sun-eclipse/ghostty-flow-yellow.config
index b33b194..565f324 100644
--- a/extra/sun-eclipse/ghostty-flow-yellow.config
+++ b/extra/sun-eclipse/ghostty-flow-yellow.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-eclipse/kitty-flow-cyan.conf b/extra/sun-eclipse/kitty-flow-cyan.conf
index 2e73450..d367e29 100644
--- a/extra/sun-eclipse/kitty-flow-cyan.conf
+++ b/extra/sun-eclipse/kitty-flow-cyan.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #00e1ff 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #5ebaa3
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #ba5e66
 color10 #66ba5e
 color11 #baba5e
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #5e94ba 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #5e94ba
 
 # Borders
 active_border_color #5e6eba 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-eclipse/kitty-flow-green.conf b/extra/sun-eclipse/kitty-flow-green.conf
index 98716c3..4260326 100644
--- a/extra/sun-eclipse/kitty-flow-green.conf
+++ b/extra/sun-eclipse/kitty-flow-green.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #15ff00 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #5ebaa3
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #ba5e66
 color10 #66ba5e
 color11 #baba5e
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #5e94ba 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #5e94ba
 
 # Borders
 active_border_color #5e6eba 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-eclipse/kitty-flow-orange.conf b/extra/sun-eclipse/kitty-flow-orange.conf
index 17fa2c2..adfd4f2 100644
--- a/extra/sun-eclipse/kitty-flow-orange.conf
+++ b/extra/sun-eclipse/kitty-flow-orange.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #ff6a00 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #5ebaa3
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #ba5e66
 color10 #66ba5e
 color11 #baba5e
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #5e94ba 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #5e94ba
 
 # Borders
 active_border_color #5e6eba 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-eclipse/kitty-flow-pink.conf b/extra/sun-eclipse/kitty-flow-pink.conf
index 7b07904..413582e 100644
--- a/extra/sun-eclipse/kitty-flow-pink.conf
+++ b/extra/sun-eclipse/kitty-flow-pink.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #ff007b 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #5ebaa3
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #ba5e66
 color10 #66ba5e
 color11 #baba5e
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #5e94ba 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #5e94ba
 
 # Borders
 active_border_color #5e6eba 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-eclipse/kitty-flow-yellow.conf b/extra/sun-eclipse/kitty-flow-yellow.conf
index 6a1a5d0..474135f 100644
--- a/extra/sun-eclipse/kitty-flow-yellow.conf
+++ b/extra/sun-eclipse/kitty-flow-yellow.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #fbff00 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #5ebaa3
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #ba5e66
 color10 #66ba5e
 color11 #baba5e
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #5e94ba 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #5e94ba
 
 # Borders
 active_border_color #5e6eba 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-eclipse/tmux-flow-cyan.conf b/extra/sun-eclipse/tmux-flow-cyan.conf
index 2aa7533..2195fa2 100644
--- a/extra/sun-eclipse/tmux-flow-cyan.conf
+++ b/extra/sun-eclipse/tmux-flow-cyan.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#5e94ba] #S #[bg=#475d6b,fg=#5e94ba] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#5e94ba] %H:%M #[fg=#f2f2f2,bg=#5e94ba] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#5e94ba] #S #[bg=#dae2e7,fg=#5e94ba] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#5e94ba] %H:%M #[fg=#dae2e7,bg=#5e94ba] %A %d. %b %Y "
 
 set -g message-command-style fg=#00e1ff
 set -g message-style "fg=#00e1ff, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-eclipse/tmux-flow-green.conf b/extra/sun-eclipse/tmux-flow-green.conf
index 3faed2b..e595d97 100644
--- a/extra/sun-eclipse/tmux-flow-green.conf
+++ b/extra/sun-eclipse/tmux-flow-green.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#5e94ba] #S #[bg=#475d6b,fg=#5e94ba] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#5e94ba] %H:%M #[fg=#f2f2f2,bg=#5e94ba] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#5e94ba] #S #[bg=#dae2e7,fg=#5e94ba] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#5e94ba] %H:%M #[fg=#dae2e7,bg=#5e94ba] %A %d. %b %Y "
 
 set -g message-command-style fg=#15ff00
 set -g message-style "fg=#15ff00, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-eclipse/tmux-flow-orange.conf b/extra/sun-eclipse/tmux-flow-orange.conf
index 6d0ba53..77ef90c 100644
--- a/extra/sun-eclipse/tmux-flow-orange.conf
+++ b/extra/sun-eclipse/tmux-flow-orange.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#5e94ba] #S #[bg=#475d6b,fg=#5e94ba] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#5e94ba] %H:%M #[fg=#f2f2f2,bg=#5e94ba] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#5e94ba] #S #[bg=#dae2e7,fg=#5e94ba] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#5e94ba] %H:%M #[fg=#dae2e7,bg=#5e94ba] %A %d. %b %Y "
 
 set -g message-command-style fg=#ff6a00
 set -g message-style "fg=#ff6a00, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-eclipse/tmux-flow-pink.conf b/extra/sun-eclipse/tmux-flow-pink.conf
index 2b16636..c0b586b 100644
--- a/extra/sun-eclipse/tmux-flow-pink.conf
+++ b/extra/sun-eclipse/tmux-flow-pink.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#5e94ba] #S #[bg=#475d6b,fg=#5e94ba] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#5e94ba] %H:%M #[fg=#f2f2f2,bg=#5e94ba] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#5e94ba] #S #[bg=#dae2e7,fg=#5e94ba] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#5e94ba] %H:%M #[fg=#dae2e7,bg=#5e94ba] %A %d. %b %Y "
 
 set -g message-command-style fg=#ff007b
 set -g message-style "fg=#ff007b, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-eclipse/tmux-flow-yellow.conf b/extra/sun-eclipse/tmux-flow-yellow.conf
index 7883941..2f01e70 100644
--- a/extra/sun-eclipse/tmux-flow-yellow.conf
+++ b/extra/sun-eclipse/tmux-flow-yellow.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#5e94ba] #S #[bg=#475d6b,fg=#5e94ba] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#5e94ba] %H:%M #[fg=#f2f2f2,bg=#5e94ba] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#5e94ba] #S #[bg=#dae2e7,fg=#5e94ba] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#5e94ba] %H:%M #[fg=#dae2e7,bg=#5e94ba] %A %d. %b %Y "
 
 set -g message-command-style fg=#fbff00
 set -g message-style "fg=#fbff00, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-penumbra/alacritty-flow-cyan.toml b/extra/sun-penumbra/alacritty-flow-cyan.toml
index 911bc0c..e87586d 100644
--- a/extra/sun-penumbra/alacritty-flow-cyan.toml
+++ b/extra/sun-penumbra/alacritty-flow-cyan.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-penumbra/alacritty-flow-green.toml b/extra/sun-penumbra/alacritty-flow-green.toml
index 962fa1b..d7c69c6 100644
--- a/extra/sun-penumbra/alacritty-flow-green.toml
+++ b/extra/sun-penumbra/alacritty-flow-green.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-penumbra/alacritty-flow-orange.toml b/extra/sun-penumbra/alacritty-flow-orange.toml
index b1ac9ef..7a3d365 100644
--- a/extra/sun-penumbra/alacritty-flow-orange.toml
+++ b/extra/sun-penumbra/alacritty-flow-orange.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-penumbra/alacritty-flow-pink.toml b/extra/sun-penumbra/alacritty-flow-pink.toml
index 197c8ef..101bc69 100644
--- a/extra/sun-penumbra/alacritty-flow-pink.toml
+++ b/extra/sun-penumbra/alacritty-flow-pink.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-penumbra/alacritty-flow-yellow.toml b/extra/sun-penumbra/alacritty-flow-yellow.toml
index 36b8ce0..569542e 100644
--- a/extra/sun-penumbra/alacritty-flow-yellow.toml
+++ b/extra/sun-penumbra/alacritty-flow-yellow.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-penumbra/fzf-flow-cyan.sh b/extra/sun-penumbra/fzf-flow-cyan.sh
index c763adb..c00cf9e 100644
--- a/extra/sun-penumbra/fzf-flow-cyan.sh
+++ b/extra/sun-penumbra/fzf-flow-cyan.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-penumbra/fzf-flow-green.sh b/extra/sun-penumbra/fzf-flow-green.sh
index d6f78db..026669f 100644
--- a/extra/sun-penumbra/fzf-flow-green.sh
+++ b/extra/sun-penumbra/fzf-flow-green.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-penumbra/fzf-flow-orange.sh b/extra/sun-penumbra/fzf-flow-orange.sh
index 1a0adc0..f1d3ccf 100644
--- a/extra/sun-penumbra/fzf-flow-orange.sh
+++ b/extra/sun-penumbra/fzf-flow-orange.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-penumbra/fzf-flow-pink.sh b/extra/sun-penumbra/fzf-flow-pink.sh
index 2d040fc..7a15b4b 100644
--- a/extra/sun-penumbra/fzf-flow-pink.sh
+++ b/extra/sun-penumbra/fzf-flow-pink.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-penumbra/fzf-flow-yellow.sh b/extra/sun-penumbra/fzf-flow-yellow.sh
index b6c34f0..886e307 100644
--- a/extra/sun-penumbra/fzf-flow-yellow.sh
+++ b/extra/sun-penumbra/fzf-flow-yellow.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-penumbra/ghostty-flow-cyan.config b/extra/sun-penumbra/ghostty-flow-cyan.config
index 4ca882e..38114f2 100644
--- a/extra/sun-penumbra/ghostty-flow-cyan.config
+++ b/extra/sun-penumbra/ghostty-flow-cyan.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-penumbra/ghostty-flow-green.config b/extra/sun-penumbra/ghostty-flow-green.config
index 43bb3e7..958d657 100644
--- a/extra/sun-penumbra/ghostty-flow-green.config
+++ b/extra/sun-penumbra/ghostty-flow-green.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-penumbra/ghostty-flow-orange.config b/extra/sun-penumbra/ghostty-flow-orange.config
index cee921e..ab76108 100644
--- a/extra/sun-penumbra/ghostty-flow-orange.config
+++ b/extra/sun-penumbra/ghostty-flow-orange.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-penumbra/ghostty-flow-pink.config b/extra/sun-penumbra/ghostty-flow-pink.config
index ef1539f..8fe0af4 100644
--- a/extra/sun-penumbra/ghostty-flow-pink.config
+++ b/extra/sun-penumbra/ghostty-flow-pink.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-penumbra/ghostty-flow-yellow.config b/extra/sun-penumbra/ghostty-flow-yellow.config
index b4a2ea3..0ccca1f 100644
--- a/extra/sun-penumbra/ghostty-flow-yellow.config
+++ b/extra/sun-penumbra/ghostty-flow-yellow.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-penumbra/kitty-flow-cyan.conf b/extra/sun-penumbra/kitty-flow-cyan.conf
index 95e7a60..08ce3d0 100644
--- a/extra/sun-penumbra/kitty-flow-cyan.conf
+++ b/extra/sun-penumbra/kitty-flow-cyan.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #00e1ff 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #82c9b8
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #c98288
 color10 #88c982
 color11 #c9c982
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #82acc9 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #82acc9
 
 # Borders
 active_border_color #828ec9 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-penumbra/kitty-flow-green.conf b/extra/sun-penumbra/kitty-flow-green.conf
index 67190dd..17f4a82 100644
--- a/extra/sun-penumbra/kitty-flow-green.conf
+++ b/extra/sun-penumbra/kitty-flow-green.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #15ff00 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #82c9b8
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #c98288
 color10 #88c982
 color11 #c9c982
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #82acc9 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #82acc9
 
 # Borders
 active_border_color #828ec9 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-penumbra/kitty-flow-orange.conf b/extra/sun-penumbra/kitty-flow-orange.conf
index a9d8e35..2fd5bfd 100644
--- a/extra/sun-penumbra/kitty-flow-orange.conf
+++ b/extra/sun-penumbra/kitty-flow-orange.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #ff6a00 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #82c9b8
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #c98288
 color10 #88c982
 color11 #c9c982
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #82acc9 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #82acc9
 
 # Borders
 active_border_color #828ec9 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-penumbra/kitty-flow-pink.conf b/extra/sun-penumbra/kitty-flow-pink.conf
index d788ae3..ccd67d1 100644
--- a/extra/sun-penumbra/kitty-flow-pink.conf
+++ b/extra/sun-penumbra/kitty-flow-pink.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #ff007b 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #82c9b8
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #c98288
 color10 #88c982
 color11 #c9c982
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #82acc9 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #82acc9
 
 # Borders
 active_border_color #828ec9 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-penumbra/kitty-flow-yellow.conf b/extra/sun-penumbra/kitty-flow-yellow.conf
index ba345c0..664bebb 100644
--- a/extra/sun-penumbra/kitty-flow-yellow.conf
+++ b/extra/sun-penumbra/kitty-flow-yellow.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #fbff00 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #82c9b8
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #c98288
 color10 #88c982
 color11 #c9c982
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #82acc9 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #82acc9
 
 # Borders
 active_border_color #828ec9 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-penumbra/tmux-flow-cyan.conf b/extra/sun-penumbra/tmux-flow-cyan.conf
index 9d0a0f1..216b7d6 100644
--- a/extra/sun-penumbra/tmux-flow-cyan.conf
+++ b/extra/sun-penumbra/tmux-flow-cyan.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#82acc9] #S #[bg=#475d6b,fg=#82acc9] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#82acc9] %H:%M #[fg=#f2f2f2,bg=#82acc9] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#82acc9] #S #[bg=#dae2e7,fg=#82acc9] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#82acc9] %H:%M #[fg=#dae2e7,bg=#82acc9] %A %d. %b %Y "
 
 set -g message-command-style fg=#00e1ff
 set -g message-style "fg=#00e1ff, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-penumbra/tmux-flow-green.conf b/extra/sun-penumbra/tmux-flow-green.conf
index aef48f6..f35f96e 100644
--- a/extra/sun-penumbra/tmux-flow-green.conf
+++ b/extra/sun-penumbra/tmux-flow-green.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#82acc9] #S #[bg=#475d6b,fg=#82acc9] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#82acc9] %H:%M #[fg=#f2f2f2,bg=#82acc9] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#82acc9] #S #[bg=#dae2e7,fg=#82acc9] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#82acc9] %H:%M #[fg=#dae2e7,bg=#82acc9] %A %d. %b %Y "
 
 set -g message-command-style fg=#15ff00
 set -g message-style "fg=#15ff00, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-penumbra/tmux-flow-orange.conf b/extra/sun-penumbra/tmux-flow-orange.conf
index e613d1c..0b074d6 100644
--- a/extra/sun-penumbra/tmux-flow-orange.conf
+++ b/extra/sun-penumbra/tmux-flow-orange.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#82acc9] #S #[bg=#475d6b,fg=#82acc9] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#82acc9] %H:%M #[fg=#f2f2f2,bg=#82acc9] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#82acc9] #S #[bg=#dae2e7,fg=#82acc9] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#82acc9] %H:%M #[fg=#dae2e7,bg=#82acc9] %A %d. %b %Y "
 
 set -g message-command-style fg=#ff6a00
 set -g message-style "fg=#ff6a00, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-penumbra/tmux-flow-pink.conf b/extra/sun-penumbra/tmux-flow-pink.conf
index c5376f7..c3a751b 100644
--- a/extra/sun-penumbra/tmux-flow-pink.conf
+++ b/extra/sun-penumbra/tmux-flow-pink.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#82acc9] #S #[bg=#475d6b,fg=#82acc9] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#82acc9] %H:%M #[fg=#f2f2f2,bg=#82acc9] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#82acc9] #S #[bg=#dae2e7,fg=#82acc9] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#82acc9] %H:%M #[fg=#dae2e7,bg=#82acc9] %A %d. %b %Y "
 
 set -g message-command-style fg=#ff007b
 set -g message-style "fg=#ff007b, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-penumbra/tmux-flow-yellow.conf b/extra/sun-penumbra/tmux-flow-yellow.conf
index 0b4a2fb..2499e20 100644
--- a/extra/sun-penumbra/tmux-flow-yellow.conf
+++ b/extra/sun-penumbra/tmux-flow-yellow.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#82acc9] #S #[bg=#475d6b,fg=#82acc9] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#82acc9] %H:%M #[fg=#f2f2f2,bg=#82acc9] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#82acc9] #S #[bg=#dae2e7,fg=#82acc9] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#82acc9] %H:%M #[fg=#dae2e7,bg=#82acc9] %A %d. %b %Y "
 
 set -g message-command-style fg=#fbff00
 set -g message-style "fg=#fbff00, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-umbra/alacritty-flow-cyan.toml b/extra/sun-umbra/alacritty-flow-cyan.toml
index 97474f5..c0bdbe0 100644
--- a/extra/sun-umbra/alacritty-flow-cyan.toml
+++ b/extra/sun-umbra/alacritty-flow-cyan.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-umbra/alacritty-flow-green.toml b/extra/sun-umbra/alacritty-flow-green.toml
index c35bc8b..da21f10 100644
--- a/extra/sun-umbra/alacritty-flow-green.toml
+++ b/extra/sun-umbra/alacritty-flow-green.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-umbra/alacritty-flow-orange.toml b/extra/sun-umbra/alacritty-flow-orange.toml
index b87d1ec..4668101 100644
--- a/extra/sun-umbra/alacritty-flow-orange.toml
+++ b/extra/sun-umbra/alacritty-flow-orange.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-umbra/alacritty-flow-pink.toml b/extra/sun-umbra/alacritty-flow-pink.toml
index cfc955c..d9db892 100644
--- a/extra/sun-umbra/alacritty-flow-pink.toml
+++ b/extra/sun-umbra/alacritty-flow-pink.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-umbra/alacritty-flow-yellow.toml b/extra/sun-umbra/alacritty-flow-yellow.toml
index b46b59a..e3a6eb5 100644
--- a/extra/sun-umbra/alacritty-flow-yellow.toml
+++ b/extra/sun-umbra/alacritty-flow-yellow.toml
@@ -4,7 +4,7 @@
 # Black and white
 [colors.primary]
 background = '#d1dbe0'
-foreground = '#3d505c'
+foreground = '#282f33'
 
 # Normal colors
 [colors.normal]
diff --git a/extra/sun-umbra/fzf-flow-cyan.sh b/extra/sun-umbra/fzf-flow-cyan.sh
index beaea12..23959b0 100644
--- a/extra/sun-umbra/fzf-flow-cyan.sh
+++ b/extra/sun-umbra/fzf-flow-cyan.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-umbra/fzf-flow-green.sh b/extra/sun-umbra/fzf-flow-green.sh
index 62464b4..dbc08b6 100644
--- a/extra/sun-umbra/fzf-flow-green.sh
+++ b/extra/sun-umbra/fzf-flow-green.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-umbra/fzf-flow-orange.sh b/extra/sun-umbra/fzf-flow-orange.sh
index d501d58..98e6164 100644
--- a/extra/sun-umbra/fzf-flow-orange.sh
+++ b/extra/sun-umbra/fzf-flow-orange.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-umbra/fzf-flow-pink.sh b/extra/sun-umbra/fzf-flow-pink.sh
index d2f5b40..1a415f7 100644
--- a/extra/sun-umbra/fzf-flow-pink.sh
+++ b/extra/sun-umbra/fzf-flow-pink.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-umbra/fzf-flow-yellow.sh b/extra/sun-umbra/fzf-flow-yellow.sh
index 3c86d13..0a5e0ff 100644
--- a/extra/sun-umbra/fzf-flow-yellow.sh
+++ b/extra/sun-umbra/fzf-flow-yellow.sh
@@ -6,8 +6,8 @@ export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS \
 --height 40% \
 --layout=reverse \
 --color=bg+:#dae2e7 \
---color=fg:#3d505c \
---color=fg+:#3d505c \
+--color=fg:#282f33 \
+--color=fg+:#282f33 \
 --color=hl:#94aab8 \
 --color=hl+:#94aab8 \
 --color=border:#d1dbe0 \
diff --git a/extra/sun-umbra/ghostty-flow-cyan.config b/extra/sun-umbra/ghostty-flow-cyan.config
index 3a45fb6..1459de1 100644
--- a/extra/sun-umbra/ghostty-flow-cyan.config
+++ b/extra/sun-umbra/ghostty-flow-cyan.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-umbra/ghostty-flow-green.config b/extra/sun-umbra/ghostty-flow-green.config
index 870650d..68e10cf 100644
--- a/extra/sun-umbra/ghostty-flow-green.config
+++ b/extra/sun-umbra/ghostty-flow-green.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-umbra/ghostty-flow-orange.config b/extra/sun-umbra/ghostty-flow-orange.config
index a51a511..4862297 100644
--- a/extra/sun-umbra/ghostty-flow-orange.config
+++ b/extra/sun-umbra/ghostty-flow-orange.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-umbra/ghostty-flow-pink.config b/extra/sun-umbra/ghostty-flow-pink.config
index d1c276c..bea69b7 100644
--- a/extra/sun-umbra/ghostty-flow-pink.config
+++ b/extra/sun-umbra/ghostty-flow-pink.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-umbra/ghostty-flow-yellow.config b/extra/sun-umbra/ghostty-flow-yellow.config
index 0edb34a..fcf6a48 100644
--- a/extra/sun-umbra/ghostty-flow-yellow.config
+++ b/extra/sun-umbra/ghostty-flow-yellow.config
@@ -2,7 +2,7 @@
 # https://github.com/0xstepit/flow.nvim
 
 background = #d1dbe0
-foreground = #3d505c
+foreground = #282f33
 # black
 palette = 0=#f2f2f2
 palette = 8=#f2f2f2
diff --git a/extra/sun-umbra/kitty-flow-cyan.conf b/extra/sun-umbra/kitty-flow-cyan.conf
index d086c44..118ca9e 100644
--- a/extra/sun-umbra/kitty-flow-cyan.conf
+++ b/extra/sun-umbra/kitty-flow-cyan.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #00e1ff 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #2d8670
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #862d34
 color10 #34862d
 color11 #86862d
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #2d6186 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #2d6186
 
 # Borders
 active_border_color #2d3c86 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-umbra/kitty-flow-green.conf b/extra/sun-umbra/kitty-flow-green.conf
index 331ad3f..749774f 100644
--- a/extra/sun-umbra/kitty-flow-green.conf
+++ b/extra/sun-umbra/kitty-flow-green.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #15ff00 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #2d8670
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #862d34
 color10 #34862d
 color11 #86862d
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #2d6186 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #2d6186
 
 # Borders
 active_border_color #2d3c86 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-umbra/kitty-flow-orange.conf b/extra/sun-umbra/kitty-flow-orange.conf
index 3b87b0c..493cbd4 100644
--- a/extra/sun-umbra/kitty-flow-orange.conf
+++ b/extra/sun-umbra/kitty-flow-orange.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #ff6a00 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #2d8670
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #862d34
 color10 #34862d
 color11 #86862d
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #2d6186 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #2d6186
 
 # Borders
 active_border_color #2d3c86 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-umbra/kitty-flow-pink.conf b/extra/sun-umbra/kitty-flow-pink.conf
index 6dd7b8a..45bce34 100644
--- a/extra/sun-umbra/kitty-flow-pink.conf
+++ b/extra/sun-umbra/kitty-flow-pink.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #ff007b 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #2d8670
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #862d34
 color10 #34862d
 color11 #86862d
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #2d6186 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #2d6186
 
 # Borders
 active_border_color #2d3c86 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-umbra/kitty-flow-yellow.conf b/extra/sun-umbra/kitty-flow-yellow.conf
index b8fd58b..ec10ce9 100644
--- a/extra/sun-umbra/kitty-flow-yellow.conf
+++ b/extra/sun-umbra/kitty-flow-yellow.conf
@@ -3,7 +3,7 @@
 
 # Basic colors
 background #d1dbe0
-foreground #3d505c
+foreground #282f33
 selection_foreground #fbff00 
 selection_background #f2f2f2 
 
@@ -18,7 +18,7 @@ color6 #2d8670
 color7 #0d0d0d
 
 # Bright colors
-color8 #94aab8
+color8 #3b4d59
 color9 #862d34
 color10 #34862d
 color11 #86862d
@@ -37,9 +37,9 @@ cursor_text_color #f2f2f2
 # Tabs
 active_tab_background #2d6186 
 active_tab_foreground #f2f2f2
-inactive_tab_background #94aab8
+inactive_tab_background #3b4d59
 inactive_tab_foreground #2d6186
 
 # Borders
 active_border_color #2d3c86 
-inactive_border_color #94aab8
+inactive_border_color #3b4d59
diff --git a/extra/sun-umbra/tmux-flow-cyan.conf b/extra/sun-umbra/tmux-flow-cyan.conf
index f060716..427aa08 100644
--- a/extra/sun-umbra/tmux-flow-cyan.conf
+++ b/extra/sun-umbra/tmux-flow-cyan.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#2d6186] #S #[bg=#475d6b,fg=#2d6186] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#2d6186] %H:%M #[fg=#f2f2f2,bg=#2d6186] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#2d6186] #S #[bg=#dae2e7,fg=#2d6186] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#2d6186] %H:%M #[fg=#dae2e7,bg=#2d6186] %A %d. %b %Y "
 
 set -g message-command-style fg=#00e1ff
 set -g message-style "fg=#00e1ff, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-umbra/tmux-flow-green.conf b/extra/sun-umbra/tmux-flow-green.conf
index e9ff22e..dc59e6a 100644
--- a/extra/sun-umbra/tmux-flow-green.conf
+++ b/extra/sun-umbra/tmux-flow-green.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#2d6186] #S #[bg=#475d6b,fg=#2d6186] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#2d6186] %H:%M #[fg=#f2f2f2,bg=#2d6186] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#2d6186] #S #[bg=#dae2e7,fg=#2d6186] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#2d6186] %H:%M #[fg=#dae2e7,bg=#2d6186] %A %d. %b %Y "
 
 set -g message-command-style fg=#15ff00
 set -g message-style "fg=#15ff00, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-umbra/tmux-flow-orange.conf b/extra/sun-umbra/tmux-flow-orange.conf
index fe35456..d5effa1 100644
--- a/extra/sun-umbra/tmux-flow-orange.conf
+++ b/extra/sun-umbra/tmux-flow-orange.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#2d6186] #S #[bg=#475d6b,fg=#2d6186] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#2d6186] %H:%M #[fg=#f2f2f2,bg=#2d6186] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#2d6186] #S #[bg=#dae2e7,fg=#2d6186] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#2d6186] %H:%M #[fg=#dae2e7,bg=#2d6186] %A %d. %b %Y "
 
 set -g message-command-style fg=#ff6a00
 set -g message-style "fg=#ff6a00, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-umbra/tmux-flow-pink.conf b/extra/sun-umbra/tmux-flow-pink.conf
index ae9d5ea..216eecc 100644
--- a/extra/sun-umbra/tmux-flow-pink.conf
+++ b/extra/sun-umbra/tmux-flow-pink.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#2d6186] #S #[bg=#475d6b,fg=#2d6186] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#2d6186] %H:%M #[fg=#f2f2f2,bg=#2d6186] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#2d6186] #S #[bg=#dae2e7,fg=#2d6186] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#2d6186] %H:%M #[fg=#dae2e7,bg=#2d6186] %A %d. %b %Y "
 
 set -g message-command-style fg=#ff007b
 set -g message-style "fg=#ff007b, bg=#e0e7eb" # color used in the message popup.
diff --git a/extra/sun-umbra/tmux-flow-yellow.conf b/extra/sun-umbra/tmux-flow-yellow.conf
index ac1086c..3bf1cee 100644
--- a/extra/sun-umbra/tmux-flow-yellow.conf
+++ b/extra/sun-umbra/tmux-flow-yellow.conf
@@ -6,14 +6,14 @@
 set -g status-position top
 set -g status-right-length "100" 
 set -g status-left-length "100" 
-set -g status-style bg=#e0e7eb,fg=#94aab8
-set -g window-status-style fg=#94aab8,bg=#e0e7eb
+set -g status-style bg=#e0e7eb,fg=#3b4d59
+set -g window-status-style fg=#3b4d59,bg=#e0e7eb
 setw -g window-status-separator " "
 set -g window-status-current-style fg=colour198
 set -g window-status-format "(#I) #W"
 set -g window-status-current-format "(#I) #W"
-set -g status-left "#[fg=#f2f2f2,bg=#2d6186] #S #[bg=#475d6b,fg=#2d6186] #h #[bg=#e0e7eb] "
-set -g status-right "#[bg=#475d6b,fg=#2d6186] %H:%M #[fg=#f2f2f2,bg=#2d6186] %A %d. %b %Y "
+set -g status-left "#[fg=#dae2e7,bg=#2d6186] #S #[bg=#dae2e7,fg=#2d6186] #h #[bg=#e0e7eb] "
+set -g status-right "#[bg=#dae2e7,fg=#2d6186] %H:%M #[fg=#dae2e7,bg=#2d6186] %A %d. %b %Y "
 
 set -g message-command-style fg=#fbff00
 set -g message-style "fg=#fbff00, bg=#e0e7eb" # color used in the message popup.
diff --git a/lua/flow/colors.lua b/lua/flow/colors.lua
index 92692e8..78c8f5e 100644
--- a/lua/flow/colors.lua
+++ b/lua/flow/colors.lua
@@ -11,19 +11,10 @@ M._color_names =
 function M.setup(opts)
   local default_palette = require("flow.palette").get(opts or {})
 
-  -- vim.api.nvim_create_autocmd("FileType", {
-  --   pattern = { "qf" }, -- 'qf' is the filetype for Quickfix
-  --   callback = function()
-  --     vim.schedule(function()
-  --       vim.api.nvim_win_set_option(
-  --         0,
-  --         "winhighlight",
-  --         "Normal:NormalSidebar,FoldColumn:NormalSidebar"
-  --       )
-  --       vim.opt.colorcolumn = ""
-  --     end)
-  --   end,
-  -- })
+  opts = opts or {}
+
+  -- Get the configured fluo color (with fallback to default)
+  local fluo_color = (opts.colors and opts.colors.fluo) or "pink"
 
   local colors = {
     -- Core colors
@@ -33,15 +24,14 @@ function M.setup(opts)
     grey = default_palette.grey,
 
     -- Fluo colors
-    fluo = default_palette.fluo.pink.default,
+    fluo = default_palette.fluo[fluo_color].default,
     -- Full palette of the fluo colors.
-    Fluo = default_palette.fluo.pink,
+    Fluo = default_palette.fluo[fluo_color],
 
     -- Debug: some hi are still a mystery to me, use fluo green to discover them.
     to_check = default_palette.fluo.green.default,
   }
 
-  opts = opts or {}
   M._apply_opts(default_palette, colors, opts)
 
   for _, key in ipairs(M._color_names) do
@@ -53,7 +43,9 @@ function M.setup(opts)
     colors[Key] = default_palette[key]
   end
 
-  colors.comment = default_palette.grey[5]
+  -- Comments - use lighter grey for light theme
+  colors.comment = opts.theme.style == "dark" and colors.grey[7] -- Dark theme: 50% lightness
+    or colors.grey[4] -- Light theme: inverts to 65% lightness (less dark)
 
   -- +----------------------------------------------------------------------------------------+
   -- | Sidebar (e.g., NERDTree, Telescope, Quickfix)                                          | <- Sidebar
@@ -79,7 +71,7 @@ function M.setup(opts)
 
   -- Sidebar: used by the quickfix list, help, and explorer windows.
   -- NOTE: not used.
-  colors.fg_sidebar = default_palette.grey[6]
+  colors.fg_sidebar = default_palette.grey[8]
   colors.bg_sidebar = colors.bg
 
   local is_transparent = opts.theme.transparent == true
@@ -89,32 +81,34 @@ function M.setup(opts)
   colors.bg_gutter = (is_transparent and default_palette.transparent) or colors.bg
 
   -- Float: used for visual elements that are floating and triggered by the user.
-  colors.fg_float = colors.grey[6]
-  colors.bg_float = default_palette.transparent
+  colors.fg_float = colors.grey[8]
+  colors.bg_float = opts.theme.style == "dark" and default_palette.float_bg.dark
+    or default_palette.float_bg.light
 
   -- Popups: use for completion menu and all visual components that appears autonomously.
-  colors.fg_popup = default_palette.grey[7]
-  colors.bg_popup = (is_transparent and default_palette.transparent) or colors.bg
+  colors.fg_popup = default_palette.grey[9]
+  colors.bg_popup = (is_transparent and default_palette.transparent) or colors.bg_float
 
   -- Statusline and tabline
-  colors.fg_statusline = colors.grey[4]
+  colors.fg_statusline = colors.grey[6]
   colors.bg_statusline = colors.grey[1]
 
   -- Highlights
-  colors.fg_highlight = colors.grey[4]
+  colors.fg_highlight = colors.grey[6]
   colors.bg_highlight = colors.grey[2]
 
-  -- Visual
-  colors.bg_visual = colors.fluo
+  -- Visual - uses configured fluo color
+  colors.bg_visual = opts.theme.style == "dark" and default_palette.visual_bg.dark
+    or default_palette.visual_bg.light
   colors.fg_visual = colors.grey[2]
 
   -- Git
   colors.git = {
     add = colors.green, -- Added files/lines
-    change = colors.yellow, -- Modified files/lines
+    change = colors.light_blue, -- Modified files/lines
     delete = colors.red, -- Deleted files/lines
-    ignore = colors.grey[5], -- Ignored files
-    untrcked = colors.sky_blue, -- New untracked files
+    ignore = colors.grey[7], -- Ignored files
+    untracked = colors.sky_blue, -- New untracked files
   }
 
   local is_dark = opts.theme.style == "dark"
@@ -122,7 +116,8 @@ function M.setup(opts)
     add = not is_dark and colors.Green.very_light or colors.Green.very_dark,
     delete = not is_dark and colors.Red.very_light or colors.Red.very_dark,
     change = not is_dark and colors.Light_blue.very_light or colors.Sky_blue.very_dark,
-    text = not is_dark and colors.Cyan.very_light or colors.Cyan.very_dark,
+    text = not is_dark and colors.Green.very_light or colors.Green.very_dark,
+    parent = not is_dark and colors.Cyan.very_light or colors.Cyan.very_dark,
   }
 
   -- LSP diagnostics
@@ -179,15 +174,26 @@ function M._apply_opts(default_palette, colors, opts)
   end
 
   colors.bg = (opts.theme.transparent and default_palette.transparent) or default_palette.grey[3] -- used for theme background
-  colors.fg = (opts.theme.style == "dark" and colors.grey[7]) or colors.grey[6]
+  colors.fg = (opts.theme.style == "dark" and colors.grey[8]) or colors.grey[8]
 
   -- Borders
-  colors.fg_border = (opts.ui.borders == "none" and colors.bg)
-    or (opts.ui.borders == "fluo" and colors.fluo)
-    or (opts.ui.borders == "theme" and colors.grey[1])
-    or colors.grey[5]
+  if opts.ui.borders == "none" then
+    colors.fg_border = colors.bg -- Match background to make borders invisible
+    colors.fg_vsplit = colors.grey[2]
+  elseif opts.ui.borders == "light" then
+    colors.fg_border = colors.grey[4]
+    colors.fg_vsplit = colors.grey[4]
+  else -- dark (default)
+    colors.fg_border = colors.grey[1]
+    colors.fg_vsplit = colors.grey[1]
+  end
+
+  -- CursorLine background - uses configured fluo color
+  colors.bg_cursorline = opts.theme.style == "dark" and default_palette.cursorline_bg.dark
+    or default_palette.cursorline_bg.light
+
   -- NOTE bg_border is currently not used.
-  colors.bg_border = colors.grey[5]
+  colors.bg_border = colors.grey[7]
 end
 
 function M._invert_colors_for_theme(colors)
@@ -203,7 +209,7 @@ end
 
 function M._invert_colors_for_contrast(colors)
   colors.grey[1], colors.grey[3] = colors.grey[3], colors.grey[1]
-  colors.grey[7], colors.grey[8] = colors.grey[8], colors.grey[7]
+  colors.grey[9], colors.grey[10] = colors.grey[10], colors.grey[9]
 end
 
 return M
diff --git a/lua/flow/config.lua b/lua/flow/config.lua
index e41fca3..c652e70 100644
--- a/lua/flow/config.lua
+++ b/lua/flow/config.lua
@@ -27,8 +27,8 @@ M.defaults = {
     },
   },
   ui = {
-    ---@alias Borders "theme" | "inverse" | "fluo" | "none"
-    borders = "inverse",
+    ---@alias Borders "light" | "dark" | "none"
+    borders = "dark",
     ---@boolean
     aggressive_spell = false,
     ---@boolean
@@ -43,7 +43,7 @@ M.options = {}
 M.valid_options = {
   fluo_colors = { "pink", "cyan", "yellow", "orange", "green" },
   modes = { "default", "dark", "light" },
-  borders = { "theme", "inverse", "fluo", "none" },
+  borders = { "light", "dark", "none" },
   contrast = { "default", "high" },
   custom_ranges = {
     saturation = { min = 0, max = 100 },
diff --git a/lua/flow/highlights/avante.lua b/lua/flow/highlights/avante.lua
index 6ed8d44..9bd5ab0 100644
--- a/lua/flow/highlights/avante.lua
+++ b/lua/flow/highlights/avante.lua
@@ -5,12 +5,15 @@ local M = {}
 function M.get(c, _)
   local theme = {
     AvanteInlineHint = { fg = c.fluo },
-    AvanteTitle = { bg = c.fluo, fg = c.grey[3] },
-    AvanteReversedTitle = { bg = c.bg, fg = c.fluo },
-    AvanteSubtitle = { fg = c.fluo },
-    AvanteReversedSubtitle = { fg = c.bg },
-    AvanteThirdTitle = { fg = c.light_blue },
+
+    AvanteTitle = { link = "FlowPluginTitle" },
+    AvanteReversedTitle = { link = "AvanteTitle" },
+    AvanteSubtitle = { link = "AvanteTitle" },
+    AvanteReversedSubtitle = { link = "AvanteTitle" },
+    AvanteThirdTitle = { link = "AvanteTitle" },
+
     AvanteReversedThirdTitle = { fg = c.bg },
+    AvanteSidebarWinSeparator = { link = "Border" },
   }
 
   return theme
diff --git a/lua/flow/highlights/base.lua b/lua/flow/highlights/base.lua
index 1988d3e..8d394c6 100644
--- a/lua/flow/highlights/base.lua
+++ b/lua/flow/highlights/base.lua
@@ -21,7 +21,8 @@ function M.get(c, o)
     LineNrBelow = { link = "LineNr" },
 
     -- Highlighted elements
-    CursorLine = { bg = c.bg_highlight }, -- Used with the line set with 'cursorline'.
+    -- CursorLine = { bg = c.bg_highlight }, -- Used with the line set with 'cursorline'.
+    CursorLine = { bg = c.bg_cursorline }, -- Uses configured fluo color hue
     ColorColumn = { bg = c.bg_highlight }, -- Used for the columns set with 'colorcolumn'.
     CursorColumn = { link = "ColorColumn" }, -- Used with the column set with 'cursorcolumn'.
     Folded = { link = "ColorColumn" }, -- Line used for closed folds.
@@ -35,9 +36,10 @@ function M.get(c, o)
     TabLineSel = { bg = c.bg, fg = c.light_blue }, -- Tab pages line, active tab page label. Used by Trouble for numbers.
 
     -- Borders
-    VertSplit = { fg = c.fg_border }, -- The column separating vertically split windows.
+    VertSplit = { fg = c.fg_vsplit }, -- The column separating vertically split windows.
     WinSeparator = { link = "VertSplit" }, -- The column separating split windows.
-    FloatBorder = { fg = c.fg_border, bg = c.bg_float }, -- Border of floating windows, like completion.
+    Border = { bg = c.transparent, fg = c.fg_border, bold = true }, -- Transparent border for plugin UIs
+    FloatBorder = { bg = c.transparent, fg = c.fg_border }, -- Border of floating windows, like completion.
 
     -- Cursors
     -- NOTE: these highlights groups are superseeded by the terminal colors used. For example,
@@ -51,23 +53,24 @@ function M.get(c, o)
     MatchParen = { fg = c.fluo, bold = true }, -- The character under the cursor if it is a paired bracket, and its match. |pi_paren.txt|.
     Title = { fg = c.purple, bold = true }, -- Titles for output from ":set all", ":autocmd" etc.
     FloatTitle = { fg = c.fg_float, bg = c.bg_float, bold = true }, -- Title of floating windows.
+    FlowPluginTitle = { bg = c.transparent, fg = c.fg_border }, -- Titles for plugin UIs (Telescope, Avante)
     Whitespace = { link = "Comment" }, -- "nbsp", "space", "tab" and "trail" in 'listchars'. Set as bg to not show them.
-    NonText = { fg = c.fg_gutter }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|.
+    NonText = { fg = c.grey[4] }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|.
     EndOfBuffer = { link = "NonText" }, -- Filler lines (~) after the end of the buffer.
     Conceal = { fg = c.fg }, -- Placeholder characters substituted for concealed text (see 'conceallevel').
 
     -- Search and substitution
-    IncSearch = { bg = c.fluo, fg = c.fg_visual },
-    Search = { bg = c.grey[5], fg = c.fg_visual },
-    CurSearch = { bg = (not is_dark and c.Fluo.dark) or c.Fluo.light, fg = c.fg_visual }, -- Used for highlighting a search pattern under the cursor (see 'hlsearch').
+    IncSearch = { bg = c.fluo, fg = c.grey[2] },
+    Search = { bg = c.grey[7], fg = c.light_blue },
+    CurSearch = { bg = (not is_dark and c.Fluo.dark) or c.Fluo.light, fg = c.bg_visual }, -- Used for highlighting a search pattern under the cursor (see 'hlsearch').
     Substitute = { link = "IncSearch" }, -- |:substitute| replacement text highlighting.
 
-    Visual = { bg = c.bg_visual, fg = c.fg_visual }, -- Visual mode selection.
+    Visual = { bg = c.bg_visual }, -- Visual mode selection.
     VisualNOS = { bg = c.to_check }, -- visual mode selection when vim is "Not Owning the Selection".
 
     -- Messages
     MsgArea = { link = "Normal" }, -- Area for messages and cmdline.
-    ModeMsg = { fg = c.bg_visual }, -- 'showmode' message (e.g., "-- INSERT -- ").
+    ModeMsg = { fg = c.fluo }, -- 'showmode' message (e.g., "-- INSERT -- ").
     MoreMsg = { fg = c.bg_visual }, -- |more-prompt|.
     ErrorMsg = { fg = c.error }, -- Error messages on the command line.
     WarningMsg = { fg = c.warning }, -- Warning messages.
@@ -75,12 +78,12 @@ function M.get(c, o)
 
     -- Popup menu
     Pmenu = { bg = c.bg_popup, fg = c.fg_popup }, -- Popup menu: normal item triggered for example when listing plugin commands in terminal.
-    PmenuSel = { bg = c.bg_visual, fg = c.fg_visual }, -- Popup menu: selected item.
-    PmenuThumb = { bg = c.grey[4], bold = true }, -- Popup menu: Thumb of the scrollbar.
+    PmenuSel = { bg = c.bg_visual }, -- Popup menu: selected item.
+    PmenuThumb = { bg = c.grey[6], bold = true }, -- Popup menu: Thumb of the scrollbar.
     PmenuSbar = { bg = c.bg_popup }, -- Popup menu: scrollbar.
 
     -- Quickfix
-    QuickFixLine = { bg = c.bg_visual, fg = c.fg_visual }, -- Current |quickfix| item in the quickfix window.
+    QuickFixLine = { bg = c.bg_visual }, -- Current |quickfix| item in the quickfix window.
     qfLineNr = { link = "LineNr" }, -- Line number in the quickfix.
     qfFileName = { link = "Directory" }, -- Name of the file in the quickfix.
     qfSeparator = { link = "qfLineNr" }, -- Separator between quickfix line number and filename.
@@ -105,7 +108,7 @@ function M.get(c, o)
 
     -- Misc
     -- I'm not sure where these groups are set.
-    Define = { fg = c.grey[6] }, -- Preprocessor #define. Used in rust.
+    Define = { fg = c.grey[8] }, -- Preprocessor #define. Used in rust.
     Include = { fg = c.red }, --  preprocessor #include
     Question = { fg = c.bg_visual }, -- |hit-enter| prompt and yes/no questions.
     WildMenu = { bg = c.to_check }, -- current match in 'wildmenu' completion
@@ -115,6 +118,21 @@ function M.get(c, o)
     -- Netrw
     netrwClassify = { link = "Keyword" },
     netrwHelpCmd = { fg = c.fluo },
+
+    -- Flow Base Groups - Semantic groups for consistent UI across plugins
+    -- Headers and titles used by plugin UIs
+    FlowHeader = { bg = c.fluo, fg = c.grey[3] }, -- Main header for plugin UIs (Lazy, Mason)
+    FlowHighlightBlock = { bg = c.light_blue, fg = c.grey[3], bold = true }, -- Highlighted/active block
+
+    -- Interactive elements
+    FlowButton = { bg = c.grey[7], fg = c.grey[3] }, -- Standard button
+    FlowButtonActive = { bg = c.light_blue, fg = c.grey[3], bold = true }, -- Active/selected button
+
+    -- State indicators - consistent colors for success/error/warning/info across plugins
+    FlowSuccess = { fg = c.green }, -- Success state (git add, DAP play)
+    FlowError = { fg = c.error }, -- Error state (git delete, DAP stop, breakpoints)
+    FlowWarning = { fg = c.warning }, -- Warning state
+    FlowInfo = { fg = c.light_blue }, -- Info/neutral action state
   }
 
   return theme
diff --git a/lua/flow/highlights/blink.lua b/lua/flow/highlights/blink.lua
index 0d0414e..c485d6b 100644
--- a/lua/flow/highlights/blink.lua
+++ b/lua/flow/highlights/blink.lua
@@ -2,9 +2,8 @@ local M = {}
 
 -- Defines the highlight group colors for Blink completion.
 --- @param c table: The available colors.
---- @param o FlowConfig: The available options.
 --- @return table: Nvim cmp highlights.
-function M.get(c, o)
+function M.get(c, _)
   local ret = {
     BlinkCmpDoc = { fg = c.fg, bg = c.bg_float },
     BlinkCmpGhostText = { fg = c.red },
@@ -19,7 +18,7 @@ function M.get(c, o)
 
     BlinkCmpScrollBarGutter = { fg = c.to_check, bg = c.red },
 
-    BlinkCmpMenuBorder = { fg = c.fg_border, bg = c.bg_float },
+    BlinkCmpMenuBorder = { link = "FloatBorder" },
     BlinkCmpDocBorder = { link = "BlinkCmpMenuBorder" },
     BlinkCmpSignatureHelpBorder = { link = "BlinkCmpMenuBorder" },
 
@@ -27,31 +26,31 @@ function M.get(c, o)
 
     -- Kind
     BlinkCmpKindDefault = { fg = c.fg_visual },
-    BlinkCmpKindKeyword = { link = "Keyword" },
-    BlinkCmpKindFunction = { link = "Function" },
+    BlinkCmpKindKeyword = { link = "FlowKindKeyword" },
+    BlinkCmpKindFunction = { link = "FlowKindFunction" },
     BlinkCmpKindSnippet = { fg = c.light_blue },
-    BlinkCmpKindField = { link = "@field" },
-    BlinkCmpKindProperty = { fg = c.sky_blue },
-    BlinkCmpKindEvent = { link = "Type" },
-    BlinkCmpKindText = { fg = c.fg_popup },
-    BlinkCmpKindEnum = { link = "Type" },
-    BlinkCmpKindConstant = { link = "Constant" },
-    BlinkCmpKindConstructor = { link = "Function" },
-    BlinkCmpKindReference = { fg = c.cyan },
-    BlinkCmpKindStruct = { link = "Structure" },
-    BlinkCmpKindClass = { link = "Type" },
-    BlinkCmpKindModule = { fg = c.yellow },
-    BlinkCmpKindOperator = { link = "Operator" },
-    BlinkCmpKindVariable = { fg = c.sky_blue },
-    BlinkCmpKindUnit = { link = "Constant" },
+    BlinkCmpKindField = { link = "FlowKindField" },
+    BlinkCmpKindProperty = { link = "FlowKindProperty" },
+    BlinkCmpKindEvent = { link = "FlowKindEvent" },
+    BlinkCmpKindText = { link = "FlowKindText" },
+    BlinkCmpKindEnum = { link = "FlowKindEnum" },
+    BlinkCmpKindConstant = { link = "FlowKindConstant" },
+    BlinkCmpKindConstructor = { link = "FlowKindConstructor" },
+    BlinkCmpKindReference = { link = "FlowKindReference" },
+    BlinkCmpKindStruct = { link = "FlowKindStruct" },
+    BlinkCmpKindClass = { link = "FlowKindClass" },
+    BlinkCmpKindModule = { link = "FlowKindModule" },
+    BlinkCmpKindOperator = { link = "FlowKindOperator" },
+    BlinkCmpKindVariable = { link = "FlowKindVariable" },
+    BlinkCmpKindUnit = { link = "FlowKindUnit" },
     BlinkCmpKindFile = { link = "Directory" },
     BlinkCmpKindFolder = { link = "Directory" },
-    BlinkCmpKindMethod = { link = "Function" },
-    BlinkCmpKindValue = { link = "Constant" },
-    BlinkCmpKindEnumMember = { link = "Type" },
-    BlinkCmpKindInterface = { link = "Type" },
-    BlinkCmpKindColor = { link = "Constant" },
-    BlinkCmpKindTypeParameter = { link = "Type" },
+    BlinkCmpKindMethod = { link = "FlowKindMethod" },
+    BlinkCmpKindValue = { link = "FlowKindValue" },
+    BlinkCmpKindEnumMember = { link = "FlowKindEnumMember" },
+    BlinkCmpKindInterface = { link = "FlowKindInterface" },
+    BlinkCmpKindColor = { link = "FlowKindColor" },
+    BlinkCmpKindTypeParameter = { link = "FlowKindTypeParameter" },
   }
 
   -- require("tokyonight.groups.kinds").kinds(ret, "BlinkCmpKind%s")
diff --git a/lua/flow/highlights/completion.lua b/lua/flow/highlights/completion.lua
index d672c43..3dc79bc 100644
--- a/lua/flow/highlights/completion.lua
+++ b/lua/flow/highlights/completion.lua
@@ -6,39 +6,39 @@ local M = {}
 function M.get(c, _)
   local theme = {
     CmpItemMenu = { fg = c.comment },
-    CmpItemAbbr = { fg = c.grey[5] },
+    CmpItemAbbr = { fg = c.grey[7] },
     CmpItemAbbrMatch = { fg = c.cyan },
     CmpItemAbbrMatchFuzzy = { fg = c.cyan },
     CmpItemAbbrDeprecated = { fg = c.fg_gutter, bg = c.none, strikethrough = true },
-    CmpCompletionSel = { fg = c.fg_visual },
+    -- CmpCompletionSel = { fg = c.fg_visual },
 
     -- Kind
-    CmpItemKindDefault = { fg = c.fg_visual },
-    CmpItemKindKeyword = { link = "Keyword" },
-    CmpItemKindFunction = { link = "Function" },
+    -- CmpItemKindDefault = { fg = c.fg_visual },
+    CmpItemKindKeyword = { link = "FlowKindKeyword" },
+    CmpItemKindFunction = { link = "FlowKindFunction" },
     CmpItemKindSnippet = { fg = c.red },
-    CmpItemKindField = { link = "@field" },
-    CmpItemKindProperty = { fg = c.sky_blue },
-    CmpItemKindEvent = { link = "Type" },
-    CmpItemKindText = { fg = c.fg_popup },
-    CmpItemKindEnum = { link = "Type" },
-    CmpItemKindConstant = { link = "Constant" },
-    CmpItemKindConstructor = { link = "Function" },
-    CmpItemKindReference = { fg = c.cyan },
-    CmpItemKindStruct = { link = "Structure" },
-    CmpItemKindClass = { link = "Type" },
-    CmpItemKindModule = { fg = c.yellow },
-    CmpItemKindOperator = { link = "Operator" },
-    CmpItemKindVariable = { fg = c.sky_blue },
-    CmpItemKindUnit = { link = "Constant" },
+    CmpItemKindField = { link = "FlowKindField" },
+    CmpItemKindProperty = { link = "FlowKindProperty" },
+    CmpItemKindEvent = { link = "FlowKindEvent" },
+    CmpItemKindText = { link = "FlowKindText" },
+    CmpItemKindEnum = { link = "FlowKindEnum" },
+    CmpItemKindConstant = { link = "FlowKindConstant" },
+    CmpItemKindConstructor = { link = "FlowKindConstructor" },
+    CmpItemKindReference = { link = "FlowKindReference" },
+    CmpItemKindStruct = { link = "FlowKindStruct" },
+    CmpItemKindClass = { link = "FlowKindClass" },
+    CmpItemKindModule = { link = "FlowKindModule" },
+    CmpItemKindOperator = { link = "FlowKindOperator" },
+    CmpItemKindVariable = { link = "FlowKindVariable" },
+    CmpItemKindUnit = { link = "FlowKindUnit" },
     CmpItemKindFile = { link = "Directory" },
     CmpItemKindFolder = { link = "Directory" },
-    CmpItemKindMethod = { link = "Function" },
-    CmpItemKindValue = { link = "Constant" },
-    CmpItemKindEnumMember = { link = "Type" },
-    CmpItemKindInterface = { link = "Type" },
-    CmpItemKindColor = { link = "Constant" },
-    CmpItemKindTypeParameter = { link = "Type" },
+    CmpItemKindMethod = { link = "FlowKindMethod" },
+    CmpItemKindValue = { link = "FlowKindValue" },
+    CmpItemKindEnumMember = { link = "FlowKindEnumMember" },
+    CmpItemKindInterface = { link = "FlowKindInterface" },
+    CmpItemKindColor = { link = "FlowKindColor" },
+    CmpItemKindTypeParameter = { link = "FlowKindTypeParameter" },
   }
 
   return theme
diff --git a/lua/flow/highlights/dap.lua b/lua/flow/highlights/dap.lua
index 14dffaf..d40c43c 100644
--- a/lua/flow/highlights/dap.lua
+++ b/lua/flow/highlights/dap.lua
@@ -6,19 +6,19 @@ local M = {}
 --- @return table: Debug highlights.
 function M.get(c, _)
   local theme = {
-    debugPC = { bg = c.to_check }, -- used for highlighting the current line in terminal-debug
-    debugBreakpoint = { fg = c.error }, -- used for breakpoint colors in terminal-debug
+    debugPC = { bg = c.grey[2] }, -- used for highlighting the current line in terminal-debug
+    debugBreakpoint = { link = "FlowError" }, -- used for breakpoint colors in terminal-debug
     DapBreakpoint = { link = "debugBreakpoint" },
 
     -- Debug = { fg = c.orange }, -- debugging statements
     -- DapUIFloatBorder = { fg = c.green, bg = c.bg },
     --
     -- -- Icons
-    DapUIStop = { fg = c.red },
-    DapUIRestart = { fg = c.green },
+    DapUIStop = { link = "FlowError" },
+    DapUIRestart = { link = "FlowSuccess" },
     DapUIPlayPause = { link = "DapUIRestart" },
 
-    DapUIStepInto = { fg = c.light_blue },
+    DapUIStepInto = { link = "FlowInfo" },
     DapUIStepOver = { link = "DapUIStepInto" },
     DapUIStepOut = { link = "DapUIStepInto" },
     DapUIStepBack = { link = "DapUIStepInto" },
@@ -26,8 +26,8 @@ function M.get(c, _)
     DapUILineNumber = { fg = c.sky_blue },
     DapUICurrentFrameName = { fg = c.yellow },
 
-    DapUIWatchesValue = { fg = c.grey[6] },
-    DapUIWatchesError = { fg = c.error },
+    DapUIWatchesValue = { fg = c.grey[8] },
+    DapUIWatchesError = { link = "FlowError" },
 
     -- DapUIWatchesEmpty = { link = "DapUIWatchesValue" },
     --
@@ -38,16 +38,16 @@ function M.get(c, _)
     --
     DapUIScope = { link = "DapUIStoppedThread" }, -- Text like Locals
 
-    DapUIVariable = { fg = c.blue },
+    DapUIVariable = { link = "FlowKindVariable" },
     -- DapUIValue = { fg = c.cyan },
 
-    DapUIType = { fg = c.purple },
+    DapUIType = { link = "FlowKindType" },
     DapUISource = { fg = c.purple }, -- filename
 
-    DapUIBreakpointsPath = { fg = c.red },
-    DapUIBreakpointsLine = { fg = c.red },
+    DapUIBreakpointsPath = { link = "FlowError" },
+    DapUIBreakpointsLine = { link = "FlowError" },
     --
-    DapUIDecoration = { fg = c.grey[6] }, -- arrow indicating vars
+    DapUIDecoration = { fg = c.grey[8] }, -- arrow indicating vars
     DapUIModifiedValue = { fg = c.yellow }, -- value of the last modified variables in the scope.
   }
 
diff --git a/lua/flow/highlights/diagnostic.lua b/lua/flow/highlights/diagnostic.lua
index 04011bc..3771f22 100644
--- a/lua/flow/highlights/diagnostic.lua
+++ b/lua/flow/highlights/diagnostic.lua
@@ -21,16 +21,21 @@ function M.get(c, o)
     DiagnosticVirtualTextInfo = { fg = c.info, bg = c.Cyan[background_tone] },
     DiagnosticVirtualTextHint = { fg = c.hint, bg = c.Light_blue[background_tone] },
 
+    DiagnosticVirtualLinesError = { link = "DiagnosticVirtualTextError" },
+    DiagnosticVirtualLinesWarn = { link = "DiagnosticVirtualTextWarn" },
+    DiagnosticVirtualLinesInfo = { link = "DiagnosticVirtualTextInfo" },
+    DiagnosticVirtualLinesHint = { link = "DiagnosticVirtualTextHint" },
+
     DiagnosticFloatingError = { link = "DiagnostictError" },
     DiagnosticFloatingWarn = { link = "DiagnosticWarn" },
     DiagnosticFloatingInfo = { link = "DiagnosticInfo" },
     DiagnosticFloatingHint = { link = "DiagnosticHint" },
     DiagnosticFloatingOk = { fg = c.fg_viusual },
 
-    DiagnosticUnderlineError = { undercurl = true, sp = c.error },
-    DiagnosticUnderlineWarn = { undercurl = true, sp = c.warning },
-    DiagnosticUnderlineInfo = { undercurl = true, sp = c.info },
-    DiagnosticUnderlineHint = { undercurl = true, sp = c.hint },
+    DiagnosticUnderlineError = { undercurl = false, sp = c.error },
+    DiagnosticUnderlineWarn = { undercurl = false, sp = c.warning },
+    DiagnosticUnderlineInfo = { undercurl = false, sp = c.info },
+    DiagnosticUnderlineHint = { undercurl = false, sp = c.hint },
   }
 
   return theme
diff --git a/lua/flow/highlights/fzf-lua.lua b/lua/flow/highlights/fzf-lua.lua
new file mode 100644
index 0000000..22f2933
--- /dev/null
+++ b/lua/flow/highlights/fzf-lua.lua
@@ -0,0 +1,40 @@
+local M = {}
+
+--- @param c table: The available colors.
+--- @return table: FzfLua highlights.
+function M.get(c, _)
+  local theme = {
+    WinBarSpecial = { fg = c.blue },
+    FzfLuaBorder = { link = "FloatBorder" },
+  }
+
+  return theme
+end
+
+-- TelescopeNormal = { fg = c.fg, bg = c.transparent }, -- background float is the background where the text is
+-- TelescopePromptNormal = { link = "TelescopeNormal" },
+-- TelescopePreviewNormal = { link = "TelescopeNormal" },
+-- TelescopeResultsNormal = { link = "TelescopeNormal" },
+--
+-- -- Selection
+-- TelescopeSelectionCaret = { fg = c.bg_visual, bold = true },
+-- TelescopeSelection = { fg = c.bg_visual, bold = true },
+-- TelescopeMultiSelection = { fg = c.fg_visual, bg = c.bg_visual, bold = true }, -- Open telescope and press TAB on files.
+-- TelescopeMultiIcon = { link = "TelescopeMultiSelection" }, -- Icon of selected items.
+-- TelescopeMatching = { fg = c.blue, bold = true },
+--
+-- TelescopePromptPrefix = { bg = c.transparent, fg = c.bg_visual },
+-- TelescopeResultsSpecialComment = { link = "gitDate" }, -- example: date in telescope git branches.
+--
+-- -- Titles
+-- TelescopeResultsTitle = { bg = c.transparent, fg = c.fg_border },
+-- TelescopePromptTitle = { link = "TelescopeResultsTitle" },
+-- TelescopePreviewTitle = { link = "TelescopeResultsTitle" },
+--
+-- -- Borders
+-- TelescopeBorder = { bg = c.transparent, fg = c.fg_border, bold = true },
+-- TelescopePromptBorder = { link = "TelescopeBorder" },
+-- TelescopePreviewBorder = { link = "TelescopeBorder" },
+-- TelescopeResultsBorder = { link = "TelescopeBorder" },
+
+return M
diff --git a/lua/flow/highlights/git.lua b/lua/flow/highlights/git.lua
index 2177387..e6f162a 100644
--- a/lua/flow/highlights/git.lua
+++ b/lua/flow/highlights/git.lua
@@ -8,14 +8,14 @@ function M.get(c, _)
 
     gitKeyword = { fg = c.blue },
     gitIdentityKeyword = { link = "gitKeyword" },
-    gitCommitSummary = { fg = c.bg_visual },
+    gitCommitSummary = { fg = c.fluo },
     gitDate = { fg = c.light_blue },
-    gitDiff = { fg = c.grey[4] },
+    gitDiff = { fg = c.grey[6] },
 
     -- Diff
-    diffAdded = { fg = c.git.add, bg = c.diff.add },
-    diffRemoved = { fg = c.git.delete, bg = c.diff.delete },
-    diffChanged = { fg = c.git.change, bg = c.diff.change },
+    diffAdded = { link = "Added" },
+    diffRemoved = { link = "Removed" },
+    diffChanged = { link = "Changed" },
     diffOldFile = { fg = c.git.delete },
     diffNewFile = { fg = c.git.add },
     diffFile = { fg = c.yellow },
@@ -29,13 +29,19 @@ function M.get(c, _)
 
     -- GitSigns
     GitSignsAdd = { fg = c.git.add }, -- diff mode: Added line |diff.txt|
-    GitSignsAddPreview = { bg = c.diff.add },
-    GitSignsChange = { fg = c.git.change }, -- diff mode: Changed line |diff.txt|
+    GitSignsAddPreview = { bg = c.Green.very_dark },
     GitSignsDelete = { fg = c.git.delete }, -- diff mode: Deleted line |diff.txt|
-    GitSignsCurrentLineBlame = { fg = c.grey[4] },
+    GitSignsDeletePreview = { bg = c.Red.very_dark }, -- diff mode: Deleted line |diff.txt|
+    GitSignsChange = { fg = c.git.change }, -- diff mode: Changed line |diff.txt|
+    -- colors shown when using :Gitsigns toggle_word_diff
+    GitSignsDeleteInline = { fg = c.Red.light, bg = c.Red.very_dark }, -- diff mode: Deleted line |diff.txt|
+    GitSignsAddInline = { fg = c.Green.light, bg = c.Green.very_dark },
+    GitSignsChangeInline = { fg = c.Light_blue.light, bg = c.Light_blue.very_dark }, -- diff mode: Changed line |diff.txt|
+
+    GitSignsCurrentLineBlame = { fg = c.grey[6] },
 
     -- Fugitive
-    fugitiveHeader = { fg = c.grey[6] },
+    fugitiveHeader = { fg = c.grey[8] },
     fugitiveHelpHeader = { link = "fugitiveHeader" },
     fugitiveUntrackedHeading = { fg = c.yellow },
     fugitiveUntrackedModifier = { link = "fugitiveUntrackedHeading" },
@@ -51,6 +57,8 @@ function M.get(c, _)
     GitConflictCurrent = { bg = c.diff.change },
     GitConflictIncomngLabled = { bg = c.Green.dark },
     GitConflictIncoming = { bg = c.diff.add },
+    GitConflictAncestor = { bg = c.diff.parent },
+    GitConflictAncestorLabel = { bg = c.Cyan.dark },
   }
 
   return theme
diff --git a/lua/flow/highlights/lazy.lua b/lua/flow/highlights/lazy.lua
index ac5e8c6..1e011f0 100644
--- a/lua/flow/highlights/lazy.lua
+++ b/lua/flow/highlights/lazy.lua
@@ -6,24 +6,24 @@ local M = {}
 --- @return table: Lazy plugin highlights.
 function M.get(c, _)
   local theme = {
-    LazyH1 = { bg = c.fluo, fg = c.grey[3] },
+    LazyH1 = { link = "FlowHeader" },
 
     LazyProgressDone = { bold = true, fg = c.purple },
     LazyProgressTodo = { bold = true, fg = c.cyan },
 
     LazyNormal = { fg = c.light_blue },
-    LazyButton = { bg = c.grey[5], fg = c.grey[3] },
-    LazyButtonActive = { bg = c.light_blue, fg = c.grey[3], bold = true },
+    LazyButton = { link = "FlowButton" },
+    LazyButtonActive = { link = "FlowButtonActive" },
 
     LazyReasonStart = { fg = c.purple },
     LazyReasonSource = { link = "LazyReasonStart" },
     LazyReasonPlugin = { link = "LazyReasonStart" },
-    LazyReasonRuntime = { fg = c.grey[5] },
+    LazyReasonRuntime = { fg = c.grey[7] },
     LazyReasonEvent = { fg = c.red },
     LazyReasonCmd = { fg = c.sky_blue },
 
     LazySpecial = { fg = c.grey[3] },
-    LazyDimmed = { fg = c.grey[8] },
+    LazyDimmed = { fg = c.grey[10] },
   }
 
   return theme
diff --git a/lua/flow/highlights/lsp.lua b/lua/flow/highlights/lsp.lua
index 39ae044..0796950 100644
--- a/lua/flow/highlights/lsp.lua
+++ b/lua/flow/highlights/lsp.lua
@@ -3,23 +3,34 @@ local M = {}
 -- Defines the highlight group colors for
 -- the language server protocols.
 --- @param c table: The available colors.
+--- @param o FlowConfig: The available options.
 --- @return table: Nvim lsp highlights.
-function M.get(c, _)
+function M.get(c, o)
+  local is_dark = o.theme.style == "dark"
+
   local theme = {
-    LspSignatureActiveParameter = { bg = c.Cyan.very_dark, bold = true }, -- Parameter highlighter in signature help.
 
-    LspReferenceText = { bg = c.Cyan.very_dark }, -- Used for highlighting "text" references.
+    LspSignatureActiveParameter = {
+      bg = (is_dark and c.Cyan.very_dark) or c.Cyan.very_light,
+      bold = true,
+    }, -- Parameter highlighter in signature help.
+
+    LspReferenceText = { bg = (is_dark and c.Cyan.very_dark) or c.Cyan.very_light }, -- Used for highlighting "text" references.
+
     LspReferenceRead = { link = "LspReferenceText" }, -- Used for highlighting "read" references.
     LspReferenceWrite = { link = "LspReferenceText" }, -- Used for highlighting "write" references.
 
     LspCodeLens = { fg = c.comment },
 
-    LspInlayHint = { fg = c.grey[6] },
+    LspInlayHint = { fg = c.grey[7] },
 
-    LspInfoBorder = { fg = c.fg_border, bg = c.bg_float },
+    LspInfoBorder = { link = "FloatBorder" },
     LspKindSnippet = { fg = c.to_check },
 
-    SnippetTabstop = { bg = c.Purple.very_dark },
+    SnippetTabstop = {
+      -- bg = (is_dark and c.Blue.very_light) or c.Blue.very_dark,
+      bg = c.comment,
+    },
   }
 
   return theme
diff --git a/lua/flow/highlights/markdown.lua b/lua/flow/highlights/markdown.lua
index 764f195..c0f59e8 100644
--- a/lua/flow/highlights/markdown.lua
+++ b/lua/flow/highlights/markdown.lua
@@ -6,17 +6,18 @@ local M = {}
 --- @return table: Markdown highlights.
 function M.get(c, o)
   local is_transparent = o.theme.transparent
+  local is_dark = o.theme.style == "dark"
 
   local theme = {
     htmlH1 = { fg = c.purple, bold = true },
     htmlH2 = { fg = c.blue, bold = true },
 
     -- Code snippet
-    markdownCode = { fg = c.grey[5] },
-    mkdCodeDelimiter = { bg = c.grey[5], fg = c.fg },
+    markdownCode = { fg = c.grey[7] },
+    mkdCodeDelimiter = { bg = c.grey[7], fg = c.fg },
     mkdCodeStart = { fg = c.blue, bold = true },
     mkdCodeEnd = { fg = c.blue, bold = true },
-    mkdSnippetS = { bg = c.grey[3], fg = c.grey[4] },
+    mkdSnippetS = { bg = c.grey[3], fg = c.grey[6] },
 
     markdownHeadingDelimiter = { fg = c.orange, bold = true },
     markdownCodeBlock = { fg = c.blue },
@@ -63,14 +64,14 @@ function M.get(c, o)
     }, --
     ["@markup.raw.markdown_inline"] = {
       fg = c.cyan,
-      bg = c.grey[4],
+      bg = c.grey[2],
     },
 
     -- Obsidian
     ObsidianRefText = { fg = c.blue },
   }
 
-  local headers = { c.fluo, c.blue, c.light_blue, c.cyan, c.sky_blue }
+  local headers = { c.purple, c.blue, c.light_blue, c.cyan, c.sky_blue }
   for i, color in ipairs(headers) do
     theme["@markup.heading." .. i .. ".markdown"] = { fg = color, bold = true }
   end
diff --git a/lua/flow/highlights/mason.lua b/lua/flow/highlights/mason.lua
index 76a4165..b3e54e8 100644
--- a/lua/flow/highlights/mason.lua
+++ b/lua/flow/highlights/mason.lua
@@ -1,13 +1,12 @@
 local M = {}
 
---- @param c table: The available colors.
 --- @return table: Mason plugin highlights.
-function M.get(c, _)
+function M.get(_, _)
   local theme = {
-    MasonHeader = { bg = c.fluo, fg = c.grey[3] },
+    MasonHeader = { link = "FlowHeader" },
     MasonHeading = { link = "Bold" },
-    MasonMutedBlock = { bg = c.grey[5], fg = c.grey[3] },
-    MasonHighlightBlockBold = { bg = c.light_blue, fg = c.grey[3], bold = true },
+    MasonMutedBlock = { link = "FlowButton" },
+    MasonHighlightBlockBold = { link = "FlowHighlightBlock" },
   }
 
   return theme
diff --git a/lua/flow/highlights/mini-files.lua b/lua/flow/highlights/mini-files.lua
new file mode 100644
index 0000000..0af6711
--- /dev/null
+++ b/lua/flow/highlights/mini-files.lua
@@ -0,0 +1,12 @@
+local M = {}
+
+--- @return table: Mini files plugin highlights.
+function M.get(c, _)
+  local theme = {
+    MiniFilesFile = { link = "Function" },
+    MiniFilesBorderModified = { fg = c.fluo },
+  }
+  return theme
+end
+
+return M
diff --git a/lua/flow/highlights/statusline.lua b/lua/flow/highlights/statusline.lua
new file mode 100644
index 0000000..1b656d2
--- /dev/null
+++ b/lua/flow/highlights/statusline.lua
@@ -0,0 +1,18 @@
+local M = {}
+
+--- @param c table: The available colors.
+--- @return table: Statusline highlights.
+function M.get(c, _)
+  local theme = {
+    Statusline = { fg = c.fg_statusline, bg = c.bg_statusline },
+    StatuslineMode = { bg = c.blue, fg = c.bg_highlight },
+    StatuslineGitBranch = { fg = c.light_blue, bg = c.bg_highlight },
+    StatuslineFiletype = { bg = c.bg_statusline, fg = c.fg_statusline },
+    -- WinBarFile = { fg = c.cyan },
+    -- WinBarPath = { fg = c.comment },
+  }
+
+  return theme
+end
+
+return M
diff --git a/lua/flow/highlights/syntax.lua b/lua/flow/highlights/syntax.lua
index a323c16..41bc022 100644
--- a/lua/flow/highlights/syntax.lua
+++ b/lua/flow/highlights/syntax.lua
@@ -15,11 +15,11 @@ function M.get(c, o)
     Error = { bg = c.bg, fg = c.error }, -- Any erroneous construct.
     Exception = { link = "Keyword" }, -- try, catch, throw.
     Float = { link = "Number" }, -- A floating point constant: 2.3e10.
-    Function = { fg = c.blue }, -- Function name (also: methods for classes).
+    Function = { fg = c.light_blue }, -- Function name (also: methods for classes).
     Identifier = { fg = c.cyan }, -- Any variable name.
     Keyword = { fg = c.red }, -- Any other keyword.
     Label = { link = "Keyword" }, -- case, default, etc.
-    Macro = { fg = c.grey[6] }, -- Heavily used in rust.
+    Macro = { fg = c.grey[8] }, -- Heavily used in rust.
     Number = { link = "Constant" }, -- A number constant: 234, 0xff.
     Operator = { fg = c.red }, -- "sizeof", "+", "*", etc.
     PreCondit = { link = "Operator" }, --  preprocessor #if, #else, #endif, etc. (used in Makefile)
@@ -31,17 +31,17 @@ function M.get(c, o)
     SpecialKey = { fg = c.fluo }, -- Unprintable characters: text displayed differently from what it really is. Like pressing Ctrl + k in insert mode.
     Statement = { fg = c.purple }, -- Any statement.
     StorageClass = { fg = c.red }, -- Static, register, volatile, etc. (rust lifetimes)
-    String = { fg = c.sky_blue }, -- A string constant: "this is a string".
+    String = { fg = c.grey[9] }, -- A string constant: "this is a string".
     Structure = { link = "Type" }, -- A struct, union, enum, etc.
     Tag = { fg = c.bg_visual }, -- You can use CTRL-] on this. Like Help tag in fugitive.
     Type = { fg = c.light_blue }, -- Types like int, long, char, etc.
     Typedef = { link = "Type" }, -- A typedef.
-    Bold = { fg = c.grey[6], bold = true },
+    Bold = { fg = c.grey[8], bold = true },
 
     -- Git
-    Added = { bg = c.diff.add }, -- Added line in a diff.
-    Removed = { bg = c.diff.delete }, -- Removed line in a diff.
-    Changed = { bg = c.diff.change }, -- Changed line in a diff.
+    Added = { bg = c.diff.add },
+    Removed = { fg = c.git.delete, bg = c.diff.delete },
+    Changed = { fg = c.git.change, bg = c.diff.change },
 
     -- Todo
     Todo = { fg = c.todo, bg = c.comment },
@@ -49,6 +49,36 @@ function M.get(c, o)
     Note = { fg = c.note, bg = c.comment },
     Hack = { fg = c.hack, bg = c.comment },
     Warn = { fg = c.warning, bg = c.comment }, -- Anything that needs extra attention; mostly the keywords TODO FIXME and XXX.
+
+    -- LSP/Completion Kind Groups - Semantic code elements for completion plugins
+    -- These provide consistent, vibrant highlighting for LSP completion items across nvim-cmp, blink, etc.
+    -- Color mapping designed for maximum visual distinction in completion menus
+    FlowKindText = { fg = c.green }, -- Text completions
+    FlowKindMethod = { fg = c.yellow }, -- Methods - distinct from functions
+    FlowKindFunction = { fg = c.orange }, -- Functions
+    FlowKindConstructor = { fg = c.red }, -- Constructors
+    FlowKindField = { fg = c.cyan }, -- Object fields
+    FlowKindVariable = { fg = c.purple }, -- Variables
+    FlowKindClass = { fg = c.red }, -- Classes
+    FlowKindInterface = { fg = c.red }, -- Interfaces
+    FlowKindModule = { fg = c.blue }, -- Modules/namespaces
+    FlowKindProperty = { fg = c.cyan }, -- Properties
+    FlowKindUnit = { fg = c.purple }, -- Units
+    FlowKindValue = { fg = c.grey[9] }, -- Values
+    FlowKindEnum = { fg = c.red }, -- Enums
+    FlowKindKeyword = { fg = c.purple }, -- Keywords
+    FlowKindSnippet = { fg = c.green }, -- Snippets
+    FlowKindColor = { fg = c.purple }, -- Color values
+    FlowKindFile = { fg = c.blue }, -- Files
+    FlowKindReference = { fg = c.grey[8] }, -- References
+    FlowKindFolder = { fg = c.blue }, -- Folders
+    FlowKindEnumMember = { fg = c.red }, -- Enum members
+    FlowKindConstant = { fg = c.yellow }, -- Constants
+    FlowKindStruct = { fg = c.red }, -- Structs
+    FlowKindEvent = { fg = c.purple }, -- Events
+    FlowKindOperator = { fg = c.cyan }, -- Operators
+    FlowKindTypeParameter = { fg = c.grey[8] }, -- Type parameters
+    FlowKindType = { fg = c.light_blue }, -- Generic types
   }
 
   -- Special comments
diff --git a/lua/flow/highlights/telescope.lua b/lua/flow/highlights/telescope.lua
index c3d7d09..95d7ae5 100644
--- a/lua/flow/highlights/telescope.lua
+++ b/lua/flow/highlights/telescope.lua
@@ -19,14 +19,15 @@ function M.get(c, _)
     TelescopeMatching = { fg = c.blue, bold = true },
 
     TelescopePromptPrefix = { bg = c.transparent, fg = c.bg_visual },
+    TelescopeResultsSpecialComment = { link = "gitDate" }, -- example: date in telescope git branches.
 
     -- Titles
-    TelescopeResultsTitle = { bg = c.transparent, fg = c.fg_border },
+    TelescopeResultsTitle = { link = "FlowPluginTitle" },
     TelescopePromptTitle = { link = "TelescopeResultsTitle" },
     TelescopePreviewTitle = { link = "TelescopeResultsTitle" },
 
     -- Borders
-    TelescopeBorder = { bg = c.transparent, fg = c.fg_border, bold = true },
+    TelescopeBorder = { link = "Border" },
     TelescopePromptBorder = { link = "TelescopeBorder" },
     TelescopePreviewBorder = { link = "TelescopeBorder" },
     TelescopeResultsBorder = { link = "TelescopeBorder" },
diff --git a/lua/flow/highlights/treesitter.lua b/lua/flow/highlights/treesitter.lua
index f44556c..2337f27 100644
--- a/lua/flow/highlights/treesitter.lua
+++ b/lua/flow/highlights/treesitter.lua
@@ -73,7 +73,7 @@ function M.get(c, _)
 
     --- Functions
     ["@constructor"] = { fg = c.purple }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
-    ["@variable.parameter"] = { fg = c.yellow }, -- For parameters of a function.
+    ["@variable.parameter"] = { fg = c.grey[8] }, -- For parameters of a function.
     ["@variable.parameter.builtin"] = { fg = c.yellow }, -- For builtin parameters of a function, e.g. "..." or Smali's p[1-99]
 
     --- Keywords
@@ -118,7 +118,7 @@ function M.get(c, _)
     ["@lsp.type.number"] = { link = "@number" },
     ["@lsp.type.operator"] = { link = "@operator" },
     ["@lsp.type.parameter"] = { link = "@variable.parameter" },
-    ["@lsp.type.property"] = { link = "@property" },
+    -- ["@lsp.type.property"] = { link = "@property" },
     ["@lsp.type.selfKeyword"] = { link = "@variable.builtin" },
     ["@lsp.type.selfTypeKeyword"] = { link = "@variable.builtin" },
     ["@lsp.type.string"] = { link = "@string" },
@@ -144,12 +144,13 @@ function M.get(c, _)
     ["@lsp.typemod.variable.static"] = { link = "@constant" },
 
     -- Golang
-    ["@module.go"] = { fg = c.cyan },
+    ["@module.go"] = { fg = c.blue },
     ["@keyword.function.go"] = { link = "Statement" },
     ["@lsp.type.namespace.go"] = { link = "@module.go" },
 
     -- Rust
-    -- ["@lsp.type.enumMembers.rust"] = { fg = colors.grey[6] },
+    -- ["@lsp.type.enumMembers.rust"] = { fg = colors.grey[8] },
+    ["@lsp.type.namespace.rust"] = { fg = c.blue },
 
     -- YAML
     ["@property.yaml"] = { fg = c.yellow },
diff --git a/lua/flow/highlights/undotree.lua b/lua/flow/highlights/undotree.lua
index dad81e6..2f70719 100644
--- a/lua/flow/highlights/undotree.lua
+++ b/lua/flow/highlights/undotree.lua
@@ -6,7 +6,7 @@ function M.get(c, _)
   local theme = {
     UndotreeTimeStamp = { fg = c.fg },
     UndotreeNode = { fg = c.cyan },
-    UndotreeBranch = { fg = c.grey[5] },
+    UndotreeBranch = { fg = c.grey[7] },
   }
 
   return theme
diff --git a/lua/flow/highlights/vim-highlighturl.lua b/lua/flow/highlights/vim-highlighturl.lua
new file mode 100644
index 0000000..b620d78
--- /dev/null
+++ b/lua/flow/highlights/vim-highlighturl.lua
@@ -0,0 +1,13 @@
+local M = {}
+
+--- @param c table: The available colors.
+--- @return table:
+function M.get(c, _)
+  local theme = {
+    HighlightUrl = { fg = c.grey[8], undercurl = true },
+  }
+
+  return theme
+end
+
+return M
diff --git a/lua/flow/highlights/whichkey.lua b/lua/flow/highlights/whichkey.lua
index ddb92e6..5deba2b 100644
--- a/lua/flow/highlights/whichkey.lua
+++ b/lua/flow/highlights/whichkey.lua
@@ -8,8 +8,8 @@ function M.get(c, _)
     WhichKeyGroup = { fg = c.light_blue },
     WhichKeyDesc = { fg = c.fg_popup },
     WhichKeyFloat = { bg = c.bg_popup },
-    WhichKeyBorder = { fg = c.fg_border }, -- Popup border: requires border to be activated in the plugin.
-    WhichKeyTitle = { fg = c.fb_border },
+    WhichKeyBorder = { link = "FloatBorder" },
+    WhichKeyTitle = { link = "FlowPluginTitle" },
   }
 
   return theme
diff --git a/lua/flow/highlights/winbar.lua b/lua/flow/highlights/winbar.lua
new file mode 100644
index 0000000..6591b18
--- /dev/null
+++ b/lua/flow/highlights/winbar.lua
@@ -0,0 +1,15 @@
+local M = {}
+
+--- @param c table: The available colors.
+--- @return table: WinBar highlights.
+function M.get(c, _)
+  local theme = {
+    WinBarSpecial = { fg = c.blue },
+    WinBarFile = { fg = c.cyan },
+    WinBarPath = { fg = c.comment },
+  }
+
+  return theme
+end
+
+return M
diff --git a/lua/flow/palette.lua b/lua/flow/palette.lua
index be1fd48..0df88e3 100644
--- a/lua/flow/palette.lua
+++ b/lua/flow/palette.lua
@@ -49,6 +49,10 @@ function M.get(o)
     orange = 25,
   }
 
+  -- Get the configured fluo color
+  local configured_fluo = (o.colors and o.colors.fluo) or "pink"
+  local fluo_hue_value = fluo_hue[configured_fluo]
+
   local palette = {
     -- Transparent color
     transparent = "NONE",
@@ -62,12 +66,32 @@ function M.get(o)
       [1] = hsl(203, 20, 10), -- Very dark grey
       [2] = hsl(203, 20, 13),
       [3] = hsl(203, 20, 15),
-      [4] = hsl(203, 20, 29),
-      [5] = hsl(203, 20, 35),
-      [6] = hsl(203, 20, 65),
-      [7] = hsl(203, 20, 85),
-      [8] = hsl(203, 20, 88),
-      [9] = hsl(203, 20, 90), -- Very light grey
+      [4] = hsl(203, 12, 18),
+      [5] = hsl(203, 15, 24),
+      [6] = hsl(203, 20, 29),
+      [7] = hsl(203, 20, 50),
+      [8] = hsl(203, 20, 65),
+      [9] = hsl(203, 20, 85),
+      [10] = hsl(203, 20, 88),
+      [11] = hsl(203, 20, 90), -- Very light grey
+    },
+
+    -- CursorLine background - uses configured fluo color hue
+    cursorline_bg = {
+      dark = hsl(fluo_hue_value, 20, 13),  -- For dark theme
+      light = hsl(fluo_hue_value, 20, 87), -- For light theme
+    },
+
+    -- Visual selection background - uses configured fluo color hue
+    visual_bg = {
+      dark = hsl(fluo_hue_value, 90, 23),  -- For dark theme
+      light = hsl(fluo_hue_value, 90, 77), -- For light theme (inverted lightness)
+    },
+
+    -- Float window colors
+    float_bg = {
+      dark = hsl(203, 20, 18),  -- For dark theme
+      light = hsl(203, 20, 82), -- For light theme (inverted lightness)
     },
 
     -- Fluorescent colors
diff --git a/lua/flow/theme.lua b/lua/flow/theme.lua
index 6de9f7b..f573b9d 100644
--- a/lua/flow/theme.lua
+++ b/lua/flow/theme.lua
@@ -14,19 +14,24 @@ M.active_highlights = {
   "dap",
   "diagnostic",
   "flash",
+  "fzf-lua",
   "git",
   "ibl",
   "lazy",
   "lsp",
   "mini-hipatterns",
+  "mini-files",
   "oil",
   "render-markdown",
+  "statusline",
   "telescope",
   "todo-comments",
   "treesitter",
   "trouble",
   "whichkey",
+  "winbar",
   "undotree",
+  "vim-highlighturl",
   "mason",
   "avante",
 }
@@ -53,6 +58,8 @@ function M.configure()
     highlights = util.merge(highlights, hi)
   end
 
+  vim.api.nvim_set_hl(0, "@lsp.type.property.lua", {})
+
   -- util.autocmds()
 
   return highlights