diff --git a/AGENTS.md b/AGENTS.md index e5eefa4d..7385e9c0 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -105,7 +105,7 @@ Exceptions are allowed for migration and package-helper scripts where the helper - `config/` - default configs copied to `~/.config/` - `default/themed/*.tpl` - templates with `{{ variable }}` placeholders for theme colors -- `themes/*/colors.toml` - theme color definitions (accent, bg, fg, red/green/yellow/blue/magenta/cyan and bright_* variants) +- `themes/*/colors.toml` - theme color definitions (accent, background, foreground, red/green/yellow/blue/magenta/cyan and bright_* variants) # Tests diff --git a/bin/omarchy-dev-theme-preview b/bin/omarchy-dev-theme-preview index 3c6c14bc..fa6946a2 100755 --- a/bin/omarchy-dev-theme-preview +++ b/bin/omarchy-dev-theme-preview @@ -111,7 +111,7 @@ load_colors() { # Plus the core slots every theme resolves, so sparse and legacy themes # still render a complete preview. - for key in mode bg fg light_fg bright_fg selection_background selection_foreground dark_bg darker_bg; do + for key in mode background foreground light_foreground bright_foreground selection_background selection_foreground dark_background darker_background; do [[ -n ${resolved[$key]:-} ]] && COLORS[$key]="${resolved[$key]}" done @@ -220,7 +220,7 @@ print_color_row() { paint_segment() { local text="$1" local fg="$2" - local bg="${3:-${COLORS[bg]}}" + local bg="${3:-${COLORS[background]}}" if (( COLOR_OUTPUT )) && hex_valid "$fg" && hex_valid "$bg"; then ansi_bg "$bg" @@ -244,8 +244,8 @@ print_group() { } print_selection_sample() { - local bg="${COLORS[bg]}" - local fg="${COLORS[fg]}" + local bg="${COLORS[background]}" + local fg="${COLORS[foreground]}" local selection_bg="${COLORS[selection_background]}" local selection_fg="${COLORS[selection_foreground]}" @@ -272,7 +272,7 @@ print_selection_sample() { print_practical_samples() { printf '\nTerminal/UI samples\n' printf ' ' - paint_segment ' normal text ' "${COLORS[fg]}" + paint_segment ' normal text ' "${COLORS[foreground]}" paint_segment ' muted/comment ' "${COLORS[muted]}" paint_segment ' accent/link ' "${COLORS[accent]}" paint_segment ' error ' "${COLORS[red]}" @@ -285,13 +285,13 @@ print_practical_samples() { paint_segment ' function() ' "${COLORS[blue]}" paint_segment ' --flag ' "${COLORS[magenta]}" printf '\n ' - paint_segment ' unselected menu row ' "${COLORS[fg]}" + paint_segment ' unselected menu row ' "${COLORS[foreground]}" printf '\n ' paint_segment ' selected menu row ' "${COLORS[selection_foreground]}" "${COLORS[selection_background]}" printf '\n ' - paint_segment ' status/inverse ' "${COLORS[bg]}" "${COLORS[fg]}" - paint_segment ' inactive surface ' "${COLORS[fg]}" "${COLORS[lighter_bg]}" - paint_segment ' urgent ' "${COLORS[bg]}" "${COLORS[red]}" + paint_segment ' status/inverse ' "${COLORS[background]}" "${COLORS[foreground]}" + paint_segment ' inactive surface ' "${COLORS[foreground]}" "${COLORS[lighter_background]}" + paint_segment ' urgent ' "${COLORS[background]}" "${COLORS[red]}" printf '\n' } @@ -313,8 +313,8 @@ print_palette_strip() { print_ansi_palette() { printf '\nANSI palette strips\n' - print_palette_strip normal bg red green yellow blue magenta cyan fg - print_palette_strip bright muted bright_red bright_green bright_yellow bright_blue bright_magenta bright_cyan bright_fg + print_palette_strip normal background red green yellow blue magenta cyan foreground + print_palette_strip bright muted bright_red bright_green bright_yellow bright_blue bright_magenta bright_cyan bright_foreground } mix_hex() { @@ -369,7 +369,7 @@ print_neutral_ramp() { local direction sort_flag key hex score entry local -a keys entries sorted - keys=(darker_bg dark_bg bg lighter_bg selection muted dark_fg fg light_fg bright_fg) + keys=(darker_background dark_background background lighter_background selection muted dark_foreground foreground light_foreground bright_foreground) if [[ $mode == "light" ]]; then direction="lightest -> darkest" sort_flag="-rn" @@ -425,15 +425,15 @@ apply_terminal_osc printf 'Theme: %s\n' "$theme_label" printf 'File: %s\n' "$colors_file" printf 'Mode: %s\n' "$mode" -if [[ ${COLORS[fg]} =~ ^#[0-9A-Fa-f]{6}$ && ${COLORS[bg]} =~ ^#[0-9A-Fa-f]{6}$ ]]; then - printf 'fg/bg contrast: %s:1\n' "$(contrast_ratio "${COLORS[fg]}" "${COLORS[bg]}")" +if [[ ${COLORS[foreground]} =~ ^#[0-9A-Fa-f]{6}$ && ${COLORS[background]} =~ ^#[0-9A-Fa-f]{6}$ ]]; then + printf 'foreground/background contrast: %s:1\n' "$(contrast_ratio "${COLORS[foreground]}" "${COLORS[background]}")" fi -print_gradient bg bright_fg +print_gradient background bright_foreground print_neutral_ramp "$mode" -print_group "Foundation" bg fg accent selection +print_group "Foundation" background foreground accent selection print_selection_sample print_practical_samples print_ansi_palette print_group "Normal colors" red yellow orange green cyan blue magenta brown -print_group "Bright colors" bright_red bright_yellow bright_green bright_cyan bright_blue bright_magenta bright_fg +print_group "Bright colors" bright_red bright_yellow bright_green bright_cyan bright_blue bright_magenta bright_foreground diff --git a/bin/omarchy-plymouth-set-by-theme b/bin/omarchy-plymouth-set-by-theme index b2edab11..95fccffc 100755 --- a/bin/omarchy-plymouth-set-by-theme +++ b/bin/omarchy-plymouth-set-by-theme @@ -51,7 +51,7 @@ theme_color() { ' "$theme_dir/colors.toml" } -bg=$(theme_color background bg) -text=$(theme_color foreground fg) +bg=$(theme_color background) +text=$(theme_color foreground) exec omarchy-plymouth-set "$bg" "$text" "$theme_dir/unlock.png" diff --git a/bin/omarchy-theme-color b/bin/omarchy-theme-color index fdc08e0c..b4491f06 100755 --- a/bin/omarchy-theme-color +++ b/bin/omarchy-theme-color @@ -125,8 +125,8 @@ resolve_theme_mode() { if [[ -f $COLORS_DIR/light.mode ]]; then THEME_COLORS[mode]="light" - elif [[ ${THEME_COLORS[bg]} =~ ^#[0-9A-Fa-f]{6}$ ]]; then - bg_hex="${THEME_COLORS[bg]#\#}" + elif [[ ${THEME_COLORS[background]} =~ ^#[0-9A-Fa-f]{6}$ ]]; then + bg_hex="${THEME_COLORS[background]#\#}" lum=$(( $(printf "%d" "0x${bg_hex:0:2}") + $(printf "%d" "0x${bg_hex:2:2}") + $(printf "%d" "0x${bg_hex:4:2}") )) (( lum > 382 )) && THEME_COLORS[mode]="light" || THEME_COLORS[mode]="dark" else @@ -161,17 +161,12 @@ parse_colors_file() { resolve_theme_colors() { local key - # Canonical palette keys are bg/fg. Preserve older themes that still define - # background/foreground by treating those semantic values as the source of - # truth, then expose the old names as aliases for legacy consumers. - [[ ${THEME_COLORS[background]} ]] && THEME_COLORS[bg]="${THEME_COLORS[background]}" - [[ ${THEME_COLORS[foreground]} ]] && THEME_COLORS[fg]="${THEME_COLORS[foreground]}" - [[ ${THEME_COLORS[bg]} ]] || THEME_COLORS[bg]="${THEME_COLORS[color0]}" - [[ ${THEME_COLORS[fg]} ]] || THEME_COLORS[fg]="${THEME_COLORS[color7]}" - [[ ${THEME_COLORS[bg]} ]] && THEME_COLORS[background]="${THEME_COLORS[bg]}" - [[ ${THEME_COLORS[fg]} ]] && THEME_COLORS[foreground]="${THEME_COLORS[fg]}" - [[ ${THEME_COLORS[bg]} ]] && THEME_COLORS[color0]="${THEME_COLORS[bg]}" - [[ ${THEME_COLORS[fg]} ]] && THEME_COLORS[color7]="${THEME_COLORS[fg]}" + # Canonical palette keys are background/foreground. Themes generated before + # the semantic palette existed may only define the ANSI names. + [[ ${THEME_COLORS[background]} ]] || THEME_COLORS[background]="${THEME_COLORS[color0]}" + [[ ${THEME_COLORS[foreground]} ]] || THEME_COLORS[foreground]="${THEME_COLORS[color7]}" + [[ ${THEME_COLORS[background]} ]] && THEME_COLORS[color0]="${THEME_COLORS[background]}" + [[ ${THEME_COLORS[foreground]} ]] && THEME_COLORS[color7]="${THEME_COLORS[foreground]}" # Legacy compatibility: map ANSI color0..color15 to semantic names. declare -A legacy_alias=( @@ -194,21 +189,21 @@ resolve_theme_colors() { alias_theme_color magenta purple alias_theme_color bright_magenta bright_purple - [[ ${THEME_COLORS[light_fg]} ]] || THEME_COLORS[light_fg]="${THEME_COLORS[color7]:-${THEME_COLORS[fg]}}" - [[ ${THEME_COLORS[bright_fg]} ]] || THEME_COLORS[bright_fg]="${THEME_COLORS[color15]:-${THEME_COLORS[fg]}}" - THEME_COLORS[cursor]="${THEME_COLORS[bright_fg]}" - [[ ${THEME_COLORS[lighter_bg]} ]] || THEME_COLORS[lighter_bg]="${THEME_COLORS[color0]:-${THEME_COLORS[bg]}}" - [[ ${THEME_COLORS[dark_fg]} ]] || THEME_COLORS[dark_fg]="${THEME_COLORS[color8]:-${THEME_COLORS[fg]}}" - [[ ${THEME_COLORS[muted]} ]] || THEME_COLORS[muted]="${THEME_COLORS[color8]:-${THEME_COLORS[dark_fg]}}" - [[ ${THEME_COLORS[selection]} ]] || THEME_COLORS[selection]="${THEME_COLORS[selection_background]:-${THEME_COLORS[color8]:-${THEME_COLORS[color0]:-${THEME_COLORS[bg]}}}}" + [[ ${THEME_COLORS[light_foreground]} ]] || THEME_COLORS[light_foreground]="${THEME_COLORS[color7]:-${THEME_COLORS[foreground]}}" + [[ ${THEME_COLORS[bright_foreground]} ]] || THEME_COLORS[bright_foreground]="${THEME_COLORS[color15]:-${THEME_COLORS[foreground]}}" + THEME_COLORS[cursor]="${THEME_COLORS[bright_foreground]}" + [[ ${THEME_COLORS[lighter_background]} ]] || THEME_COLORS[lighter_background]="${THEME_COLORS[color0]:-${THEME_COLORS[background]}}" + [[ ${THEME_COLORS[dark_foreground]} ]] || THEME_COLORS[dark_foreground]="${THEME_COLORS[color8]:-${THEME_COLORS[foreground]}}" + [[ ${THEME_COLORS[muted]} ]] || THEME_COLORS[muted]="${THEME_COLORS[color8]:-${THEME_COLORS[dark_foreground]}}" + [[ ${THEME_COLORS[selection]} ]] || THEME_COLORS[selection]="${THEME_COLORS[selection_background]:-${THEME_COLORS[color8]:-${THEME_COLORS[color0]:-${THEME_COLORS[background]}}}}" [[ ${THEME_COLORS[selection_background]} ]] || THEME_COLORS[selection_background]="${THEME_COLORS[selection]}" - [[ ${THEME_COLORS[selection_foreground]} ]] || THEME_COLORS[selection_foreground]="${THEME_COLORS[bright_fg]}" + [[ ${THEME_COLORS[selection_foreground]} ]] || THEME_COLORS[selection_foreground]="${THEME_COLORS[bright_foreground]}" [[ ${THEME_COLORS[orange]} ]] || THEME_COLORS[orange]="${THEME_COLORS[yellow]}" [[ ${THEME_COLORS[brown]} ]] || THEME_COLORS[brown]=$(mix_color "${THEME_COLORS[orange]}" "#000000" 50%) # Auto-derive shades from base accents when not defined and not aliased from colorN - [[ ${THEME_COLORS[dark_bg]} ]] || THEME_COLORS[dark_bg]=$(mix_color "${THEME_COLORS[bg]}" "#000000" 25%) - [[ ${THEME_COLORS[darker_bg]} ]] || THEME_COLORS[darker_bg]=$(mix_color "${THEME_COLORS[bg]}" "#000000" 50%) + [[ ${THEME_COLORS[dark_background]} ]] || THEME_COLORS[dark_background]=$(mix_color "${THEME_COLORS[background]}" "#000000" 25%) + [[ ${THEME_COLORS[darker_background]} ]] || THEME_COLORS[darker_background]=$(mix_color "${THEME_COLORS[background]}" "#000000" 50%) [[ ${THEME_COLORS[bright_red]} ]] || THEME_COLORS[bright_red]=$(mix_color "${THEME_COLORS[red]}" "#ffffff" 20%) [[ ${THEME_COLORS[bright_yellow]} ]] || THEME_COLORS[bright_yellow]=$(mix_color "${THEME_COLORS[yellow]}" "#ffffff" 20%) [[ ${THEME_COLORS[bright_green]} ]] || THEME_COLORS[bright_green]=$(mix_color "${THEME_COLORS[green]}" "#ffffff" 20%) @@ -221,14 +216,14 @@ resolve_theme_colors() { # Keep semantic themes compatible with consumers that still reference the # legacy ANSI names directly. declare -A ansi_alias=( - [color0]=bg + [color0]=background [color1]=red [color2]=green [color3]=yellow [color4]=blue [color5]=magenta [color6]=cyan - [color7]=fg + [color7]=foreground [color8]=muted [color9]=bright_red [color10]=bright_green @@ -236,7 +231,7 @@ resolve_theme_colors() { [color12]=bright_blue [color13]=bright_magenta [color14]=bright_cyan - [color15]=bright_fg + [color15]=bright_foreground ) for key in "${!ansi_alias[@]}"; do alias_theme_color "$key" "${ansi_alias[$key]}" diff --git a/bin/omarchy-theme-colors-from-alacritty b/bin/omarchy-theme-colors-from-alacritty index 02137f8e..7a54e732 100755 --- a/bin/omarchy-theme-colors-from-alacritty +++ b/bin/omarchy-theme-colors-from-alacritty @@ -129,8 +129,8 @@ cat > "$COLORS_OUTPUT" < background = "#1a1b26" -# background = "{{ bg_strip }}" -> background = "1a1b26" -# background = "rgb({{ bg_rgb }})" -> background = "rgb(26,27,38)" +# background = "{{ background }}" -> background = "#1a1b26" +# background = "{{ background_strip }}" -> background = "1a1b26" +# background = "rgb({{ background_rgb }})" -> background = "rgb(26,27,38)" # # --------------------------------------------------------------------------- [colors.primary] -background = "{{ bg }}" -foreground = "{{ fg }}" +background = "{{ background }}" +foreground = "{{ foreground }}" [colors.cursor] -text = "{{ bg }}" -cursor = "{{ bright_fg }}" +text = "{{ background }}" +cursor = "{{ bright_foreground }}" [colors.vi_mode_cursor] -text = "{{ bg }}" -cursor = "{{ bright_fg }}" +text = "{{ background }}" +cursor = "{{ bright_foreground }}" [colors.search.matches] -foreground = "{{ bg }}" +foreground = "{{ background }}" background = "{{ yellow }}" [colors.search.focused_match] -foreground = "{{ bg }}" +foreground = "{{ background }}" background = "{{ red }}" [colors.footer_bar] -foreground = "{{ bg }}" -background = "{{ fg }}" +foreground = "{{ background }}" +background = "{{ foreground }}" [colors.selection] text = "{{ selection_foreground }}" background = "{{ selection_background }}" [colors.normal] -black = "{{ bg }}" +black = "{{ background }}" red = "{{ red }}" green = "{{ green }}" yellow = "{{ yellow }}" blue = "{{ blue }}" magenta = "{{ magenta }}" cyan = "{{ cyan }}" -white = "{{ fg }}" +white = "{{ foreground }}" [colors.bright] black = "{{ muted }}" @@ -88,4 +88,4 @@ yellow = "{{ bright_yellow }}" blue = "{{ bright_blue }}" magenta = "{{ bright_magenta }}" cyan = "{{ bright_cyan }}" -white = "{{ bright_fg }}" +white = "{{ bright_foreground }}" diff --git a/default/themed/alacritty.toml.tpl b/default/themed/alacritty.toml.tpl index b043aea5..4457a23e 100644 --- a/default/themed/alacritty.toml.tpl +++ b/default/themed/alacritty.toml.tpl @@ -1,40 +1,40 @@ [colors.primary] -background = "{{ bg }}" -foreground = "{{ fg }}" +background = "{{ background }}" +foreground = "{{ foreground }}" [colors.cursor] -text = "{{ bg }}" -cursor = "{{ bright_fg }}" +text = "{{ background }}" +cursor = "{{ bright_foreground }}" [colors.vi_mode_cursor] -text = "{{ bg }}" -cursor = "{{ bright_fg }}" +text = "{{ background }}" +cursor = "{{ bright_foreground }}" [colors.search.matches] -foreground = "{{ bg }}" +foreground = "{{ background }}" background = "{{ yellow }}" [colors.search.focused_match] -foreground = "{{ bg }}" +foreground = "{{ background }}" background = "{{ red }}" [colors.footer_bar] -foreground = "{{ bg }}" -background = "{{ fg }}" +foreground = "{{ background }}" +background = "{{ foreground }}" [colors.selection] text = "{{ selection_foreground }}" background = "{{ selection_background }}" [colors.normal] -black = "{{ bg }}" +black = "{{ background }}" red = "{{ red }}" green = "{{ green }}" yellow = "{{ yellow }}" blue = "{{ blue }}" magenta = "{{ magenta }}" cyan = "{{ cyan }}" -white = "{{ fg }}" +white = "{{ foreground }}" [colors.bright] black = "{{ muted }}" @@ -44,4 +44,4 @@ yellow = "{{ bright_yellow }}" blue = "{{ bright_blue }}" magenta = "{{ bright_magenta }}" cyan = "{{ bright_cyan }}" -white = "{{ bright_fg }}" +white = "{{ bright_foreground }}" diff --git a/default/themed/btop.theme.tpl b/default/themed/btop.theme.tpl index 69fa7f77..3cc2d772 100644 --- a/default/themed/btop.theme.tpl +++ b/default/themed/btop.theme.tpl @@ -1,11 +1,11 @@ # Main background, empty for terminal default, need to be empty if you want transparent background -theme[main_bg]="{{ bg }}" +theme[main_bg]="{{ background }}" # Main text color -theme[main_fg]="{{ fg }}" +theme[main_fg]="{{ foreground }}" # Title color for boxes -theme[title]="{{ fg }}" +theme[title]="{{ foreground }}" # Highlight color for keyboard shortcuts theme[hi_fg]="{{ accent }}" @@ -20,13 +20,13 @@ theme[selected_fg]="{{ accent }}" theme[inactive_fg]="{{ muted }}" # Color of text appearing on top of graphs, i.e uptime and current network graph scaling -theme[graph_text]="{{ light_fg }}" +theme[graph_text]="{{ light_foreground }}" # Background color of the percentage meters theme[meter_bg]="{{ selection }}" # Misc colors for processes box including mini cpu graphs, details memory graph and details status text -theme[proc_misc]="{{ light_fg }}" +theme[proc_misc]="{{ light_foreground }}" # CPU, Memory, Network, Proc box outline colors theme[cpu_box]="{{ magenta }}" @@ -83,11 +83,11 @@ theme[process_mid]="{{ blue }}" theme[process_end]="{{ magenta }}" # Graph gradient colors (spectrum shades from background to foreground) -theme[gradient_color_0]="{{ bg }}" -theme[gradient_color_1]="{{ lighter_bg }}" +theme[gradient_color_0]="{{ background }}" +theme[gradient_color_1]="{{ lighter_background }}" theme[gradient_color_2]="{{ selection }}" theme[gradient_color_3]="{{ muted }}" -theme[gradient_color_4]="{{ dark_fg }}" -theme[gradient_color_5]="{{ fg }}" -theme[gradient_color_6]="{{ light_fg }}" -theme[gradient_color_7]="{{ bright_fg }}" +theme[gradient_color_4]="{{ dark_foreground }}" +theme[gradient_color_5]="{{ foreground }}" +theme[gradient_color_6]="{{ light_foreground }}" +theme[gradient_color_7]="{{ bright_foreground }}" diff --git a/default/themed/chromium.theme.tpl b/default/themed/chromium.theme.tpl index 5b751b83..84059b28 100644 --- a/default/themed/chromium.theme.tpl +++ b/default/themed/chromium.theme.tpl @@ -1 +1 @@ -{{ bg_rgb }} +{{ background_rgb }} diff --git a/default/themed/foot.ini.tpl b/default/themed/foot.ini.tpl index 9a455301..a3764b20 100644 --- a/default/themed/foot.ini.tpl +++ b/default/themed/foot.ini.tpl @@ -1,19 +1,19 @@ [colors-dark] -foreground={{ fg_strip }} -background={{ bg_strip }} +foreground={{ foreground_strip }} +background={{ background_strip }} selection-foreground={{ selection_foreground_strip }} selection-background={{ selection_background_strip }} -cursor={{ bg_strip }} {{ bright_fg_strip }} +cursor={{ background_strip }} {{ bright_foreground_strip }} -regular0={{ bg_strip }} +regular0={{ background_strip }} regular1={{ red_strip }} regular2={{ green_strip }} regular3={{ yellow_strip }} regular4={{ blue_strip }} regular5={{ purple_strip }} regular6={{ cyan_strip }} -regular7={{ fg_strip }} +regular7={{ foreground_strip }} bright0={{ muted_strip }} bright1={{ bright_red_strip }} @@ -22,4 +22,4 @@ bright3={{ bright_yellow_strip }} bright4={{ bright_blue_strip }} bright5={{ bright_magenta_strip }} bright6={{ bright_cyan_strip }} -bright7={{ bright_fg_strip }} +bright7={{ bright_foreground_strip }} diff --git a/default/themed/ghostty.conf.tpl b/default/themed/ghostty.conf.tpl index 9761d3df..12cd5339 100644 --- a/default/themed/ghostty.conf.tpl +++ b/default/themed/ghostty.conf.tpl @@ -1,17 +1,17 @@ -background = {{ bg }} -foreground = {{ fg }} -cursor-color = {{ bright_fg }} +background = {{ background }} +foreground = {{ foreground }} +cursor-color = {{ bright_foreground }} selection-background = {{ selection_background }} selection-foreground = {{ selection_foreground }} -palette = 0={{ bg }} +palette = 0={{ background }} palette = 1={{ red }} palette = 2={{ green }} palette = 3={{ yellow }} palette = 4={{ blue }} palette = 5={{ magenta }} palette = 6={{ cyan }} -palette = 7={{ fg }} +palette = 7={{ foreground }} palette = 8={{ muted }} palette = 9={{ bright_red }} palette = 10={{ bright_green }} @@ -19,4 +19,4 @@ palette = 11={{ bright_yellow }} palette = 12={{ bright_blue }} palette = 13={{ bright_magenta }} palette = 14={{ bright_cyan }} -palette = 15={{ bright_fg }} +palette = 15={{ bright_foreground }} diff --git a/default/themed/gum_env.lua.tpl b/default/themed/gum_env.lua.tpl index f48c5720..81f4c7bc 100644 --- a/default/themed/gum_env.lua.tpl +++ b/default/themed/gum_env.lua.tpl @@ -1,137 +1,137 @@ -- Gum Style (generic) Variables -hl.env("FOREGROUND", "{{ fg }}") -hl.env("BACKGROUND", "{{ bg }}") +hl.env("FOREGROUND", "{{ foreground }}") +hl.env("BACKGROUND", "{{ background }}") hl.env("BORDER_FOREGROUND", "{{ accent }}") -hl.env("BORDER_BACKGROUND", "{{ bg }}") +hl.env("BORDER_BACKGROUND", "{{ background }}") -- Gum Confirm Style Variables hl.env("GUM_CONFIRM_PROMPT_FOREGROUND", "{{ accent }}") -hl.env("GUM_CONFIRM_PROMPT_BACKGROUND", "{{ bg }}") +hl.env("GUM_CONFIRM_PROMPT_BACKGROUND", "{{ background }}") hl.env("GUM_CONFIRM_SELECTED_FOREGROUND", "{{ selection_foreground }}") hl.env("GUM_CONFIRM_SELECTED_BACKGROUND", "{{ selection_background }}") -hl.env("GUM_CONFIRM_UNSELECTED_FOREGROUND", "{{ fg }}") -hl.env("GUM_CONFIRM_UNSELECTED_BACKGROUND", "{{ bg }}") +hl.env("GUM_CONFIRM_UNSELECTED_FOREGROUND", "{{ foreground }}") +hl.env("GUM_CONFIRM_UNSELECTED_BACKGROUND", "{{ background }}") -- Gum Input Style Variables hl.env("GUM_INPUT_PROMPT_FOREGROUND", "{{ accent }}") -hl.env("GUM_INPUT_PROMPT_BACKGROUND", "{{ bg }}") +hl.env("GUM_INPUT_PROMPT_BACKGROUND", "{{ background }}") hl.env("GUM_INPUT_PLACEHOLDER_FOREGROUND", "{{ muted }}") -hl.env("GUM_INPUT_PLACEHOLDER_BACKGROUND", "{{ bg }}") -hl.env("GUM_INPUT_CURSOR_FOREGROUND", "{{ bright_fg }}") -hl.env("GUM_INPUT_CURSOR_BACKGROUND", "{{ bg }}") -hl.env("GUM_INPUT_HEADER_FOREGROUND", "{{ fg }}") -hl.env("GUM_INPUT_HEADER_BACKGROUND", "{{ bg }}") +hl.env("GUM_INPUT_PLACEHOLDER_BACKGROUND", "{{ background }}") +hl.env("GUM_INPUT_CURSOR_FOREGROUND", "{{ bright_foreground }}") +hl.env("GUM_INPUT_CURSOR_BACKGROUND", "{{ background }}") +hl.env("GUM_INPUT_HEADER_FOREGROUND", "{{ foreground }}") +hl.env("GUM_INPUT_HEADER_BACKGROUND", "{{ background }}") -- Gum Choose Style Variables hl.env("GUM_CHOOSE_CURSOR_FOREGROUND", "{{ accent }}") -hl.env("GUM_CHOOSE_CURSOR_BACKGROUND", "{{ bg }}") -hl.env("GUM_CHOOSE_HEADER_FOREGROUND", "{{ fg }}") -hl.env("GUM_CHOOSE_HEADER_BACKGROUND", "{{ bg }}") -hl.env("GUM_CHOOSE_ITEM_FOREGROUND", "{{ fg }}") -hl.env("GUM_CHOOSE_ITEM_BACKGROUND", "{{ bg }}") +hl.env("GUM_CHOOSE_CURSOR_BACKGROUND", "{{ background }}") +hl.env("GUM_CHOOSE_HEADER_FOREGROUND", "{{ foreground }}") +hl.env("GUM_CHOOSE_HEADER_BACKGROUND", "{{ background }}") +hl.env("GUM_CHOOSE_ITEM_FOREGROUND", "{{ foreground }}") +hl.env("GUM_CHOOSE_ITEM_BACKGROUND", "{{ background }}") hl.env("GUM_CHOOSE_SELECTED_FOREGROUND", "{{ selection_foreground }}") hl.env("GUM_CHOOSE_SELECTED_BACKGROUND", "{{ selection_background }}") -- Gum Filter Style Variables hl.env("GUM_FILTER_PROMPT_FOREGROUND", "{{ accent }}") -hl.env("GUM_FILTER_PROMPT_BACKGROUND", "{{ bg }}") -hl.env("GUM_FILTER_TEXT_FOREGROUND", "{{ fg }}") -hl.env("GUM_FILTER_TEXT_BACKGROUND", "{{ bg }}") +hl.env("GUM_FILTER_PROMPT_BACKGROUND", "{{ background }}") +hl.env("GUM_FILTER_TEXT_FOREGROUND", "{{ foreground }}") +hl.env("GUM_FILTER_TEXT_BACKGROUND", "{{ background }}") hl.env("GUM_FILTER_MATCH_FOREGROUND", "{{ accent }}") -hl.env("GUM_FILTER_CURSOR_TEXT_FOREGROUND", "{{ bright_fg }}") -hl.env("GUM_FILTER_CURSOR_TEXT_BACKGROUND", "{{ bg }}") +hl.env("GUM_FILTER_CURSOR_TEXT_FOREGROUND", "{{ bright_foreground }}") +hl.env("GUM_FILTER_CURSOR_TEXT_BACKGROUND", "{{ background }}") hl.env("GUM_FILTER_SELECTED_FOREGROUND", "{{ selection_foreground }}") hl.env("GUM_FILTER_SELECTED_BACKGROUND", "{{ selection_background }}") hl.env("GUM_FILTER_INDICATOR_FOREGROUND", "{{ accent }}") -hl.env("GUM_FILTER_HEADER_FOREGROUND", "{{ fg }}") -hl.env("GUM_FILTER_MATCH_BACKGROUND", "{{ bg }}") -hl.env("GUM_FILTER_HEADER_BACKGROUND", "{{ bg }}") +hl.env("GUM_FILTER_HEADER_FOREGROUND", "{{ foreground }}") +hl.env("GUM_FILTER_MATCH_BACKGROUND", "{{ background }}") +hl.env("GUM_FILTER_HEADER_BACKGROUND", "{{ background }}") hl.env("GUM_FILTER_PLACEHOLDER_FOREGROUND", "{{ muted }}") -hl.env("GUM_FILTER_PLACEHOLDER_BACKGROUND", "{{ bg }}") -hl.env("GUM_FILTER_INDICATOR_BACKGROUND", "{{ bg }}") +hl.env("GUM_FILTER_PLACEHOLDER_BACKGROUND", "{{ background }}") +hl.env("GUM_FILTER_INDICATOR_BACKGROUND", "{{ background }}") hl.env("GUM_FILTER_SELECTED_PREFIX_FOREGROUND", "{{ selection_foreground }}") hl.env("GUM_FILTER_SELECTED_PREFIX_BACKGROUND", "{{ selection_background }}") hl.env("GUM_FILTER_UNSELECTED_PREFIX_FOREGROUND", "{{ muted }}") -hl.env("GUM_FILTER_UNSELECTED_PREFIX_BACKGROUND", "{{ bg }}") +hl.env("GUM_FILTER_UNSELECTED_PREFIX_BACKGROUND", "{{ background }}") -- Gum Table Style Variables -hl.env("GUM_TABLE_HEADER_FOREGROUND", "{{ fg }}") -hl.env("GUM_TABLE_HEADER_BACKGROUND", "{{ bg }}") -hl.env("GUM_TABLE_CELL_FOREGROUND", "{{ fg }}") -hl.env("GUM_TABLE_CELL_BACKGROUND", "{{ bg }}") +hl.env("GUM_TABLE_HEADER_FOREGROUND", "{{ foreground }}") +hl.env("GUM_TABLE_HEADER_BACKGROUND", "{{ background }}") +hl.env("GUM_TABLE_CELL_FOREGROUND", "{{ foreground }}") +hl.env("GUM_TABLE_CELL_BACKGROUND", "{{ background }}") hl.env("GUM_TABLE_BORDER_FOREGROUND", "{{ muted }}") -hl.env("GUM_TABLE_BORDER_BACKGROUND", "{{ bg }}") +hl.env("GUM_TABLE_BORDER_BACKGROUND", "{{ background }}") hl.env("GUM_TABLE_SELECTED_FOREGROUND", "{{ selection_foreground }}") hl.env("GUM_TABLE_SELECTED_BACKGROUND", "{{ selection_background }}") -- Gum Spin Style Variables hl.env("GUM_SPIN_SPINNER_FOREGROUND", "{{ accent }}") -hl.env("GUM_SPIN_SPINNER_BACKGROUND", "{{ bg }}") -hl.env("GUM_SPIN_TITLE_FOREGROUND", "{{ fg }}") -hl.env("GUM_SPIN_TITLE_BACKGROUND", "{{ bg }}") +hl.env("GUM_SPIN_SPINNER_BACKGROUND", "{{ background }}") +hl.env("GUM_SPIN_TITLE_FOREGROUND", "{{ foreground }}") +hl.env("GUM_SPIN_TITLE_BACKGROUND", "{{ background }}") -- Gum File Style Variables -hl.env("GUM_FILE_CURSOR_FOREGROUND", "{{ bright_fg }}") -hl.env("GUM_FILE_CURSOR_BACKGROUND", "{{ bg }}") -hl.env("GUM_FILE_SYMLINK_FOREGROUND", "{{ fg }}") -hl.env("GUM_FILE_SYMLINK_BACKGROUND", "{{ bg }}") -hl.env("GUM_FILE_DIRECTORY_FOREGROUND", "{{ fg }}") -hl.env("GUM_FILE_DIRECTORY_BACKGROUND", "{{ bg }}") -hl.env("GUM_FILE_FILE_FOREGROUND", "{{ fg }}") -hl.env("GUM_FILE_FILE_BACKGROUND", "{{ bg }}") +hl.env("GUM_FILE_CURSOR_FOREGROUND", "{{ bright_foreground }}") +hl.env("GUM_FILE_CURSOR_BACKGROUND", "{{ background }}") +hl.env("GUM_FILE_SYMLINK_FOREGROUND", "{{ foreground }}") +hl.env("GUM_FILE_SYMLINK_BACKGROUND", "{{ background }}") +hl.env("GUM_FILE_DIRECTORY_FOREGROUND", "{{ foreground }}") +hl.env("GUM_FILE_DIRECTORY_BACKGROUND", "{{ background }}") +hl.env("GUM_FILE_FILE_FOREGROUND", "{{ foreground }}") +hl.env("GUM_FILE_FILE_BACKGROUND", "{{ background }}") hl.env("GUM_FILE_PERMISSIONS_FOREGROUND", "{{ muted }}") -hl.env("GUM_FILE_PERMISSIONS_BACKGROUND", "{{ bg }}") +hl.env("GUM_FILE_PERMISSIONS_BACKGROUND", "{{ background }}") hl.env("GUM_FILE_SELECTED_FOREGROUND", "{{ selection_foreground }}") hl.env("GUM_FILE_SELECTED_BACKGROUND", "{{ selection_background }}") hl.env("GUM_FILE_FILE_SIZE_FOREGROUND", "{{ muted }}") -hl.env("GUM_FILE_FILE_SIZE_BACKGROUND", "{{ bg }}") -hl.env("GUM_FILE_HEADER_FOREGROUND", "{{ fg }}") -hl.env("GUM_FILE_HEADER_BACKGROUND", "{{ bg }}") +hl.env("GUM_FILE_FILE_SIZE_BACKGROUND", "{{ background }}") +hl.env("GUM_FILE_HEADER_FOREGROUND", "{{ foreground }}") +hl.env("GUM_FILE_HEADER_BACKGROUND", "{{ background }}") -- Gum Pager Style Variables -hl.env("GUM_PAGER_FOREGROUND", "{{ fg }}") -hl.env("GUM_PAGER_BACKGROUND", "{{ bg }}") +hl.env("GUM_PAGER_FOREGROUND", "{{ foreground }}") +hl.env("GUM_PAGER_BACKGROUND", "{{ background }}") hl.env("GUM_PAGER_LINE_NUMBER_FOREGROUND", "{{ muted }}") -hl.env("GUM_PAGER_LINE_NUMBER_BACKGROUND", "{{ bg }}") +hl.env("GUM_PAGER_LINE_NUMBER_BACKGROUND", "{{ background }}") hl.env("GUM_PAGER_MATCH_FOREGROUND", "{{ accent }}") -hl.env("GUM_PAGER_MATCH_BACKGROUND", "{{ bg }}") +hl.env("GUM_PAGER_MATCH_BACKGROUND", "{{ background }}") hl.env("GUM_PAGER_MATCH_HIGH_FOREGROUND", "{{ accent }}") -hl.env("GUM_PAGER_MATCH_HIGH_BACKGROUND", "{{ bg }}") +hl.env("GUM_PAGER_MATCH_HIGH_BACKGROUND", "{{ background }}") hl.env("GUM_PAGER_HELP_FOREGROUND", "{{ muted }}") -hl.env("GUM_PAGER_HELP_BACKGROUND", "{{ bg }}") +hl.env("GUM_PAGER_HELP_BACKGROUND", "{{ background }}") -- Gum Write Style Variables -hl.env("GUM_WRITE_BASE_FOREGROUND", "{{ fg }}") -hl.env("GUM_WRITE_BASE_BACKGROUND", "{{ bg }}") +hl.env("GUM_WRITE_BASE_FOREGROUND", "{{ foreground }}") +hl.env("GUM_WRITE_BASE_BACKGROUND", "{{ background }}") hl.env("GUM_WRITE_CURSOR_LINE_NUMBER_FOREGROUND", "{{ muted }}") -hl.env("GUM_WRITE_CURSOR_LINE_NUMBER_BACKGROUND", "{{ bg }}") -hl.env("GUM_WRITE_CURSOR_LINE_FOREGROUND", "{{ fg }}") +hl.env("GUM_WRITE_CURSOR_LINE_NUMBER_BACKGROUND", "{{ background }}") +hl.env("GUM_WRITE_CURSOR_LINE_FOREGROUND", "{{ foreground }}") hl.env("GUM_WRITE_CURSOR_LINE_BACKGROUND", "{{ selection_background }}") -hl.env("GUM_WRITE_CURSOR_FOREGROUND", "{{ bright_fg }}") -hl.env("GUM_WRITE_CURSOR_BACKGROUND", "{{ bg }}") +hl.env("GUM_WRITE_CURSOR_FOREGROUND", "{{ bright_foreground }}") +hl.env("GUM_WRITE_CURSOR_BACKGROUND", "{{ background }}") hl.env("GUM_WRITE_END_OF_BUFFER_FOREGROUND", "{{ muted }}") -hl.env("GUM_WRITE_END_OF_BUFFER_BACKGROUND", "{{ bg }}") +hl.env("GUM_WRITE_END_OF_BUFFER_BACKGROUND", "{{ background }}") hl.env("GUM_WRITE_LINE_NUMBER_FOREGROUND", "{{ muted }}") -hl.env("GUM_WRITE_LINE_NUMBER_BACKGROUND", "{{ bg }}") -hl.env("GUM_WRITE_HEADER_FOREGROUND", "{{ fg }}") -hl.env("GUM_WRITE_HEADER_BACKGROUND", "{{ bg }}") +hl.env("GUM_WRITE_LINE_NUMBER_BACKGROUND", "{{ background }}") +hl.env("GUM_WRITE_HEADER_FOREGROUND", "{{ foreground }}") +hl.env("GUM_WRITE_HEADER_BACKGROUND", "{{ background }}") hl.env("GUM_WRITE_PLACEHOLDER_FOREGROUND", "{{ muted }}") -hl.env("GUM_WRITE_PLACEHOLDER_BACKGROUND", "{{ bg }}") -hl.env("GUM_WRITE_PROMPT_FOREGROUND", "{{ fg }}") -hl.env("GUM_WRITE_PROMPT_BACKGROUND", "{{ bg }}") +hl.env("GUM_WRITE_PLACEHOLDER_BACKGROUND", "{{ background }}") +hl.env("GUM_WRITE_PROMPT_FOREGROUND", "{{ foreground }}") +hl.env("GUM_WRITE_PROMPT_BACKGROUND", "{{ background }}") -- Gum Log Style Variables hl.env("GUM_LOG_LEVEL_FOREGROUND", "{{ accent }}") -hl.env("GUM_LOG_LEVEL_BACKGROUND", "{{ bg }}") +hl.env("GUM_LOG_LEVEL_BACKGROUND", "{{ background }}") hl.env("GUM_LOG_TIME_FOREGROUND", "{{ muted }}") -hl.env("GUM_LOG_TIME_BACKGROUND", "{{ bg }}") -hl.env("GUM_LOG_PREFIX_FOREGROUND", "{{ fg }}") -hl.env("GUM_LOG_PREFIX_BACKGROUND", "{{ bg }}") -hl.env("GUM_LOG_MESSAGE_FOREGROUND", "{{ fg }}") -hl.env("GUM_LOG_MESSAGE_BACKGROUND", "{{ bg }}") -hl.env("GUM_LOG_KEY_FOREGROUND", "{{ fg }}") -hl.env("GUM_LOG_KEY_BACKGROUND", "{{ bg }}") -hl.env("GUM_LOG_VALUE_FOREGROUND", "{{ fg }}") -hl.env("GUM_LOG_VALUE_BACKGROUND", "{{ bg }}") +hl.env("GUM_LOG_TIME_BACKGROUND", "{{ background }}") +hl.env("GUM_LOG_PREFIX_FOREGROUND", "{{ foreground }}") +hl.env("GUM_LOG_PREFIX_BACKGROUND", "{{ background }}") +hl.env("GUM_LOG_MESSAGE_FOREGROUND", "{{ foreground }}") +hl.env("GUM_LOG_MESSAGE_BACKGROUND", "{{ background }}") +hl.env("GUM_LOG_KEY_FOREGROUND", "{{ foreground }}") +hl.env("GUM_LOG_KEY_BACKGROUND", "{{ background }}") +hl.env("GUM_LOG_VALUE_FOREGROUND", "{{ foreground }}") +hl.env("GUM_LOG_VALUE_BACKGROUND", "{{ background }}") hl.env("GUM_LOG_SEPARATOR_FOREGROUND", "{{ muted }}") -hl.env("GUM_LOG_SEPARATOR_BACKGROUND", "{{ bg }}") +hl.env("GUM_LOG_SEPARATOR_BACKGROUND", "{{ background }}") diff --git a/default/themed/helix.toml.tpl b/default/themed/helix.toml.tpl index cf7482d6..062664ff 100644 --- a/default/themed/helix.toml.tpl +++ b/default/themed/helix.toml.tpl @@ -116,17 +116,17 @@ info = "color4" hint = "color6" [palette] -background = "{{ bg }}" -foreground = "{{ fg }}" -cursor = "{{ bright_fg }}" +background = "{{ background }}" +foreground = "{{ foreground }}" +cursor = "{{ bright_foreground }}" selection_background = "{{ selection_background }}" selection_foreground = "{{ selection_foreground }}" -color0 = "{{ bg }}" +color0 = "{{ background }}" color1 = "{{ red }}" color2 = "{{ green }}" color3 = "{{ yellow }}" color4 = "{{ blue }}" color5 = "{{ magenta }}" color6 = "{{ cyan }}" -color7 = "{{ fg }}" +color7 = "{{ foreground }}" color8 = "{{ muted }}" diff --git a/default/themed/hyprland-preview-share-picker.css.tpl b/default/themed/hyprland-preview-share-picker.css.tpl index 622f6204..750b726f 100644 --- a/default/themed/hyprland-preview-share-picker.css.tpl +++ b/default/themed/hyprland-preview-share-picker.css.tpl @@ -1,12 +1,12 @@ -@define-color foreground {{ fg }}; -@define-color background {{ bg }}; +@define-color foreground {{ foreground }}; +@define-color background {{ background }}; @define-color accent {{ accent }}; @define-color muted {{ muted }}; -@define-color card_bg {{ lighter_bg }}; -@define-color text_dark {{ bg }}; +@define-color card_bg {{ lighter_background }}; +@define-color text_dark {{ background }}; @define-color accent_hover {{ bright_blue }}; @define-color selected_tab {{ accent }}; -@define-color text {{ fg }}; +@define-color text {{ foreground }}; * { all: unset; diff --git a/default/themed/kitty.conf.tpl b/default/themed/kitty.conf.tpl index 2d8adbf9..e94c1278 100644 --- a/default/themed/kitty.conf.tpl +++ b/default/themed/kitty.conf.tpl @@ -1,22 +1,22 @@ -foreground {{ fg }} -background {{ bg }} +foreground {{ foreground }} +background {{ background }} selection_foreground {{ selection_foreground }} selection_background {{ selection_background }} -cursor {{ bright_fg }} -cursor_text_color {{ bg }} +cursor {{ bright_foreground }} +cursor_text_color {{ background }} active_border_color {{ accent }} active_tab_background {{ accent }} -color0 {{ bg }} +color0 {{ background }} color1 {{ red }} color2 {{ green }} color3 {{ yellow }} color4 {{ blue }} color5 {{ magenta }} color6 {{ cyan }} -color7 {{ fg }} +color7 {{ foreground }} color8 {{ muted }} color9 {{ bright_red }} color10 {{ bright_green }} @@ -24,4 +24,4 @@ color11 {{ bright_yellow }} color12 {{ bright_blue }} color13 {{ bright_magenta }} color14 {{ bright_cyan }} -color15 {{ bright_fg }} +color15 {{ bright_foreground }} diff --git a/default/themed/neovim.lua.tpl b/default/themed/neovim.lua.tpl index 13268b4a..ad4353f7 100644 --- a/default/themed/neovim.lua.tpl +++ b/default/themed/neovim.lua.tpl @@ -6,15 +6,15 @@ return { priority = 1000, opts = { colors = { - bg = "{{ bg }}", - dark_bg = "{{ dark_bg }}", - darker_bg = "{{ darker_bg }}", - lighter_bg = "{{ lighter_bg }}", + bg = "{{ background }}", + dark_bg = "{{ dark_background }}", + darker_bg = "{{ darker_background }}", + lighter_bg = "{{ lighter_background }}", - fg = "{{ fg }}", - dark_fg = "{{ dark_fg }}", - light_fg = "{{ light_fg }}", - bright_fg = "{{ bright_fg }}", + fg = "{{ foreground }}", + dark_fg = "{{ dark_foreground }}", + light_fg = "{{ light_foreground }}", + bright_fg = "{{ bright_foreground }}", muted = "{{ muted }}", red = "{{ red }}", @@ -34,9 +34,9 @@ return { bright_magenta = "{{ bright_magenta }}", accent = "{{ accent }}", - cursor = "{{ bright_fg }}", - foreground = "{{ fg }}", - background = "{{ bg }}", + cursor = "{{ bright_foreground }}", + foreground = "{{ foreground }}", + background = "{{ background }}", selection = "{{ selection }}", selection_foreground = "{{ selection_foreground }}", selection_background = "{{ selection_background }}", diff --git a/default/themed/obsidian.css.tpl b/default/themed/obsidian.css.tpl index 9e91b417..e3702d45 100644 --- a/default/themed/obsidian.css.tpl +++ b/default/themed/obsidian.css.tpl @@ -2,11 +2,11 @@ .theme-dark, .theme-light { /* Core colors */ - --background-primary: {{ bg }}; - --background-primary-alt: {{ bg }}; - --background-secondary: {{ bg }}; - --background-secondary-alt: {{ bg }}; - --text-normal: {{ fg }}; + --background-primary: {{ background }}; + --background-primary-alt: {{ background }}; + --background-secondary: {{ background }}; + --background-secondary-alt: {{ background }}; + --text-normal: {{ foreground }}; /* Selection colors */ --text-selection: {{ selection_background }}; @@ -30,8 +30,8 @@ --interactive-accent-hover: {{ accent }}; /* Muted text */ - --text-muted: color-mix(in srgb, {{ fg }} 70%, transparent); - --text-faint: color-mix(in srgb, {{ fg }} 55%, transparent); + --text-muted: color-mix(in srgb, {{ foreground }} 70%, transparent); + --text-faint: color-mix(in srgb, {{ foreground }} 55%, transparent); /* Code */ --code-normal: {{ cyan }}; diff --git a/default/themed/pi.json.tpl b/default/themed/pi.json.tpl index f6df112a..b93faa14 100644 --- a/default/themed/pi.json.tpl +++ b/default/themed/pi.json.tpl @@ -2,20 +2,20 @@ "$schema": "https://raw.githubusercontent.com/earendil-works/pi/main/packages/coding-agent/src/modes/interactive/theme/theme-schema.json", "name": "omarchy-system", "vars": { - "background": "{{ bg }}", - "foreground": "{{ fg }}", + "background": "{{ background }}", + "foreground": "{{ foreground }}", "accent": "{{ accent }}", "selectionBackground": "{{ selection_background }}", "selectionForeground": "{{ selection_foreground }}", - "selectedBackground": "{{ mix bg accent 22% }}", - "color0": "{{ bg }}", + "selectedBackground": "{{ mix background accent 22% }}", + "color0": "{{ background }}", "color1": "{{ red }}", "color2": "{{ green }}", "color3": "{{ yellow }}", "color4": "{{ blue }}", "color5": "{{ magenta }}", "color6": "{{ cyan }}", - "color7": "{{ fg }}", + "color7": "{{ foreground }}", "color8": "{{ muted }}", "color9": "{{ bright_red }}", "color10": "{{ bright_green }}", @@ -23,16 +23,16 @@ "color12": "{{ bright_blue }}", "color13": "{{ bright_magenta }}", "color14": "{{ bright_cyan }}", - "color15": "{{ bright_fg }}", - "panel": "{{ mix bg fg 6% }}", - "panelAlt": "{{ mix bg fg 10% }}", - "panelPending": "{{ mix bg accent 12% }}", - "panelSuccess": "{{ mix bg green 12% }}", - "panelError": "{{ mix bg red 12% }}", - "border": "{{ mix bg fg 30% }}", - "borderMuted": "{{ mix bg fg 20% }}", - "mutedText": "{{ mix fg bg 34% }}", - "dimText": "{{ mix fg bg 52% }}" + "color15": "{{ bright_foreground }}", + "panel": "{{ mix background foreground 6% }}", + "panelAlt": "{{ mix background foreground 10% }}", + "panelPending": "{{ mix background accent 12% }}", + "panelSuccess": "{{ mix background green 12% }}", + "panelError": "{{ mix background red 12% }}", + "border": "{{ mix background foreground 30% }}", + "borderMuted": "{{ mix background foreground 20% }}", + "mutedText": "{{ mix foreground background 34% }}", + "dimText": "{{ mix foreground background 52% }}" }, "colors": { "accent": "accent", @@ -88,8 +88,8 @@ "bashMode": "color3" }, "export": { - "pageBg": "{{ bg }}", - "cardBg": "{{ mix bg fg 6% }}", - "infoBg": "{{ mix bg fg 10% }}" + "pageBg": "{{ background }}", + "cardBg": "{{ mix background foreground 6% }}", + "infoBg": "{{ mix background foreground 10% }}" } } diff --git a/default/themed/shell.toml.tpl b/default/themed/shell.toml.tpl index 4c17f824..b0a68d8b 100644 --- a/default/themed/shell.toml.tpl +++ b/default/themed/shell.toml.tpl @@ -4,9 +4,9 @@ [bar] # Alpha companions (where present) range from 0 (invisible) to 1 (opaque). -background = "{{ bg }}" +background = "{{ background }}" background-alpha = 1.0 -text = "{{ fg }}" +text = "{{ foreground }}" # Modules calling attention to themselves (recording, voxtype, alerts, updates) active = "{{ red }}" # Cross-axis size at font base-size 12. size-horizontal is the height of @@ -21,7 +21,7 @@ size-vertical = 28 # lock, notifications, popups, and menu-style cards stay aligned with the # current Hyprland active-border gradient. active-border = "{{ shell_gradient hyprland_active_border accent }}" -active-border-foreground = "{{ shell_gradient hyprland_active_border fg }}" +active-border-foreground = "{{ shell_gradient hyprland_active_border foreground }}" [controls] # Shared state tokens for interactive control chrome (buttons, dropdowns, @@ -31,32 +31,32 @@ active-border-foreground = "{{ shell_gradient hyprland_active_border fg }}" # N, "Y X", "T X B", or "T R B L". Per-side keys like # normal-border-width-left override the list. Each *-border accepts either a # solid color or a Hyprland-style gradient, e.g. "rgba(...) rgba(...) 45deg". -normal-color = "{{ fg }}" +normal-color = "{{ foreground }}" normal-fill-alpha = 0.04 -normal-border = "{{ fg }}" +normal-border = "{{ foreground }}" normal-border-width = 1 normal-border-alpha = 0.4 # Hover-cursor: mouse hover and the panel keyboard cursor. -hover-cursor-color = "{{ fg }}" +hover-cursor-color = "{{ foreground }}" hover-cursor-fill-alpha = 0.08 -hover-cursor-border = "{{ fg }}" +hover-cursor-border = "{{ foreground }}" hover-cursor-border-width = 1 hover-cursor-border-alpha = 0.25 # Focus: Qt activeFocus. Mirror the hover-cursor values by default so # mouse hover, keyboard cursor, and tab focus all read as the same state # — themes that want focus to stand out override these four lines. -focus-color = "{{ fg }}" +focus-color = "{{ foreground }}" focus-fill-alpha = 0.08 -focus-border = "{{ fg }}" +focus-border = "{{ foreground }}" focus-border-width = 1 focus-border-alpha = 0.25 # Selected: persistent chosen/current state. -selected-color = "{{ fg }}" +selected-color = "{{ foreground }}" selected-fill-alpha = 0.18 -selected-border = "{{ fg }}" +selected-border = "{{ foreground }}" selected-border-width = 0 selected-border-alpha = 1.0 @@ -124,9 +124,9 @@ base-size = 12 # Border accepts either a solid color or a Hyprland-style gradient. Border # widths accept one CSS-style scalar/list: N, "Y X", "T X B", or "T R B L"; # individual border-width-top/right/bottom/left keys override the list. -background = "{{ bg }}" +background = "{{ background }}" background-alpha = 1.0 -text = "{{ fg }}" +text = "{{ foreground }}" border = "hyprland.active-border" border-alpha = 1.0 # border-width = 2 @@ -134,16 +134,16 @@ border-alpha = 1.0 [tooltip] # Hover tooltips across the bar, panels, and buttons. background-alpha of # 0.97 mirrors the legacy hard-coded tooltip opacity. -background = "{{ bg }}" +background = "{{ background }}" background-alpha = 0.97 -text = "{{ fg }}" +text = "{{ foreground }}" border = "hyprland.active-border-foreground" border-alpha = 1.0 [notifications] -background = "{{ bg }}" +background = "{{ background }}" background-alpha = 1.0 -text = "{{ fg }}" +text = "{{ foreground }}" # Conventionally matches the Hyprland active-window border. Border accepts # either a solid color or the full active-border gradient. border = "hyprland.active-border" @@ -156,14 +156,14 @@ countdown = "{{ accent }}" # companions go from 0 (invisible) to 1 (opaque). scrim is the full-screen # dim layer behind the card; background is the card itself. Defaults # mirror [menu] with the card at 0.95 to preserve the legacy translucency. -background = "{{ bg }}" +background = "{{ background }}" background-alpha = 0.95 -text = "{{ fg }}" +text = "{{ foreground }}" border = "hyprland.active-border-foreground" border-alpha = 1.0 -scrim = "{{ bg }}" +scrim = "{{ background }}" scrim-alpha = 0.5 -selected-background = "{{ fg }}" +selected-background = "{{ foreground }}" selected-background-alpha = 0.08 selected-text = "{{ accent }}" selected-border = "hyprland.active-border-foreground" @@ -173,14 +173,14 @@ selected-border-alpha = 0.25 # Cards, rows, and selected-row treatment. Alpha companions (where present) # go from 0 (invisible) to 1 (opaque). scrim is the full-screen dim layer # behind the card. Clipboard and emojis inherit these tokens. -background = "{{ bg }}" +background = "{{ background }}" background-alpha = 1.0 -text = "{{ fg }}" +text = "{{ foreground }}" border = "hyprland.active-border-foreground" border-alpha = 1.0 -scrim = "{{ bg }}" +scrim = "{{ background }}" scrim-alpha = 0.5 -selected-background = "{{ fg }}" +selected-background = "{{ foreground }}" selected-background-alpha = 0.08 selected-text = "{{ accent }}" selected-border = "hyprland.active-border-foreground" @@ -192,14 +192,14 @@ selected-border-alpha = 0.25 # text-error tints the lock icon, password text, and placeholder when # authentication fails. border-alpha applies to both border and # border-error (the two states are mutually exclusive in time). -background = "{{ bg }}" +background = "{{ background }}" background-alpha = 1.0 -text = "{{ fg }}" +text = "{{ foreground }}" text-error = "{{ red }}" border = "hyprland.active-border" border-error = "{{ red }}" border-alpha = 1.0 -scrim = "{{ bg }}" +scrim = "{{ background }}" scrim-alpha = 0.5 # accent is the lock-icon glyph color + text-selection tint. accent = "{{ accent }}" @@ -210,10 +210,10 @@ accent = "{{ accent }}" # through idle, typing/authenticating, and wrong-password states. # border-alpha applies to all three border states (they are mutually # exclusive in time). -background = "{{ bg }}" +background = "{{ background }}" background-alpha = 0.8 -text = "{{ fg }}" -placeholder = "{{ mix fg bg 34% }}" +text = "{{ foreground }}" +placeholder = "{{ mix foreground background 34% }}" text-error = "{{ red }}" border = "hyprland.active-border" border-active = "hyprland.active-border" @@ -228,10 +228,10 @@ selection-alpha = 0.45 # the full-screen wash. Per-slice dim overlays and text outlines on top # of the scrim track the foundational background color directly. # unselected-border-alpha softens carousel slices that aren't selected. -scrim = "{{ bg }}" +scrim = "{{ background }}" scrim-alpha = 0.5 -text = "{{ fg }}" +text = "{{ foreground }}" selected-border = "{{ accent }}" selected-border-alpha = 1.0 -unselected-border = "{{ fg }}" +unselected-border = "{{ foreground }}" unselected-border-alpha = 0.28 diff --git a/default/themed/vscode-theme.json.tpl b/default/themed/vscode-theme.json.tpl index 3123d900..0897ca05 100644 --- a/default/themed/vscode-theme.json.tpl +++ b/default/themed/vscode-theme.json.tpl @@ -6,10 +6,10 @@ "semanticTokenColors": { "parameter": "{{ cyan }}", "parameter.declaration": "{{ cyan }}", - "variable": "{{ fg }}", - "variable.declaration": "{{ fg }}", + "variable": "{{ foreground }}", + "variable.declaration": "{{ foreground }}", "variable.readonly": "{{ bright_yellow }}", - "variable.defaultLibrary": "{{ fg }}", + "variable.defaultLibrary": "{{ foreground }}", "property": "{{ cyan }}", "property.declaration": "{{ cyan }}", "property.readonly": "{{ cyan }}", @@ -27,7 +27,7 @@ "enumMember": "{{ orange }}", "type": "{{ yellow }}", "type.declaration": "{{ yellow }}", - "type.defaultLibrary": "{{ fg }}", + "type.defaultLibrary": "{{ foreground }}", "typeParameter": "{{ yellow }}", "namespace": "{{ blue }}", "macro": "{{ cyan }}", @@ -42,53 +42,53 @@ "comment.documentation": {"foreground": "{{ muted }}", "fontStyle": "italic"} }, "colors": { - "foreground": "{{ fg }}", - "disabledForeground": "{{ dark_fg }}", + "foreground": "{{ foreground }}", + "disabledForeground": "{{ dark_foreground }}", "focusBorder": "{{ accent }}80", - "widget.shadow": "{{ bg }}80", + "widget.shadow": "{{ background }}80", "selection.background": "{{ selection_background }}80", "descriptionForeground": "{{ muted }}", "errorForeground": "{{ red }}", - "icon.foreground": "{{ fg }}", + "icon.foreground": "{{ foreground }}", "sash.hoverBorder": "{{ accent }}", - "textBlockQuote.background": "{{ bg }}", + "textBlockQuote.background": "{{ background }}", "textBlockQuote.border": "{{ accent }}", - "textCodeBlock.background": "{{ bg }}", + "textCodeBlock.background": "{{ background }}", "textLink.activeForeground": "{{ bright_blue }}", "textLink.foreground": "{{ blue }}", "textPreformat.foreground": "{{ cyan }}", - "textPreformat.background": "{{ bg }}", + "textPreformat.background": "{{ background }}", "textSeparator.foreground": "{{ muted }}", - "toolbar.hoverBackground": "{{ bg }}", + "toolbar.hoverBackground": "{{ background }}", "toolbar.activeBackground": "{{ muted }}", "button.background": "{{ accent }}", - "button.foreground": "{{ bg }}", + "button.foreground": "{{ background }}", "button.hoverBackground": "{{ blue }}", - "button.secondaryForeground": "{{ fg }}", + "button.secondaryForeground": "{{ foreground }}", "button.secondaryBackground": "{{ muted }}", - "button.secondaryHoverBackground": "{{ bg }}", + "button.secondaryHoverBackground": "{{ background }}", "button.border": "{{ accent }}20", - "checkbox.background": "{{ bg }}", - "checkbox.foreground": "{{ fg }}", + "checkbox.background": "{{ background }}", + "checkbox.foreground": "{{ foreground }}", "checkbox.border": "{{ muted }}", "checkbox.selectBackground": "{{ accent }}", "checkbox.selectBorder": "{{ accent }}", - "dropdown.background": "{{ bg }}", - "dropdown.listBackground": "{{ bg }}", + "dropdown.background": "{{ background }}", + "dropdown.listBackground": "{{ background }}", "dropdown.border": "{{ muted }}", - "dropdown.foreground": "{{ fg }}", + "dropdown.foreground": "{{ foreground }}", - "input.background": "{{ bg }}", + "input.background": "{{ background }}", "input.border": "{{ muted }}", - "input.foreground": "{{ fg }}", + "input.foreground": "{{ foreground }}", "input.placeholderForeground": "{{ muted }}", "inputOption.activeBackground": "{{ accent }}40", "inputOption.activeBorder": "{{ accent }}", - "inputOption.activeForeground": "{{ fg }}", + "inputOption.activeForeground": "{{ foreground }}", "inputOption.hoverBackground": "{{ muted }}", "inputValidation.errorBackground": "{{ red }}20", "inputValidation.errorForeground": "{{ red }}", @@ -100,34 +100,34 @@ "inputValidation.warningForeground": "{{ yellow }}", "inputValidation.warningBorder": "{{ yellow }}", - "scrollbar.shadow": "{{ bg }}", + "scrollbar.shadow": "{{ background }}", "scrollbarSlider.activeBackground": "{{ accent }}80", "scrollbarSlider.background": "{{ muted }}40", "scrollbarSlider.hoverBackground": "{{ muted }}80", "badge.background": "{{ accent }}", - "badge.foreground": "{{ bg }}", + "badge.foreground": "{{ background }}", "progressBar.background": "{{ accent }}", "list.activeSelectionBackground": "{{ accent }}30", - "list.activeSelectionForeground": "{{ fg }}", - "list.activeSelectionIconForeground": "{{ fg }}", + "list.activeSelectionForeground": "{{ foreground }}", + "list.activeSelectionIconForeground": "{{ foreground }}", "list.dropBackground": "{{ accent }}20", "list.focusBackground": "{{ accent }}20", - "list.focusForeground": "{{ fg }}", + "list.focusForeground": "{{ foreground }}", "list.focusOutline": "{{ accent }}60", "list.highlightForeground": "{{ accent }}", - "list.hoverBackground": "{{ bg }}", - "list.hoverForeground": "{{ fg }}", + "list.hoverBackground": "{{ background }}", + "list.hoverForeground": "{{ foreground }}", "list.inactiveSelectionBackground": "{{ muted }}40", - "list.inactiveSelectionForeground": "{{ fg }}", + "list.inactiveSelectionForeground": "{{ foreground }}", "list.inactiveFocusBackground": "{{ muted }}40", "list.inactiveFocusOutline": "{{ muted }}", "list.invalidItemForeground": "{{ red }}", "list.errorForeground": "{{ red }}", "list.warningForeground": "{{ yellow }}", - "listFilterWidget.background": "{{ bg }}", + "listFilterWidget.background": "{{ background }}", "listFilterWidget.outline": "{{ accent }}", "listFilterWidget.noMatchesOutline": "{{ red }}", "list.filterMatchBackground": "{{ accent }}30", @@ -135,34 +135,34 @@ "tree.indentGuidesStroke": "{{ muted }}", "tree.inactiveIndentGuidesStroke": "{{ muted }}60", "tree.tableColumnsBorder": "{{ muted }}", - "tree.tableOddRowsBackground": "{{ bg }}40", + "tree.tableOddRowsBackground": "{{ background }}40", - "activityBar.background": "{{ bg }}", + "activityBar.background": "{{ background }}", "activityBar.dropBorder": "{{ accent }}", - "activityBar.foreground": "{{ fg }}", + "activityBar.foreground": "{{ foreground }}", "activityBar.inactiveForeground": "{{ muted }}", - "activityBar.border": "{{ bg }}", + "activityBar.border": "{{ background }}", "activityBarBadge.background": "{{ accent }}", - "activityBarBadge.foreground": "{{ bg }}", + "activityBarBadge.foreground": "{{ background }}", "activityBar.activeBorder": "{{ accent }}", - "activityBar.activeBackground": "{{ bg }}40", + "activityBar.activeBackground": "{{ background }}40", - "sideBar.background": "{{ bg }}", - "sideBar.foreground": "{{ fg }}", - "sideBar.border": "{{ bg }}", + "sideBar.background": "{{ background }}", + "sideBar.foreground": "{{ foreground }}", + "sideBar.border": "{{ background }}", "sideBar.dropBackground": "{{ accent }}20", - "sideBarTitle.foreground": "{{ fg }}", - "sideBarSectionHeader.background": "{{ bg }}", - "sideBarSectionHeader.foreground": "{{ fg }}", + "sideBarTitle.foreground": "{{ foreground }}", + "sideBarSectionHeader.background": "{{ background }}", + "sideBarSectionHeader.foreground": "{{ foreground }}", "sideBarSectionHeader.border": "{{ muted }}40", "minimap.findMatchHighlight": "{{ accent }}80", "minimap.selectionHighlight": "{{ accent }}60", "minimap.errorHighlight": "{{ red }}", "minimap.warningHighlight": "{{ yellow }}", - "minimap.background": "{{ bg }}", + "minimap.background": "{{ background }}", "minimap.selectionOccurrenceHighlight": "{{ accent }}40", - "minimap.foregroundOpacity": "{{ bg }}c0", + "minimap.foregroundOpacity": "{{ background }}c0", "minimapSlider.background": "{{ muted }}20", "minimapSlider.hoverBackground": "{{ muted }}40", "minimapSlider.activeBackground": "{{ muted }}60", @@ -172,44 +172,44 @@ "editorGroup.border": "{{ muted }}40", "editorGroup.dropBackground": "{{ accent }}20", - "editorGroup.dropIntoPromptForeground": "{{ fg }}", - "editorGroup.dropIntoPromptBackground": "{{ bg }}", + "editorGroup.dropIntoPromptForeground": "{{ foreground }}", + "editorGroup.dropIntoPromptBackground": "{{ background }}", "editorGroup.dropIntoPromptBorder": "{{ accent }}", - "editorGroupHeader.noTabsBackground": "{{ bg }}", - "editorGroupHeader.tabsBackground": "{{ bg }}", - "editorGroupHeader.tabsBorder": "{{ bg }}", - "editorGroupHeader.border": "{{ bg }}", - "editorGroup.emptyBackground": "{{ bg }}", - "tab.activeBackground": "{{ bg }}", - "tab.unfocusedActiveBackground": "{{ bg }}", - "tab.activeForeground": "{{ fg }}", + "editorGroupHeader.noTabsBackground": "{{ background }}", + "editorGroupHeader.tabsBackground": "{{ background }}", + "editorGroupHeader.tabsBorder": "{{ background }}", + "editorGroupHeader.border": "{{ background }}", + "editorGroup.emptyBackground": "{{ background }}", + "tab.activeBackground": "{{ background }}", + "tab.unfocusedActiveBackground": "{{ background }}", + "tab.activeForeground": "{{ foreground }}", "tab.activeBorder": "{{ accent }}", "tab.activeBorderTop": "{{ accent }}", "tab.unfocusedActiveBorder": "{{ muted }}", "tab.unfocusedActiveBorderTop": "{{ muted }}", - "tab.border": "{{ bg }}", - "tab.inactiveBackground": "{{ bg }}", + "tab.border": "{{ background }}", + "tab.inactiveBackground": "{{ background }}", "tab.inactiveForeground": "{{ muted }}", - "tab.unfocusedActiveForeground": "{{ fg }}", + "tab.unfocusedActiveForeground": "{{ foreground }}", "tab.unfocusedInactiveForeground": "{{ muted }}", "tab.hoverBackground": "{{ muted }}40", "tab.unfocusedHoverBackground": "{{ muted }}40", - "tab.hoverForeground": "{{ fg }}", + "tab.hoverForeground": "{{ foreground }}", "tab.hoverBorder": "{{ accent }}40", "tab.activeModifiedBorder": "{{ yellow }}", "tab.inactiveModifiedBorder": "{{ yellow }}80", "tab.unfocusedActiveModifiedBorder": "{{ yellow }}80", "tab.unfocusedInactiveModifiedBorder": "{{ yellow }}60", "tab.lastPinnedBorder": "{{ muted }}", - "editorPane.background": "{{ bg }}", + "editorPane.background": "{{ background }}", - "editor.background": "{{ bg }}", - "editor.foreground": "{{ fg }}", + "editor.background": "{{ background }}", + "editor.foreground": "{{ foreground }}", "editorLineNumber.foreground": "{{ muted }}", - "editorLineNumber.activeForeground": "{{ fg }}", + "editorLineNumber.activeForeground": "{{ foreground }}", "editorLineNumber.dimmedForeground": "{{ muted }}80", - "editorCursor.background": "{{ bg }}", - "editorCursor.foreground": "{{ bright_fg }}", + "editorCursor.background": "{{ background }}", + "editorCursor.foreground": "{{ bright_foreground }}", "editor.selectionBackground": "{{ selection_background }}60", "editor.selectionForeground": "{{ selection_foreground }}", "editor.inactiveSelectionBackground": "{{ selection_background }}30", @@ -230,8 +230,8 @@ "searchEditor.findMatchBackground": "{{ yellow }}40", "searchEditor.findMatchBorder": "{{ yellow }}", "editor.hoverHighlightBackground": "{{ accent }}20", - "editor.lineHighlightBackground": "{{ bg }}60", - "editor.lineHighlightBorder": "{{ bg }}00", + "editor.lineHighlightBackground": "{{ background }}60", + "editor.lineHighlightBorder": "{{ background }}00", "editorLink.activeForeground": "{{ blue }}", "editor.rangeHighlightBackground": "{{ accent }}10", "editor.rangeHighlightBorder": "{{ accent }}20", @@ -282,7 +282,7 @@ "editorBracketPairGuide.background4": "{{ cyan }}30", "editorBracketPairGuide.background5": "{{ magenta }}30", "editorBracketPairGuide.background6": "{{ orange }}30", - "editorOverviewRuler.background": "{{ bg }}", + "editorOverviewRuler.background": "{{ background }}", "editorOverviewRuler.border": "{{ muted }}20", "editorOverviewRuler.findMatchForeground": "{{ yellow }}80", "editorOverviewRuler.rangeHighlightForeground": "{{ accent }}60", @@ -311,9 +311,9 @@ "problemsErrorIcon.foreground": "{{ red }}", "problemsWarningIcon.foreground": "{{ yellow }}", "problemsInfoIcon.foreground": "{{ blue }}", - "editorUnnecessaryCode.opacity": "{{ bg }}80", + "editorUnnecessaryCode.opacity": "{{ background }}80", "editorUnnecessaryCode.border": "{{ muted }}", - "editorGutter.background": "{{ bg }}", + "editorGutter.background": "{{ background }}", "editorGutter.modifiedBackground": "{{ orange }}", "editorGutter.addedBackground": "{{ green }}", "editorGutter.deletedBackground": "{{ red }}", @@ -337,38 +337,38 @@ "diffEditorOverview.insertedForeground": "{{ green }}80", "diffEditorOverview.removedForeground": "{{ red }}80", "diffEditor.diagonalFill": "{{ muted }}30", - "diffEditor.unchangedRegionBackground": "{{ bg }}", + "diffEditor.unchangedRegionBackground": "{{ background }}", "diffEditor.unchangedRegionForeground": "{{ muted }}", - "diffEditor.unchangedCodeBackground": "{{ bg }}40", + "diffEditor.unchangedCodeBackground": "{{ background }}40", "diffEditor.move.border": "{{ cyan }}80", "diffEditor.moveActive.border": "{{ cyan }}", - "editorWidget.foreground": "{{ fg }}", - "editorWidget.background": "{{ bg }}", + "editorWidget.foreground": "{{ foreground }}", + "editorWidget.background": "{{ background }}", "editorWidget.border": "{{ muted }}", "editorWidget.resizeBorder": "{{ accent }}", - "editorSuggestWidget.background": "{{ bg }}", + "editorSuggestWidget.background": "{{ background }}", "editorSuggestWidget.border": "{{ muted }}", - "editorSuggestWidget.foreground": "{{ fg }}", + "editorSuggestWidget.foreground": "{{ foreground }}", "editorSuggestWidget.focusHighlightForeground": "{{ accent }}", "editorSuggestWidget.highlightForeground": "{{ accent }}", "editorSuggestWidget.selectedBackground": "{{ accent }}30", - "editorSuggestWidget.selectedForeground": "{{ fg }}", - "editorSuggestWidget.selectedIconForeground": "{{ fg }}", + "editorSuggestWidget.selectedForeground": "{{ foreground }}", + "editorSuggestWidget.selectedIconForeground": "{{ foreground }}", "editorSuggestWidgetStatus.foreground": "{{ muted }}", - "editorHoverWidget.foreground": "{{ fg }}", - "editorHoverWidget.background": "{{ bg }}", + "editorHoverWidget.foreground": "{{ foreground }}", + "editorHoverWidget.background": "{{ background }}", "editorHoverWidget.border": "{{ muted }}", "editorHoverWidget.highlightForeground": "{{ accent }}", "editorHoverWidget.statusBarBackground": "{{ muted }}30", "editorGhostText.foreground": "{{ muted }}", "editorGhostText.background": "{{ muted }}10", "editorGhostText.border": "{{ muted }}00", - "editorStickyScroll.background": "{{ bg }}", + "editorStickyScroll.background": "{{ background }}", "editorStickyScrollHover.background": "{{ muted }}40", "debugExceptionWidget.background": "{{ red }}20", "debugExceptionWidget.border": "{{ red }}", - "editorMarkerNavigation.background": "{{ bg }}", + "editorMarkerNavigation.background": "{{ background }}", "editorMarkerNavigationError.background": "{{ red }}20", "editorMarkerNavigationError.headerBackground": "{{ red }}15", "editorMarkerNavigationWarning.background": "{{ yellow }}20", @@ -377,19 +377,19 @@ "editorMarkerNavigationInfo.headerBackground": "{{ blue }}15", "peekView.border": "{{ accent }}", - "peekViewEditor.background": "{{ bg }}", - "peekViewEditorGutter.background": "{{ bg }}", + "peekViewEditor.background": "{{ background }}", + "peekViewEditorGutter.background": "{{ background }}", "peekViewEditor.matchHighlightBackground": "{{ yellow }}30", "peekViewEditor.matchHighlightBorder": "{{ yellow }}", - "peekViewResult.background": "{{ bg }}", - "peekViewResult.fileForeground": "{{ fg }}", + "peekViewResult.background": "{{ background }}", + "peekViewResult.fileForeground": "{{ foreground }}", "peekViewResult.lineForeground": "{{ muted }}", "peekViewResult.matchHighlightBackground": "{{ yellow }}30", "peekViewResult.selectionBackground": "{{ accent }}30", - "peekViewResult.selectionForeground": "{{ fg }}", - "peekViewTitle.background": "{{ bg }}", + "peekViewResult.selectionForeground": "{{ foreground }}", + "peekViewTitle.background": "{{ background }}", "peekViewTitleDescription.foreground": "{{ muted }}", - "peekViewTitleLabel.foreground": "{{ fg }}", + "peekViewTitleLabel.foreground": "{{ foreground }}", "merge.currentContentBackground": "{{ cyan }}20", "merge.currentHeaderBackground": "{{ cyan }}40", @@ -411,70 +411,70 @@ "mergeEditor.changeBase.background": "{{ muted }}20", "mergeEditor.changeBase.word.background": "{{ muted }}40", - "panel.background": "{{ bg }}", + "panel.background": "{{ background }}", "panel.border": "{{ muted }}40", "panel.dropBorder": "{{ accent }}", "panelTitle.activeBorder": "{{ accent }}", - "panelTitle.activeForeground": "{{ fg }}", + "panelTitle.activeForeground": "{{ foreground }}", "panelTitle.inactiveForeground": "{{ muted }}", "panelInput.border": "{{ muted }}", "panelSection.border": "{{ muted }}40", "panelSection.dropBackground": "{{ accent }}20", - "panelSectionHeader.background": "{{ bg }}", - "panelSectionHeader.foreground": "{{ fg }}", + "panelSectionHeader.background": "{{ background }}", + "panelSectionHeader.foreground": "{{ foreground }}", "panelSectionHeader.border": "{{ muted }}40", - "outputView.background": "{{ bg }}", - "outputViewStickyScroll.background": "{{ bg }}", + "outputView.background": "{{ background }}", + "outputViewStickyScroll.background": "{{ background }}", - "statusBar.background": "{{ bg }}", - "statusBar.foreground": "{{ fg }}", - "statusBar.border": "{{ bg }}", + "statusBar.background": "{{ background }}", + "statusBar.foreground": "{{ foreground }}", + "statusBar.border": "{{ background }}", "statusBar.debuggingBackground": "{{ yellow }}", - "statusBar.debuggingForeground": "{{ bg }}", + "statusBar.debuggingForeground": "{{ background }}", "statusBar.debuggingBorder": "{{ yellow }}", - "statusBar.noFolderBackground": "{{ bg }}", - "statusBar.noFolderForeground": "{{ fg }}", - "statusBar.noFolderBorder": "{{ bg }}", + "statusBar.noFolderBackground": "{{ background }}", + "statusBar.noFolderForeground": "{{ foreground }}", + "statusBar.noFolderBorder": "{{ background }}", "statusBar.focusBorder": "{{ accent }}", "statusBarItem.activeBackground": "{{ muted }}", "statusBarItem.hoverBackground": "{{ muted }}60", - "statusBarItem.hoverForeground": "{{ fg }}", - "statusBarItem.prominentForeground": "{{ fg }}", + "statusBarItem.hoverForeground": "{{ foreground }}", + "statusBarItem.prominentForeground": "{{ foreground }}", "statusBarItem.prominentBackground": "{{ accent }}", "statusBarItem.prominentHoverBackground": "{{ accent }}80", "statusBarItem.remoteBackground": "{{ accent }}", - "statusBarItem.remoteForeground": "{{ bg }}", + "statusBarItem.remoteForeground": "{{ background }}", "statusBarItem.remoteHoverBackground": "{{ accent }}80", "statusBarItem.errorBackground": "{{ red }}", - "statusBarItem.errorForeground": "{{ bg }}", + "statusBarItem.errorForeground": "{{ background }}", "statusBarItem.errorHoverBackground": "{{ red }}80", "statusBarItem.warningBackground": "{{ yellow }}", - "statusBarItem.warningForeground": "{{ bg }}", + "statusBarItem.warningForeground": "{{ background }}", "statusBarItem.warningHoverBackground": "{{ yellow }}80", "statusBarItem.compactHoverBackground": "{{ muted }}", "statusBarItem.focusBorder": "{{ accent }}", - "titleBar.activeBackground": "{{ bg }}", - "titleBar.activeForeground": "{{ fg }}", - "titleBar.inactiveBackground": "{{ bg }}", + "titleBar.activeBackground": "{{ background }}", + "titleBar.activeForeground": "{{ foreground }}", + "titleBar.inactiveBackground": "{{ background }}", "titleBar.inactiveForeground": "{{ muted }}", - "titleBar.border": "{{ bg }}", + "titleBar.border": "{{ background }}", - "menubar.selectionForeground": "{{ fg }}", + "menubar.selectionForeground": "{{ foreground }}", "menubar.selectionBackground": "{{ accent }}30", "menubar.selectionBorder": "{{ accent }}00", - "menu.foreground": "{{ fg }}", - "menu.background": "{{ bg }}", - "menu.selectionForeground": "{{ fg }}", + "menu.foreground": "{{ foreground }}", + "menu.background": "{{ background }}", + "menu.selectionForeground": "{{ foreground }}", "menu.selectionBackground": "{{ accent }}30", "menu.selectionBorder": "{{ accent }}00", "menu.separatorBackground": "{{ muted }}", "menu.border": "{{ muted }}", - "commandCenter.foreground": "{{ fg }}", - "commandCenter.activeForeground": "{{ fg }}", - "commandCenter.background": "{{ bg }}", + "commandCenter.foreground": "{{ foreground }}", + "commandCenter.activeForeground": "{{ foreground }}", + "commandCenter.background": "{{ background }}", "commandCenter.activeBackground": "{{ muted }}", "commandCenter.border": "{{ muted }}", "commandCenter.inactiveForeground": "{{ muted }}", @@ -483,11 +483,11 @@ "commandCenter.debuggingBackground": "{{ yellow }}20", "notificationCenter.border": "{{ muted }}", - "notificationCenterHeader.foreground": "{{ fg }}", - "notificationCenterHeader.background": "{{ bg }}", + "notificationCenterHeader.foreground": "{{ foreground }}", + "notificationCenterHeader.background": "{{ background }}", "notificationToast.border": "{{ muted }}", - "notifications.foreground": "{{ fg }}", - "notifications.background": "{{ bg }}", + "notifications.foreground": "{{ foreground }}", + "notifications.background": "{{ background }}", "notifications.border": "{{ muted }}", "notificationLink.foreground": "{{ accent }}", "notificationsErrorIcon.foreground": "{{ red }}", @@ -495,18 +495,18 @@ "notificationsInfoIcon.foreground": "{{ blue }}", "banner.background": "{{ accent }}20", - "banner.foreground": "{{ fg }}", + "banner.foreground": "{{ foreground }}", "banner.iconForeground": "{{ accent }}", "extensionButton.prominentBackground": "{{ accent }}", - "extensionButton.prominentForeground": "{{ bg }}", + "extensionButton.prominentForeground": "{{ background }}", "extensionButton.prominentHoverBackground": "{{ accent }}80", "extensionButton.background": "{{ muted }}", - "extensionButton.foreground": "{{ fg }}", + "extensionButton.foreground": "{{ foreground }}", "extensionButton.hoverBackground": "{{ muted }}80", - "extensionButton.separator": "{{ bg }}", + "extensionButton.separator": "{{ background }}", "extensionBadge.remoteBackground": "{{ accent }}", - "extensionBadge.remoteForeground": "{{ bg }}", + "extensionBadge.remoteForeground": "{{ background }}", "extensionIcon.starForeground": "{{ yellow }}", "extensionIcon.verifiedForeground": "{{ cyan }}", "extensionIcon.preReleaseForeground": "{{ yellow }}", @@ -514,22 +514,22 @@ "pickerGroup.border": "{{ muted }}", "pickerGroup.foreground": "{{ accent }}", - "quickInput.background": "{{ bg }}", - "quickInput.foreground": "{{ fg }}", + "quickInput.background": "{{ background }}", + "quickInput.foreground": "{{ foreground }}", "quickInputList.focusBackground": "{{ accent }}30", - "quickInputList.focusForeground": "{{ fg }}", - "quickInputList.focusIconForeground": "{{ fg }}", - "quickInputTitle.background": "{{ bg }}", + "quickInputList.focusForeground": "{{ foreground }}", + "quickInputList.focusIconForeground": "{{ foreground }}", + "quickInputTitle.background": "{{ background }}", "keybindingLabel.background": "{{ muted }}40", - "keybindingLabel.foreground": "{{ fg }}", + "keybindingLabel.foreground": "{{ foreground }}", "keybindingLabel.border": "{{ muted }}", "keybindingLabel.bottomBorder": "{{ muted }}", - "keybindingTable.headerBackground": "{{ bg }}", - "keybindingTable.rowsBackground": "{{ bg }}40", + "keybindingTable.headerBackground": "{{ background }}", + "keybindingTable.rowsBackground": "{{ background }}40", - "terminal.background": "{{ bg }}", - "terminal.foreground": "{{ fg }}", + "terminal.background": "{{ background }}", + "terminal.foreground": "{{ foreground }}", "terminal.border": "{{ muted }}40", "terminal.selectionBackground": "{{ selection_background }}60", "terminal.selectionForeground": "{{ selection_foreground }}", @@ -539,16 +539,16 @@ "terminal.findMatchHighlightBackground": "{{ yellow }}25", "terminal.findMatchHighlightBorder": "{{ yellow }}60", "terminal.hoverHighlightBackground": "{{ accent }}20", - "terminalCursor.background": "{{ bg }}", - "terminalCursor.foreground": "{{ bright_fg }}", - "terminal.ansiBlack": "{{ bg }}", + "terminalCursor.background": "{{ background }}", + "terminalCursor.foreground": "{{ bright_foreground }}", + "terminal.ansiBlack": "{{ background }}", "terminal.ansiRed": "{{ red }}", "terminal.ansiGreen": "{{ green }}", "terminal.ansiYellow": "{{ yellow }}", "terminal.ansiBlue": "{{ blue }}", "terminal.ansiMagenta": "{{ magenta }}", "terminal.ansiCyan": "{{ cyan }}", - "terminal.ansiWhite": "{{ fg }}", + "terminal.ansiWhite": "{{ foreground }}", "terminal.ansiBrightBlack": "{{ muted }}", "terminal.ansiBrightRed": "{{ bright_red }}", "terminal.ansiBrightGreen": "{{ bright_green }}", @@ -556,25 +556,25 @@ "terminal.ansiBrightBlue": "{{ bright_blue }}", "terminal.ansiBrightMagenta": "{{ bright_magenta }}", "terminal.ansiBrightCyan": "{{ bright_cyan }}", - "terminal.ansiBrightWhite": "{{ bright_fg }}", + "terminal.ansiBrightWhite": "{{ bright_foreground }}", "terminal.tab.activeBorder": "{{ accent }}", "terminalCommandDecoration.defaultBackground": "{{ muted }}", "terminalCommandDecoration.successBackground": "{{ green }}", "terminalCommandDecoration.errorBackground": "{{ red }}", - "terminalOverviewRuler.cursorForeground": "{{ bright_fg }}", + "terminalOverviewRuler.cursorForeground": "{{ bright_foreground }}", "terminalOverviewRuler.findMatchForeground": "{{ yellow }}", - "terminalStickyScroll.background": "{{ bg }}", + "terminalStickyScroll.background": "{{ background }}", "terminalStickyScrollHover.background": "{{ muted }}40", - "debugToolBar.background": "{{ bg }}", + "debugToolBar.background": "{{ background }}", "debugToolBar.border": "{{ muted }}", - "debugView.stateLabelForeground": "{{ fg }}", + "debugView.stateLabelForeground": "{{ foreground }}", "debugView.stateLabelBackground": "{{ accent }}30", "debugView.valueChangedHighlight": "{{ cyan }}40", - "debugView.exceptionLabelForeground": "{{ bg }}", + "debugView.exceptionLabelForeground": "{{ background }}", "debugView.exceptionLabelBackground": "{{ red }}", "debugTokenExpression.name": "{{ magenta }}", - "debugTokenExpression.value": "{{ fg }}", + "debugTokenExpression.value": "{{ foreground }}", "debugTokenExpression.string": "{{ green }}", "debugTokenExpression.boolean": "{{ orange }}", "debugTokenExpression.number": "{{ orange }}", @@ -588,20 +588,20 @@ "testing.iconUnset": "{{ muted }}", "testing.iconSkipped": "{{ yellow }}", "testing.peekBorder": "{{ accent }}", - "testing.peekHeaderBackground": "{{ bg }}", + "testing.peekHeaderBackground": "{{ background }}", "testing.message.error.decorationForeground": "{{ red }}", "testing.message.error.lineBackground": "{{ red }}15", "testing.message.info.decorationForeground": "{{ blue }}", "testing.message.info.lineBackground": "{{ blue }}15", - "welcomePage.background": "{{ bg }}", - "welcomePage.tileBackground": "{{ bg }}", + "welcomePage.background": "{{ background }}", + "welcomePage.tileBackground": "{{ background }}", "welcomePage.tileHoverBackground": "{{ muted }}40", "welcomePage.tileBorder": "{{ muted }}", "welcomePage.progress.background": "{{ muted }}", "welcomePage.progress.foreground": "{{ accent }}", - "walkThrough.embeddedEditorBackground": "{{ bg }}", - "walkthrough.stepTitle.foreground": "{{ fg }}", + "walkThrough.embeddedEditorBackground": "{{ background }}", + "walkthrough.stepTitle.foreground": "{{ foreground }}", "gitDecoration.addedResourceForeground": "{{ green }}", "gitDecoration.modifiedResourceForeground": "{{ orange }}", @@ -614,21 +614,21 @@ "gitDecoration.conflictingResourceForeground": "{{ yellow }}", "gitDecoration.submoduleResourceForeground": "{{ magenta }}", - "settings.headerForeground": "{{ fg }}", + "settings.headerForeground": "{{ foreground }}", "settings.modifiedItemIndicator": "{{ accent }}", - "settings.dropdownBackground": "{{ bg }}", - "settings.dropdownForeground": "{{ fg }}", + "settings.dropdownBackground": "{{ background }}", + "settings.dropdownForeground": "{{ foreground }}", "settings.dropdownBorder": "{{ muted }}", "settings.dropdownListBorder": "{{ muted }}", - "settings.checkboxBackground": "{{ bg }}", - "settings.checkboxForeground": "{{ fg }}", + "settings.checkboxBackground": "{{ background }}", + "settings.checkboxForeground": "{{ foreground }}", "settings.checkboxBorder": "{{ muted }}", - "settings.rowHoverBackground": "{{ bg }}", - "settings.textInputBackground": "{{ bg }}", - "settings.textInputForeground": "{{ fg }}", + "settings.rowHoverBackground": "{{ background }}", + "settings.textInputBackground": "{{ background }}", + "settings.textInputForeground": "{{ foreground }}", "settings.textInputBorder": "{{ muted }}", - "settings.numberInputBackground": "{{ bg }}", - "settings.numberInputForeground": "{{ fg }}", + "settings.numberInputBackground": "{{ background }}", + "settings.numberInputForeground": "{{ foreground }}", "settings.numberInputBorder": "{{ muted }}", "settings.focusedRowBackground": "{{ accent }}10", "settings.focusedRowBorder": "{{ accent }}40", @@ -637,10 +637,10 @@ "settings.settingsHeaderHoverForeground": "{{ accent }}", "breadcrumb.foreground": "{{ muted }}", - "breadcrumb.background": "{{ bg }}", - "breadcrumb.focusForeground": "{{ fg }}", - "breadcrumb.activeSelectionForeground": "{{ fg }}", - "breadcrumbPicker.background": "{{ bg }}", + "breadcrumb.background": "{{ background }}", + "breadcrumb.focusForeground": "{{ foreground }}", + "breadcrumb.activeSelectionForeground": "{{ foreground }}", + "breadcrumbPicker.background": "{{ background }}", "editor.snippetTabstopHighlightBackground": "{{ accent }}20", "editor.snippetTabstopHighlightBorder": "{{ accent }}40", @@ -656,9 +656,9 @@ "symbolIcon.enumeratorForeground": "{{ yellow }}", "symbolIcon.enumeratorMemberForeground": "{{ orange }}", "symbolIcon.eventForeground": "{{ yellow }}", - "symbolIcon.fieldForeground": "{{ fg }}", - "symbolIcon.fileForeground": "{{ fg }}", - "symbolIcon.folderForeground": "{{ fg }}", + "symbolIcon.fieldForeground": "{{ foreground }}", + "symbolIcon.fileForeground": "{{ foreground }}", + "symbolIcon.folderForeground": "{{ foreground }}", "symbolIcon.functionForeground": "{{ blue }}", "symbolIcon.interfaceForeground": "{{ yellow }}", "symbolIcon.keyForeground": "{{ bright_magenta }}", @@ -671,12 +671,12 @@ "symbolIcon.objectForeground": "{{ yellow }}", "symbolIcon.operatorForeground": "{{ bright_blue }}", "symbolIcon.packageForeground": "{{ yellow }}", - "symbolIcon.propertyForeground": "{{ fg }}", + "symbolIcon.propertyForeground": "{{ foreground }}", "symbolIcon.referenceForeground": "{{ bright_magenta }}", "symbolIcon.snippetForeground": "{{ green }}", "symbolIcon.stringForeground": "{{ green }}", "symbolIcon.structForeground": "{{ yellow }}", - "symbolIcon.textForeground": "{{ fg }}", + "symbolIcon.textForeground": "{{ foreground }}", "symbolIcon.typeParameterForeground": "{{ yellow }}", "symbolIcon.unitForeground": "{{ orange }}", "symbolIcon.variableForeground": "{{ bright_magenta }}", @@ -699,22 +699,22 @@ "debugConsole.infoForeground": "{{ blue }}", "debugConsole.warningForeground": "{{ yellow }}", "debugConsole.errorForeground": "{{ red }}", - "debugConsole.sourceForeground": "{{ fg }}", + "debugConsole.sourceForeground": "{{ foreground }}", "debugConsoleInputIcon.foreground": "{{ accent }}", - "notebook.editorBackground": "{{ bg }}", + "notebook.editorBackground": "{{ background }}", "notebook.cellBorderColor": "{{ muted }}40", - "notebook.cellHoverBackground": "{{ bg }}40", + "notebook.cellHoverBackground": "{{ background }}40", "notebook.cellInsertionIndicator": "{{ accent }}", "notebook.cellStatusBarItemHoverBackground": "{{ muted }}", "notebook.cellToolbarSeparator": "{{ muted }}", - "notebook.cellEditorBackground": "{{ bg }}", - "notebook.focusedCellBackground": "{{ bg }}60", + "notebook.cellEditorBackground": "{{ background }}", + "notebook.focusedCellBackground": "{{ background }}60", "notebook.focusedCellBorder": "{{ accent }}", "notebook.focusedEditorBorder": "{{ accent }}", "notebook.inactiveFocusedCellBorder": "{{ muted }}", "notebook.inactiveSelectedCellBorder": "{{ muted }}", - "notebook.outputContainerBackgroundColor": "{{ bg }}", + "notebook.outputContainerBackgroundColor": "{{ background }}", "notebook.outputContainerBorderColor": "{{ muted }}40", "notebook.selectedCellBackground": "{{ accent }}15", "notebook.selectedCellBorder": "{{ accent }}40", @@ -724,7 +724,7 @@ "notebookStatusSuccessIcon.foreground": "{{ green }}", "notebookEditorOverviewRuler.runningCellForeground": "{{ accent }}", - "charts.foreground": "{{ fg }}", + "charts.foreground": "{{ foreground }}", "charts.lines": "{{ muted }}", "charts.red": "{{ red }}", "charts.blue": "{{ blue }}", @@ -740,17 +740,17 @@ "editorWatermark.foreground": "{{ muted }}", - "inlineChat.background": "{{ bg }}", + "inlineChat.background": "{{ background }}", "inlineChat.border": "{{ muted }}", - "inlineChat.shadow": "{{ bg }}80", + "inlineChat.shadow": "{{ background }}80", "inlineChatInput.border": "{{ muted }}", "inlineChatInput.focusBorder": "{{ accent }}", "inlineChatInput.placeholderForeground": "{{ muted }}", - "inlineChatInput.background": "{{ bg }}", + "inlineChatInput.background": "{{ background }}", "inlineChatDiff.inserted": "{{ green }}20", "inlineChatDiff.removed": "{{ red }}20", - "chat.requestBackground": "{{ bg }}", + "chat.requestBackground": "{{ background }}", "chat.requestBorder": "{{ muted }}" }, "tokenColors": [ @@ -766,7 +766,7 @@ "name": "Variable", "scope": ["variable", "string constant.other.placeholder"], "settings": { - "foreground": "{{ fg }}" + "foreground": "{{ foreground }}" } }, { @@ -867,7 +867,7 @@ "name": "Type Builtin", "scope": ["storage.type.primitive", "support.type"], "settings": { - "foreground": "{{ fg }}" + "foreground": "{{ foreground }}" } }, { @@ -939,7 +939,7 @@ "name": "Punctuation", "scope": ["punctuation", "meta.brace", "meta.bracket"], "settings": { - "foreground": "{{ dark_fg }}" + "foreground": "{{ dark_foreground }}" } }, { @@ -1016,7 +1016,7 @@ "name": "Tag Attribute", "scope": ["entity.other.attribute-name"], "settings": { - "foreground": "{{ fg }}" + "foreground": "{{ foreground }}" } }, { @@ -1030,7 +1030,7 @@ "name": "CSS Value", "scope": ["support.constant.property-value.css", "meta.property-value.css"], "settings": { - "foreground": "{{ fg }}" + "foreground": "{{ foreground }}" } }, { @@ -1109,7 +1109,7 @@ "name": "Markdown Bold", "scope": ["markup.bold", "punctuation.definition.bold.markdown"], "settings": { - "foreground": "{{ fg }}", + "foreground": "{{ foreground }}", "fontStyle": "bold" } }, @@ -1117,7 +1117,7 @@ "name": "Markdown Italic", "scope": ["markup.italic", "punctuation.definition.italic.markdown"], "settings": { - "foreground": "{{ fg }}", + "foreground": "{{ foreground }}", "fontStyle": "italic" } }, @@ -1175,7 +1175,7 @@ "name": "This/Self", "scope": ["variable.language.this", "variable.language.self", "variable.language.special.self"], "settings": { - "foreground": "{{ fg }}", + "foreground": "{{ foreground }}", "fontStyle": "italic" } }, @@ -1183,7 +1183,7 @@ "name": "Object Keys", "scope": ["meta.object-literal.key", "string.unquoted.label.js"], "settings": { - "foreground": "{{ fg }}" + "foreground": "{{ foreground }}" } }, { @@ -1205,7 +1205,7 @@ "name": "Shell Variable", "scope": ["variable.other.normal.shell", "variable.other.positional.shell", "variable.other.bracket.shell"], "settings": { - "foreground": "{{ fg }}" + "foreground": "{{ foreground }}" } }, { @@ -1268,7 +1268,7 @@ "name": "Make Variable", "scope": ["variable.other.makefile"], "settings": { - "foreground": "{{ fg }}" + "foreground": "{{ foreground }}" } }, { @@ -1282,7 +1282,7 @@ "name": "Python Self", "scope": ["variable.parameter.function.language.special.self.python"], "settings": { - "foreground": "{{ fg }}", + "foreground": "{{ foreground }}", "fontStyle": "italic" } }, @@ -1298,7 +1298,7 @@ "name": "PHP Variable", "scope": ["variable.other.php", "punctuation.definition.variable.php"], "settings": { - "foreground": "{{ fg }}" + "foreground": "{{ foreground }}" } }, { @@ -1333,7 +1333,7 @@ "name": "GraphQL Field", "scope": ["variable.graphql", "variable.other.graphql"], "settings": { - "foreground": "{{ fg }}" + "foreground": "{{ foreground }}" } } ] diff --git a/default/themed/waybar.css.tpl b/default/themed/waybar.css.tpl index 27e5ba6a..d876a922 100644 --- a/default/themed/waybar.css.tpl +++ b/default/themed/waybar.css.tpl @@ -1,2 +1,2 @@ -@define-color foreground {{ fg }}; -@define-color background {{ bg }}; +@define-color foreground {{ foreground }}; +@define-color background {{ background }}; diff --git a/docs/omarchy-shell.md b/docs/omarchy-shell.md index c1c7ae0d..d45705de 100644 --- a/docs/omarchy-shell.md +++ b/docs/omarchy-shell.md @@ -141,9 +141,9 @@ sizing in `themes//shell.toml`. Defaults are generated from `default/themed/shell.toml.tpl`; a theme may also drop a hand-written `shell.toml` next to its `colors.toml` to replace the generated file. -`colors.toml` uses `fg` and `bg` for the foundational text/background -palette. The shell exposes those to QML as `Color.foreground` and -`Color.background`, so shell roles still use the readable role names. +`colors.toml` uses `foreground` and `background` for the foundational +text/background palette, exposed to QML as `Color.foreground` and +`Color.background`. The shell exposes these tokens to QML via two singletons in `qs.Commons`: diff --git a/docs/theming.md b/docs/theming.md index ab74c8c9..9a6f3a1a 100644 --- a/docs/theming.md +++ b/docs/theming.md @@ -30,36 +30,50 @@ built-in template, the built-in output is skipped. ## `colors.toml` -`colors.toml` provides the palette keys used by templates. Common keys are: +`colors.toml` provides the palette keys used by templates. Keys are grouped +semantic-first: accent/selection/muted, then the backgrounds, then the +foregrounds, then the named colors: ```toml -bg = "#1a1b26" -fg = "#a9b1d6" -accent = "#7aa2f7" -selection = "#292e42" -red = "#f7768e" -blue = "#7aa2f7" +mode = "dark" + +accent = "#7aa2f7" +selection = "#292e42" +muted = "#414868" + +background = "#1a1b26" +dark_background = "#13141c" +darker_background = "#0e0e14" +lighter_background = "#24283b" + +foreground = "#a9b1d6" +dark_foreground = "#565f89" +light_foreground = "#b4bee6" +bright_foreground = "#c0caf5" + +red = "#f7768e" +blue = "#7aa2f7" ``` Any key can be referenced from a template with `{{ key }}`. The foundational shell palette is loaded from: -- `fg` — primary readable text color -- `bg` — primary background color +- `foreground` — primary readable text color +- `background` — primary background color - `accent` — preferred when present; otherwise some places fall back to `color4` +- `muted` — de-emphasized elements (comments, placeholders, dividers); also + serves as ANSI `color8` - `urgent` / `red` / `color1` -For older user themes and templates, `foreground` aliases to `fg` and -`background` aliases to `bg`. - -The neutral ramp is centered on `bg -> bright_fg`. Dark themes should read from -darkest to lightest; light themes should read from lightest to darkest. Terminal -and editor cursors use `bright_fg`; there is no separate cursor palette key. -`selection` is the text-selection background stop in that ramp; Omarchy derives -`selection_background = selection` and `selection_foreground = bright_fg`. Use -`omarchy dev theme-preview [theme]` to inspect that ramp, including `dark_bg`, -`darker_bg`, and a selected-text sample. +The neutral ramp is centered on `background -> bright_foreground`. Dark themes +should read from darkest to lightest; light themes should read from lightest to +darkest. Terminal and editor cursors use `bright_foreground`; there is no +separate cursor palette key. `selection` is the text-selection background stop +in that ramp; Omarchy derives `selection_background = selection` and +`selection_foreground = bright_foreground`. Use +`omarchy dev theme-preview [theme]` to inspect that ramp, including +`dark_background`, `darker_background`, and a selected-text sample. ## Template placeholders @@ -82,8 +96,8 @@ For a color key such as `accent = "#7aa2f7"`: percentage: ```text -{{ mix bg fg 15% }} -{{ mix_strip bg accent 0.35 }} +{{ mix background foreground 15% }} +{{ mix_strip background accent 0.35 }} {{ mix_rgb color0 color7 50 }} ``` diff --git a/shell/Commons/Color.qml b/shell/Commons/Color.qml index 2bc9e977..d6cf9790 100644 --- a/shell/Commons/Color.qml +++ b/shell/Commons/Color.qml @@ -4,9 +4,8 @@ import Quickshell import Quickshell.Io import "BorderGeometry.js" as Geometry -// Color surfaces for the shell. Foundational palette (fg, bg, accent, -// urgent) comes from theme/colors.toml and is exposed here as -// foreground/background/accent/urgent. Per-surface roles come from +// Color surfaces for the shell. Foundational palette (foreground, background, +// accent, urgent) comes from theme/colors.toml. Per-surface roles come from // theme/shell.toml — generated per theme from default/themed/shell.toml.tpl, // or shipped directly by a theme to replace the generated file. Surfaces that // don't appear in shell.toml fall back to the foundational palette. @@ -146,8 +145,6 @@ QtObject { var lines = String(raw || "").split("\n") var foundAccent = false var foundMuted = false - var foundForeground = false - var foundBackground = false var loadedForeground = false var loadedBackground = false var color0Value = "" @@ -157,10 +154,8 @@ QtObject { for (var i = 0; i < lines.length; i++) { var match = lines[i].match(/^\s*([A-Za-z0-9_-]+)\s*=\s*["']?(#[0-9A-Fa-f]{6})/) if (!match) continue - if (match[1] === "foreground") { foreground = match[2]; foundForeground = true; loadedForeground = true } - else if (match[1] === "background") { background = match[2]; foundBackground = true; loadedBackground = true } - else if (match[1] === "fg" && !foundForeground) { foreground = match[2]; loadedForeground = true } - else if (match[1] === "bg" && !foundBackground) { background = match[2]; loadedBackground = true } + if (match[1] === "foreground") { foreground = match[2]; loadedForeground = true } + else if (match[1] === "background") { background = match[2]; loadedBackground = true } // Prefer the explicit `accent` key; only fall back to color4 when the // theme doesn't define a separate accent. color4 appears later in the // file so the old single-property approach clobbered accent with it. diff --git a/test/cli b/test/cli index 8de0487f..db3a4a0c 100755 --- a/test/cli +++ b/test/cli @@ -220,8 +220,8 @@ cat >"$NEXT_THEME/colors.toml" <<'EOF' mode = "light" accent = "#336699" hyprland_active_border = "rgba(010203ee) rgba(040506ee) 45deg" -bg = "#000000" -fg = "#ffffff" +background = "#000000" +foreground = "#ffffff" selection = "#808080" red = "#ff0000" green = "#00ff00" @@ -236,13 +236,13 @@ bright_yellow = "#ffff11" bright_blue = "#1111ff" bright_magenta = "#ff11ff" bright_cyan = "#11ffff" -bright_fg = "#eeeeee" +bright_foreground = "#eeeeee" EOF cat >"$USER_THEMED/mix-test.txt.tpl" <<'EOF' -mix={{ mix bg fg 50% }} -strip={{ mix_strip bg fg 50% }} -rgb={{ mix_rgb bg fg 50% }} +mix={{ mix background foreground 50% }} +strip={{ mix_strip background foreground 50% }} +rgb={{ mix_rgb background foreground 50% }} EOF cat >"$USER_THEMED/gradient-test.txt.tpl" <<'EOF' @@ -262,8 +262,8 @@ magenta={{ magenta }} legacy-purple={{ purple }} bright-magenta={{ bright_magenta }} legacy-bright-purple={{ bright_purple }} -legacy-background={{ background }} -legacy-foreground={{ foreground }} +background={{ background }} +foreground={{ foreground }} selection-background={{ selection_background }} selection-foreground={{ selection_foreground }} cursor-alias={{ cursor }} @@ -288,11 +288,11 @@ grep -qx 'magenta=#ff00ff' "$NEXT_THEME/alias-test.txt" || fail "theme template grep -qx 'legacy-purple=#ff00ff' "$NEXT_THEME/alias-test.txt" || fail "theme template purple alias works" grep -qx 'bright-magenta=#ff11ff' "$NEXT_THEME/alias-test.txt" || fail "theme template bright magenta helper works" grep -qx 'legacy-bright-purple=#ff11ff' "$NEXT_THEME/alias-test.txt" || fail "theme template bright purple alias works" -grep -qx 'legacy-background=#000000' "$NEXT_THEME/alias-test.txt" || fail "theme template legacy background alias works" -grep -qx 'legacy-foreground=#ffffff' "$NEXT_THEME/alias-test.txt" || fail "theme template legacy foreground alias works" +grep -qx 'background=#000000' "$NEXT_THEME/alias-test.txt" || fail "theme template resolves background" +grep -qx 'foreground=#ffffff' "$NEXT_THEME/alias-test.txt" || fail "theme template resolves foreground" grep -qx 'selection-background=#808080' "$NEXT_THEME/alias-test.txt" || fail "theme template derives selection background from selection" -grep -qx 'selection-foreground=#eeeeee' "$NEXT_THEME/alias-test.txt" || fail "theme template derives selection foreground from bright_fg" -grep -qx 'cursor-alias=#eeeeee' "$NEXT_THEME/alias-test.txt" || fail "theme template derives cursor alias from bright_fg" +grep -qx 'selection-foreground=#eeeeee' "$NEXT_THEME/alias-test.txt" || fail "theme template derives selection foreground from bright_foreground" +grep -qx 'cursor-alias=#eeeeee' "$NEXT_THEME/alias-test.txt" || fail "theme template derives cursor alias from bright_foreground" pass "theme template semantic aliases expose legacy colorN helpers" osc_summary=$("$ROOT/bin/omarchy-theme-osc" "$NEXT_THEME/colors.toml" | python -c 'import sys; data = sys.stdin.buffer.read(); print(data.count(b"]4;"), b"]4;1;#ff0000" in data, b"]4;7;#ffffff" in data, b"]4;15;#eeeeee" in data, b"]12;#eeeeee" in data, b"]17;#808080" in data, b"]19;#eeeeee" in data)') @@ -300,18 +300,18 @@ osc_summary=$("$ROOT/bin/omarchy-theme-osc" "$NEXT_THEME/colors.toml" | python - pass "theme OSC aliases semantic colors to ANSI palette" preview_output=$(OMARCHY_PATH="$ROOT" HOME="$PI_TMPDIR" "$ROOT/bin/omarchy-dev-theme-preview" "$NEXT_THEME/colors.toml" --no-color) -assert_output_contains "theme preview shows bg to bright_fg gradient" "$preview_output" "bg -> bright_fg gradient" +assert_output_contains "theme preview shows background to bright_foreground gradient" "$preview_output" "background -> bright_foreground gradient" assert_output_contains "theme preview orders light mode ramp light to dark" "$preview_output" "Neutral ramp (lightest -> darkest)" -assert_output_contains "theme preview includes dark background slots" "$preview_output" "darker_bg" +assert_output_contains "theme preview includes dark background slots" "$preview_output" "darker_background" assert_output_contains "theme preview shows selected text sample" "$preview_output" "This is some [selected text] in a sentence" assert_output_contains "theme preview shows practical terminal samples" "$preview_output" "Terminal/UI samples" assert_output_contains "theme preview shows ANSI palette strips" "$preview_output" "ANSI palette strips" -tokyo_fg=$(awk -F'"' '/^fg =/ { print $2; exit }' "$ROOT/themes/tokyo-night/colors.toml") -tokyo_light_fg=$(awk -F'"' '/^light_fg =/ { print $2; exit }' "$ROOT/themes/tokyo-night/colors.toml") -tokyo_bright_fg=$(awk -F'"' '/^bright_fg =/ { print $2; exit }' "$ROOT/themes/tokyo-night/colors.toml") -[[ $tokyo_fg == "#a9b1d6" && $tokyo_light_fg == "#b4bee6" && $tokyo_bright_fg == "#c0caf5" ]] || fail "tokyo night fg ramp stays ordered" -pass "tokyo night fg ramp stays ordered" +tokyo_fg=$(awk -F'"' '/^foreground =/ { print $2; exit }' "$ROOT/themes/tokyo-night/colors.toml") +tokyo_light_fg=$(awk -F'"' '/^light_foreground =/ { print $2; exit }' "$ROOT/themes/tokyo-night/colors.toml") +tokyo_bright_fg=$(awk -F'"' '/^bright_foreground =/ { print $2; exit }' "$ROOT/themes/tokyo-night/colors.toml") +[[ $tokyo_fg == "#a9b1d6" && $tokyo_light_fg == "#b4bee6" && $tokyo_bright_fg == "#c0caf5" ]] || fail "tokyo night foreground ramp stays ordered" +pass "tokyo night foreground ramp stays ordered" if rg -q '^cursor\s*=' "$ROOT/themes" -g'colors.toml'; then fail "built-in colors.toml files omit cursor token" diff --git a/themes/catppuccin-latte/colors.toml b/themes/catppuccin-latte/colors.toml index 03a94be9..b5775f26 100644 --- a/themes/catppuccin-latte/colors.toml +++ b/themes/catppuccin-latte/colors.toml @@ -1,17 +1,18 @@ mode = "light" accent = "#1e66f5" - -bg = "#eff1f5" -dark_bg = "#e3e4e8" -darker_bg = "#d7d8dc" -lighter_bg = "#dce0e8" selection = "#ccd0da" muted = "#acb0be" -dark_fg = "#9ca0b0" -fg = "#4c4f69" -light_fg = "#5c5f77" -bright_fg = "#4c4f69" + +background = "#eff1f5" +dark_background = "#e3e4e8" +darker_background = "#d7d8dc" +lighter_background = "#dce0e8" + +foreground = "#4c4f69" +dark_foreground = "#9ca0b0" +light_foreground = "#5c5f77" +bright_foreground = "#4c4f69" red = "#d20f39" yellow = "#df8e1d" diff --git a/themes/catppuccin/colors.toml b/themes/catppuccin/colors.toml index 6826435b..ee62f932 100644 --- a/themes/catppuccin/colors.toml +++ b/themes/catppuccin/colors.toml @@ -1,17 +1,18 @@ mode = "dark" accent = "#89b4fa" - -bg = "#1e1e2e" -dark_bg = "#161622" -darker_bg = "#101019" -lighter_bg = "#313244" selection = "#45475a" muted = "#585b70" -dark_fg = "#6c7086" -fg = "#cdd6f4" -light_fg = "#bac2de" -bright_fg = "#cdd6f4" + +background = "#1e1e2e" +dark_background = "#161622" +darker_background = "#101019" +lighter_background = "#313244" + +foreground = "#cdd6f4" +dark_foreground = "#6c7086" +light_foreground = "#bac2de" +bright_foreground = "#cdd6f4" red = "#f38ba8" yellow = "#f9e2af" diff --git a/themes/ethereal/colors.toml b/themes/ethereal/colors.toml index 1b2f51bb..b7ab3af3 100644 --- a/themes/ethereal/colors.toml +++ b/themes/ethereal/colors.toml @@ -1,17 +1,18 @@ mode = "dark" accent = "#7d82d9" - -bg = "#060B1E" -dark_bg = "#040816" -darker_bg = "#030610" -lighter_bg = "#131a3a" selection = "#252e56" muted = "#3d4573" -dark_fg = "#6d7db6" -fg = "#ffcead" -light_fg = "#c9b8a6" -bright_fg = "#ffcead" + +background = "#060B1E" +dark_background = "#040816" +darker_background = "#030610" +lighter_background = "#131a3a" + +foreground = "#ffcead" +dark_foreground = "#6d7db6" +light_foreground = "#c9b8a6" +bright_foreground = "#ffcead" red = "#ED5B5A" yellow = "#E9BB4F" diff --git a/themes/everforest/colors.toml b/themes/everforest/colors.toml index 8879aa8c..a2778128 100644 --- a/themes/everforest/colors.toml +++ b/themes/everforest/colors.toml @@ -1,17 +1,18 @@ mode = "dark" accent = "#7fbbb3" - -bg = "#2d353b" -dark_bg = "#21272c" -darker_bg = "#181d20" -lighter_bg = "#343f44" selection = "#3d484d" muted = "#475258" -dark_fg = "#4f585e" -fg = "#d3c6aa" -light_fg = "#9da9a0" -bright_fg = "#d3c6aa" + +background = "#2d353b" +dark_background = "#21272c" +darker_background = "#181d20" +lighter_background = "#343f44" + +foreground = "#d3c6aa" +dark_foreground = "#4f585e" +light_foreground = "#9da9a0" +bright_foreground = "#d3c6aa" red = "#e67e80" yellow = "#dbbc7f" diff --git a/themes/flexoki-light/colors.toml b/themes/flexoki-light/colors.toml index b5a2a329..30146f35 100644 --- a/themes/flexoki-light/colors.toml +++ b/themes/flexoki-light/colors.toml @@ -1,17 +1,18 @@ mode = "light" accent = "#205EA6" - -bg = "#FFFCF0" -dark_bg = "#f2efe4" -darker_bg = "#e5e2d8" -lighter_bg = "#E6E4D9" selection = "#CECDC3" muted = "#B7B5AC" -dark_fg = "#878580" -fg = "#100F0F" -light_fg = "#403E3C" -bright_fg = "#100F0F" + +background = "#FFFCF0" +dark_background = "#f2efe4" +darker_background = "#e5e2d8" +lighter_background = "#E6E4D9" + +foreground = "#100F0F" +dark_foreground = "#878580" +light_foreground = "#403E3C" +bright_foreground = "#100F0F" red = "#D14D41" yellow = "#D0A215" diff --git a/themes/gruvbox/colors.toml b/themes/gruvbox/colors.toml index a8a37acf..0c8e74d0 100644 --- a/themes/gruvbox/colors.toml +++ b/themes/gruvbox/colors.toml @@ -1,17 +1,18 @@ mode = "dark" accent = "#7daea3" - -bg = "#282828" -dark_bg = "#1e1e1e" -darker_bg = "#161616" -lighter_bg = "#3c3836" selection = "#504945" muted = "#665c54" -dark_fg = "#7c6f64" -fg = "#d4be98" -light_fg = "#bdae93" -bright_fg = "#d4be98" + +background = "#282828" +dark_background = "#1e1e1e" +darker_background = "#161616" +lighter_background = "#3c3836" + +foreground = "#d4be98" +dark_foreground = "#7c6f64" +light_foreground = "#bdae93" +bright_foreground = "#d4be98" red = "#ea6962" yellow = "#d8a657" diff --git a/themes/hackerman/colors.toml b/themes/hackerman/colors.toml index 70152d94..d351c8d9 100644 --- a/themes/hackerman/colors.toml +++ b/themes/hackerman/colors.toml @@ -1,18 +1,20 @@ mode = "dark" accent = "#82FB9C" -hyprland_active_border = "rgba(26a269ee) rgba(2ec27eee) 45deg" - -bg = "#0B0C16" -dark_bg = "#080910" -darker_bg = "#06060c" -lighter_bg = "#151828" selection = "#1f253a" muted = "#2d3450" -dark_fg = "#6a6e95" -fg = "#ddf7ff" -light_fg = "#b5c5db" -bright_fg = "#ddf7ff" + +background = "#0B0C16" +dark_background = "#080910" +darker_background = "#06060c" +lighter_background = "#151828" + +foreground = "#ddf7ff" +dark_foreground = "#6a6e95" +light_foreground = "#b5c5db" +bright_foreground = "#ddf7ff" + +hyprland_active_border = "rgba(26a269ee) rgba(2ec27eee) 45deg" red = "#50f872" yellow = "#50f7d4" diff --git a/themes/kanagawa/colors.toml b/themes/kanagawa/colors.toml index 8785be59..e897511d 100644 --- a/themes/kanagawa/colors.toml +++ b/themes/kanagawa/colors.toml @@ -1,17 +1,18 @@ mode = "dark" accent = "#dcd7ba" - -bg = "#1f1f28" -dark_bg = "#17171e" -darker_bg = "#111116" -lighter_bg = "#223249" selection = "#363646" muted = "#54546D" -dark_fg = "#727169" -fg = "#dcd7ba" -light_fg = "#c8c093" -bright_fg = "#dcd7ba" + +background = "#1f1f28" +dark_background = "#17171e" +darker_background = "#111116" +lighter_background = "#223249" + +foreground = "#dcd7ba" +dark_foreground = "#727169" +light_foreground = "#c8c093" +bright_foreground = "#dcd7ba" red = "#c34043" yellow = "#c0a36e" diff --git a/themes/last-horizon/colors.toml b/themes/last-horizon/colors.toml index d456ad23..599ec80f 100644 --- a/themes/last-horizon/colors.toml +++ b/themes/last-horizon/colors.toml @@ -1,22 +1,24 @@ mode = "dark" accent = "#b59790" +selection = "#584e51" +muted = "#584e51" + +background = "#0c0b0c" +dark_background = "#090809" +darker_background = "#060606" +lighter_background = "#0c0b0c" + +foreground = "#FAFCFB" +dark_foreground = "#584e51" +light_foreground = "#cfd3cd" +bright_foreground = "#e2dddc" + hyprland_active_border = "rgba(8a8588ee) rgba(e2dddcee)" hyprland_inactive_border = "rgba(584e51aa)" active_border_color = "#d6d3de" active_tab_background = "#a5a0b6" -bg = "#0c0b0c" -dark_bg = "#090809" -darker_bg = "#060606" -lighter_bg = "#0c0b0c" -selection = "#584e51" -muted = "#584e51" -dark_fg = "#584e51" -fg = "#FAFCFB" -light_fg = "#cfd3cd" -bright_fg = "#e2dddc" - red = "#c38b7b" yellow = "#6B5E73" green = "#87a9b0" diff --git a/themes/lumon/colors.toml b/themes/lumon/colors.toml index dae27e3c..0493ffbb 100644 --- a/themes/lumon/colors.toml +++ b/themes/lumon/colors.toml @@ -1,19 +1,21 @@ mode = "dark" accent = "#8bc9eb" -active_border_color = "#f2fcff" -active_tab_background = "#6fb8e3" - -bg = "#16242d" -dark_bg = "#101b21" -darker_bg = "#0b1216" -lighter_bg = "#1b2d40" selection = "#243d56" muted = "#304860" -dark_fg = "#4d86b0" -fg = "#d6e2ee" -light_fg = "#d6e2ee" -bright_fg = "#f2fcff" + +background = "#16242d" +dark_background = "#101b21" +darker_background = "#0b1216" +lighter_background = "#1b2d40" + +foreground = "#d6e2ee" +dark_foreground = "#4d86b0" +light_foreground = "#d6e2ee" +bright_foreground = "#f2fcff" + +active_border_color = "#f2fcff" +active_tab_background = "#6fb8e3" red = "#4d86b0" yellow = "#6fa4c9" diff --git a/themes/matte-black/colors.toml b/themes/matte-black/colors.toml index 2b95e7d5..4179f8a5 100644 --- a/themes/matte-black/colors.toml +++ b/themes/matte-black/colors.toml @@ -1,17 +1,18 @@ mode = "dark" accent = "#e68e0d" - -bg = "#121212" -dark_bg = "#0d0d0d" -darker_bg = "#090909" -lighter_bg = "#1e1e1e" selection = "#2a2a2a" muted = "#333333" -dark_fg = "#555555" -fg = "#bebebe" -light_fg = "#8a8a8d" -bright_fg = "#bebebe" + +background = "#121212" +dark_background = "#0d0d0d" +darker_background = "#090909" +lighter_background = "#1e1e1e" + +foreground = "#bebebe" +dark_foreground = "#555555" +light_foreground = "#8a8a8d" +bright_foreground = "#bebebe" red = "#D35F5F" yellow = "#b91c1c" diff --git a/themes/miasma/colors.toml b/themes/miasma/colors.toml index e6f9ccff..864d3f38 100644 --- a/themes/miasma/colors.toml +++ b/themes/miasma/colors.toml @@ -1,17 +1,18 @@ mode = "dark" accent = "#78824b" - -bg = "#222222" -dark_bg = "#191919" -darker_bg = "#121212" -lighter_bg = "#2c2c2c" selection = "#383838" muted = "#444444" -dark_fg = "#555555" -fg = "#c2c2b0" -light_fg = "#8a8a7e" -bright_fg = "#c2c2b0" + +background = "#222222" +dark_background = "#191919" +darker_background = "#121212" +lighter_background = "#2c2c2c" + +foreground = "#c2c2b0" +dark_foreground = "#555555" +light_foreground = "#8a8a7e" +bright_foreground = "#c2c2b0" red = "#685742" yellow = "#b36d43" diff --git a/themes/nord/colors.toml b/themes/nord/colors.toml index 241b2c2f..76de155a 100644 --- a/themes/nord/colors.toml +++ b/themes/nord/colors.toml @@ -1,17 +1,18 @@ mode = "dark" accent = "#81a1c1" - -bg = "#2e3440" -dark_bg = "#222730" -darker_bg = "#191c23" -lighter_bg = "#3b4252" selection = "#434c5e" muted = "#4c566a" -dark_fg = "#667080" -fg = "#d8dee9" -light_fg = "#adb5c4" -bright_fg = "#d8dee9" + +background = "#2e3440" +dark_background = "#222730" +darker_background = "#191c23" +lighter_background = "#3b4252" + +foreground = "#d8dee9" +dark_foreground = "#667080" +light_foreground = "#adb5c4" +bright_foreground = "#d8dee9" red = "#bf616a" yellow = "#ebcb8b" diff --git a/themes/osaka-jade/colors.toml b/themes/osaka-jade/colors.toml index d1f05509..65cd8b4e 100644 --- a/themes/osaka-jade/colors.toml +++ b/themes/osaka-jade/colors.toml @@ -1,17 +1,18 @@ mode = "dark" accent = "#509475" - -bg = "#111c18" -dark_bg = "#0c1512" -darker_bg = "#090f0d" -lighter_bg = "#23372B" selection = "#32473B" muted = "#53685B" -dark_fg = "#81B8A8" -fg = "#C1C497" -light_fg = "#D6D5BC" -bright_fg = "#F7E8B2" + +background = "#111c18" +dark_background = "#0c1512" +darker_background = "#090f0d" +lighter_background = "#23372B" + +foreground = "#C1C497" +dark_foreground = "#81B8A8" +light_foreground = "#D6D5BC" +bright_foreground = "#F7E8B2" red = "#FF5345" yellow = "#459451" diff --git a/themes/retro-82/colors.toml b/themes/retro-82/colors.toml index 511dc677..0a638ed1 100644 --- a/themes/retro-82/colors.toml +++ b/themes/retro-82/colors.toml @@ -1,17 +1,18 @@ mode = "dark" accent = "#faa968" - -bg = "#05182e" -dark_bg = "#031222" -darker_bg = "#020c17" -lighter_bg = "#0a2540" selection = "#134e5a" muted = "#2a6b78" -dark_fg = "#3f8f8a" -fg = "#f6dcac" -light_fg = "#a7c9c6" -bright_fg = "#f6dcac" + +background = "#05182e" +dark_background = "#031222" +darker_background = "#020c17" +lighter_background = "#0a2540" + +foreground = "#f6dcac" +dark_foreground = "#3f8f8a" +light_foreground = "#a7c9c6" +bright_foreground = "#f6dcac" red = "#f85525" yellow = "#e97b3c" diff --git a/themes/ristretto/colors.toml b/themes/ristretto/colors.toml index 5a69b912..0068c67e 100644 --- a/themes/ristretto/colors.toml +++ b/themes/ristretto/colors.toml @@ -1,17 +1,18 @@ mode = "dark" accent = "#f38d70" - -bg = "#2c2525" -dark_bg = "#211b1b" -darker_bg = "#181414" -lighter_bg = "#3d2f2a" selection = "#403e41" muted = "#5b4a45" -dark_fg = "#72696a" -fg = "#e6d9db" -light_fg = "#c3b7b8" -bright_fg = "#e6d9db" + +background = "#2c2525" +dark_background = "#211b1b" +darker_background = "#181414" +lighter_background = "#3d2f2a" + +foreground = "#e6d9db" +dark_foreground = "#72696a" +light_foreground = "#c3b7b8" +bright_foreground = "#e6d9db" red = "#fd6883" yellow = "#f9cc6c" diff --git a/themes/rose-pine/colors.toml b/themes/rose-pine/colors.toml index ae257c68..404ff932 100644 --- a/themes/rose-pine/colors.toml +++ b/themes/rose-pine/colors.toml @@ -1,17 +1,18 @@ mode = "light" accent = "#56949f" - -bg = "#faf4ed" -dark_bg = "#ede7e1" -darker_bg = "#e1dbd5" -lighter_bg = "#f2e9e1" selection = "#dfdad9" muted = "#cecacd" -dark_fg = "#9893a5" -fg = "#575279" -light_fg = "#6e6a86" -bright_fg = "#575279" + +background = "#faf4ed" +dark_background = "#ede7e1" +darker_background = "#e1dbd5" +lighter_background = "#f2e9e1" + +foreground = "#575279" +dark_foreground = "#9893a5" +light_foreground = "#6e6a86" +bright_foreground = "#575279" red = "#b4637a" yellow = "#ea9d34" diff --git a/themes/solitude/colors.toml b/themes/solitude/colors.toml index 2b782ceb..950dfe4e 100644 --- a/themes/solitude/colors.toml +++ b/themes/solitude/colors.toml @@ -1,22 +1,24 @@ mode = "dark" accent = "#798186" +selection = "#343d41" +muted = "#4b4e55" + +background = "#101315" +dark_background = "#0c0e10" +darker_background = "#080a0b" +lighter_background = "#101315" + +foreground = "#cacccc" +dark_foreground = "#4b4e55" +light_foreground = "#cbc2be" +bright_foreground = "#a5aeb4" + hyprland_active_border = "rgba(798186ee) rgba(caccccee)" hyprland_inactive_border = "rgb(1e1e1e)" active_border_color = "#a8adb0" active_tab_background = "#798186" -bg = "#101315" -dark_bg = "#0c0e10" -darker_bg = "#080a0b" -lighter_bg = "#101315" -selection = "#343d41" -muted = "#4b4e55" -dark_fg = "#4b4e55" -fg = "#cacccc" -light_fg = "#cbc2be" -bright_fg = "#a5aeb4" - red = "#565d60" yellow = "#d9dbdc" green = "#9fa5a9" diff --git a/themes/tokyo-night/colors.toml b/themes/tokyo-night/colors.toml index 9b108b22..58e67852 100644 --- a/themes/tokyo-night/colors.toml +++ b/themes/tokyo-night/colors.toml @@ -1,17 +1,18 @@ mode = "dark" accent = "#7aa2f7" - -bg = "#1a1b26" -dark_bg = "#13141c" -darker_bg = "#0e0e14" -lighter_bg = "#24283b" selection = "#292e42" muted = "#414868" -dark_fg = "#565f89" -fg = "#a9b1d6" -light_fg = "#b4bee6" -bright_fg = "#c0caf5" + +background = "#1a1b26" +dark_background = "#13141c" +darker_background = "#0e0e14" +lighter_background = "#24283b" + +foreground = "#a9b1d6" +dark_foreground = "#565f89" +light_foreground = "#b4bee6" +bright_foreground = "#c0caf5" red = "#f7768e" yellow = "#e0af68" diff --git a/themes/vantablack/colors.toml b/themes/vantablack/colors.toml index c57fa9a1..808406d4 100644 --- a/themes/vantablack/colors.toml +++ b/themes/vantablack/colors.toml @@ -1,15 +1,16 @@ mode = "dark" accent = "#8d8d8d" - -bg = "#000000" -dark_bg = "#090909" -darker_bg = "#070707" -lighter_bg = "#000000" selection = "#1a1a1a" -fg = "#ffffff" -light_fg = "#ececec" -bright_fg = "#ffffff" + +background = "#000000" +dark_background = "#090909" +darker_background = "#070707" +lighter_background = "#000000" + +foreground = "#ffffff" +light_foreground = "#ececec" +bright_foreground = "#ffffff" red = "#a4a4a4" yellow = "#cecece" diff --git a/themes/white/colors.toml b/themes/white/colors.toml index 6029b7c6..e836d514 100644 --- a/themes/white/colors.toml +++ b/themes/white/colors.toml @@ -1,17 +1,18 @@ mode = "light" accent = "#6e6e6e" - -bg = "#ffffff" -dark_bg = "#bfbfbf" -darker_bg = "#808080" -lighter_bg = "#c0c0c0" selection = "#c0c0c0" muted = "#c0c0c0" -dark_fg = "#c0c0c0" -fg = "#000000" -light_fg = "#000000" -bright_fg = "#000000" + +background = "#ffffff" +dark_background = "#bfbfbf" +darker_background = "#808080" +lighter_background = "#c0c0c0" + +foreground = "#000000" +dark_foreground = "#c0c0c0" +light_foreground = "#000000" +bright_foreground = "#000000" red = "#2a2a2a" yellow = "#4a4a4a"